Hello community, here is the log from the commit of package kcall checked in at Wed May 30 01:13:37 CEST 2007. -------- --- KDE/kcall/kcall.changes 2007-03-09 10:51:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/kcall/kcall.changes 2007-05-29 15:24:06.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 29 15:23:52 CEST 2007 - dmueller@suse.de + +- remove deep copy of ilbc libraries (#273191) + +------------------------------------------------------------------- New: ---- system-gsm.diff system-ilbc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcall.spec ++++++ --- /var/tmp/diff_new_pack.X23079/_old 2007-05-30 01:13:19.000000000 +0200 +++ /var/tmp/diff_new_pack.X23079/_new 2007-05-30 01:13:19.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: kcall -BuildRequires: kdelibs3-devel kdepim3-devel +BuildRequires: ilbc kdelibs3-devel kdepim3-devel libgsm-devel %if %suse_version < 1010 BuildRequires: openssl-devel %endif @@ -20,13 +20,15 @@ Group: Productivity/Telephony/SIP/Clients Summary: SIP (Voice over IP) Solution for KDE and Kontact Version: 0.5.2svn20060206 -Release: 71 +Release: 101 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Source0: %name-%version.tar.bz2 Patch0: kcall_dont_kill_kontact.diff Patch1: fix-auth-request.diff Patch2: kontact-356-plugin.diff +Patch3: system-ilbc.diff +Patch4: system-gsm.diff %description KCall is the telephony application of Kontact. It supports computer @@ -46,6 +48,9 @@ %setup -q %patch0 %patch1 +%patch3 +# system gsm libs seem to be broken ATM +# %patch4 %if %suse_version > 1020 %patch2 %endif @@ -93,6 +98,8 @@ %endif %changelog +* Tue May 29 2007 - dmueller@suse.de +- remove deep copy of ilbc libraries (#273191) * Fri Mar 09 2007 - stbinner@suse.de - fix build (new icon location check) * Fri Feb 09 2007 - stbinner@suse.de ++++++ kontact-356-plugin.diff ++++++ --- /var/tmp/diff_new_pack.X23079/_old 2007-05-30 01:13:19.000000000 +0200 +++ /var/tmp/diff_new_pack.X23079/_new 2007-05-30 01:13:19.000000000 +0200 @@ -1,13 +1,13 @@ ---- kcall/kcall/src/Makefile.am 2007/02/01 12:29:45 1.1 -+++ kcall/kcall/src/Makefile.am 2007/02/01 12:30:00 +--- kcall/kcall/src/Makefile.am ++++ kcall/kcall/src/Makefile.am @@ -74,4 +74,4 @@ kcall_partiface_DIR = $(top_srcdir)/kcall/src servicedir = $(kde_servicesdir)/kontact -service_DATA = kcallplugin.desktop +service_DATA = kcallplugin.desktop kcallplugin356.desktop ---- kcall/kcall/src/kcallplugin356.desktop 2007/02/01 12:29:41 1.1 -+++ kcall/kcall/src/kcallplugin356.desktop 2007/02/01 12:30:13 +--- kcall/kcall/src/kcallplugin356.desktop ++++ kcall/kcall/src/kcallplugin356.desktop @@ -0,0 +1,48 @@ +[Desktop Entry] +Encoding=UTF-8 ++++++ system-gsm.diff ++++++ --- kcall/applet/Makefile.am +++ kcall/applet/Makefile.am @@ -1,3 +1,3 @@ #SUBDIRS = $(TOPSUBDIRS) -SUBDIRS= kcallsipsettings gsm dissipate2 audio kcall icons +SUBDIRS= kcallsipsettings dissipate2 audio kcall icons --- kcall/applet/audio/Makefile.am +++ kcall/applet/audio/Makefile.am @@ -8,4 +8,4 @@ libkcallaudio_la_SOURCES = audiobuffer.cpp audiobuffer.h callaudio.cpp callaudio dspaudioout.h dspout.cpp dspout.h dspoutoss.cpp dspoutoss.h\ dspoutrtp.cpp dspoutrtp.h dtmfgenerator.cpp dtmfgenerator.h g711.cpp\ g711.h kphoneconst.h rtpdataheader.h -libkcallaudio_la_LIBADD = ../gsm/libgsm.la -lilbc +libkcallaudio_la_LIBADD = -lgsm -lilbc --- kcall/applet/kcall/Makefile.am +++ kcall/applet/kcall/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kcallapplet kcallapplet_SOURCES = main.cpp kcall.cpp callmanager.cpp diallist.cpp kcallcore.cpp \ ksipauthentication.cpp incomingdialog.ui kcallcore.skel dialdialog.ui kcallapplet_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kcallapplet_LDADD = ../kcallsipsettings/libkcallsipsettings.la -lilbc ../gsm/libgsm.la \ +kcallapplet_LDADD = ../kcallsipsettings/libkcallsipsettings.la -lilbc -lgsm \ ../dissipate2/libdissipate2.la ../audio/libkcallaudio.la $(LIB_DCOP) $(LIB_KIO) $(LIB_ARTS) \ $(LIB_KDEUI) ++++++ system-ilbc.diff ++++++ --- kcall/applet/Makefile.am +++ kcall/applet/Makefile.am @@ -1,3 +1,3 @@ #SUBDIRS = $(TOPSUBDIRS) -SUBDIRS= kcallsipsettings ilbc gsm dissipate2 audio kcall icons +SUBDIRS= kcallsipsettings gsm dissipate2 audio kcall icons --- kcall/applet/audio/Makefile.am +++ kcall/applet/audio/Makefile.am @@ -8,4 +8,4 @@ dspaudioout.h dspout.cpp dspout.h dspoutoss.cpp dspoutoss.h\ dspoutrtp.cpp dspoutrtp.h dtmfgenerator.cpp dtmfgenerator.h g711.cpp\ g711.h kphoneconst.h rtpdataheader.h -libkcallaudio_la_LIBADD = ../gsm/libgsm.la ../ilbc/libilbc.la +libkcallaudio_la_LIBADD = ../gsm/libgsm.la -lilbc --- kcall/applet/audio/dspoutrtp.h +++ kcall/applet/audio/dspoutrtp.h @@ -8,9 +8,11 @@ #include "../gsm/gsm.h" #include "../gsm/private.h" -#include "../ilbc/iLBC_define.h" -#include "../ilbc/iLBC_encode.h" -#include "../ilbc/iLBC_decode.h" +extern "C" { +#include <ilbc/iLBC_define.h> +#include <ilbc/iLBC_encode.h> +#include <ilbc/iLBC_decode.h> +} #include "../dissipate2/udpmessagesocket.h" #include "dspout.h" #include "callaudio.h" --- kcall/applet/kcall/Makefile.am +++ kcall/applet/kcall/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I../kcallsipsettings -I$(srcdir)/../kcallsipsettings -I$(srcdir)/../audio \ -I$(srcdir)/../dissipate2 -I../gsm \ - -I../ilbc $(all_includes) + -I/usr/include/ilbc $(all_includes) # these are the headers for your project noinst_HEADERS = kcall.h callmanager.h diallist.h kcallcore.h \ @@ -25,7 +25,7 @@ kcallapplet_SOURCES = main.cpp kcall.cpp callmanager.cpp diallist.cpp kcallcore.cpp \ ksipauthentication.cpp incomingdialog.ui kcallcore.skel dialdialog.ui kcallapplet_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kcallapplet_LDADD = ../kcallsipsettings/libkcallsipsettings.la ../ilbc/libilbc.la ../gsm/libgsm.la \ +kcallapplet_LDADD = ../kcallsipsettings/libkcallsipsettings.la -lilbc ../gsm/libgsm.la \ ../dissipate2/libdissipate2.la ../audio/libkcallaudio.la $(LIB_DCOP) $(LIB_KIO) $(LIB_ARTS) \ $(LIB_KDEUI) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org