Hello community, here is the log from the commit of package kdenetwork4 for openSUSE:Factory checked in at 2013-05-16 16:49:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenetwork4 (Old) and /work/SRC/openSUSE:Factory/.kdenetwork4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdenetwork4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdenetwork4/kdenetwork4.changes 2013-04-18 10:22:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdenetwork4.new/kdenetwork4.changes 2013-05-16 16:49:26.000000000 +0200 @@ -1,0 +2,17 @@ +Wed May 8 11:38:45 UTC 2013 - nico.kruber@gmail.com + +- re-enable OTR plugin for openSUSE 12.3 and Factory + (using with libotr2 which provides version 3.2.*) +- re-enable libktorrent support + +------------------------------------------------------------------- +Sat May 4 17:17:07 UTC 2013 - tittiatcoke@gmail.com + +- Update to 4.10.3 + * Bugfix release + * See http://www.kde.org/announcements/announce-4.10.3.php + * resolves bnc#818500 +- Added fix_v4l_deprecations.patch, fixes usage of interfaces deprecated + with 3.9 kernel + +------------------------------------------------------------------- Old: ---- kdenetwork-4.10.2.tar.xz New: ---- fix_v4l_deprecations.patch kdenetwork-4.10.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.q8rFyI/_old 2013-05-16 16:49:27.000000000 +0200 +++ /var/tmp/diff_new_pack.q8rFyI/_new 2013-05-16 16:49:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdenetwork4 -Version: 4.10.2 +Version: 4.10.3 Release: 0 Summary: KDE Network Base Package License: GPL-2.0+ @@ -27,6 +27,8 @@ Patch1: kopete-qq-memset.patch # PATCH-FIX-UPSTREAM kdenetwork-4.10.0-giflib5.patch -- fix for changed giflib-5 API seife+obs@b1-systems.com Patch2: kdenetwork-4.10.0-giflib5.patch +# PATCH-FIX-UPSTREAM fix_v4l_deprecations.patch -- fix for using interfaces deprecated with 3.9 kernel +Patch3: fix_v4l_deprecations.patch BuildRequires: LibVNCServer-devel BuildRequires: fdupes BuildRequires: gpgme-devel @@ -39,12 +41,14 @@ BuildRequires: libjasper-devel BuildRequires: libkdepimlibs4-devel BuildRequires: libkonq-devel +BuildRequires: libktorrent-devel BuildRequires: libmms-devel -# does not work upstream atm BuildRequires: libktorrent-devel BuildRequires: libmsn-devel %if 0%{?suse_version} <= 1220 -# does not work in Factory atm +# does not work in Factory atm (libotr >= 4.0) BuildRequires: libotr-devel +%else +BuildRequires: libotr2-devel %endif BuildRequires: libortp-devel BuildRequires: libqca2-devel @@ -69,6 +73,9 @@ %setup -q -n kdenetwork-%{version} %patch1 %patch2 -p1 +%if 0%{?suse_version} > 1230 +%patch3 -p1 +%endif %build %ifarch ppc ppc64 @@ -276,9 +283,7 @@ %dir %{_kde4_appsdir}/kopete_history %dir %{_kde4_appsdir}/kopete_jabber %dir %{_kde4_appsdir}/kopete_latex -%if 0%{?suse_version} <= 1220 %dir %{_kde4_appsdir}/kopete_otr -%endif %dir %{_kde4_appsdir}/kopete_privacy %dir %{_kde4_appsdir}/kopete_skype %dir %{_kde4_appsdir}/kopete_statistics ++++++ fix_v4l_deprecations.patch ++++++ diff -urNB kdenetwork-4.10.3.orig/kopete/libkopete/avdevice/videodevice.cpp kdenetwork-4.10.3/kopete/libkopete/avdevice/videodevice.cpp --- kdenetwork-4.10.3.orig/kopete/libkopete/avdevice/videodevice.cpp 2013-04-10 19:30:51.373516338 +0200 +++ kdenetwork-4.10.3/kopete/libkopete/avdevice/videodevice.cpp 2013-05-04 23:11:45.623842641 +0200 @@ -3061,8 +3061,12 @@ case V4L2_CID_GAIN: return I18N_NOOP("Gain"); case V4L2_CID_HFLIP: return I18N_NOOP("Horizontal Flip"); case V4L2_CID_VFLIP: return I18N_NOOP("Vertical Flip"); +#ifdef V4L2_CID_HCENTER // since kernel-3.9.0 case V4L2_CID_HCENTER: return I18N_NOOP("Horizontal Center"); +#endif +#ifdef V4L2_CID_VCENTER // since kernel-3.9.0 case V4L2_CID_VCENTER: return I18N_NOOP("Vertical Center"); +#endif #ifdef V4L2_CID_POWER_LINE_FREQUENCY // since kernel 2.6.25 case V4L2_CID_POWER_LINE_FREQUENCY: return I18N_NOOP("Power Line Frequency"); case V4L2_CID_HUE_AUTO: return I18N_NOOP("Automatic Hue"); ++++++ kdenetwork-4.10.2.tar.xz -> kdenetwork-4.10.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdenetwork4/kdenetwork-4.10.2.tar.xz /work/SRC/openSUSE:Factory/.kdenetwork4.new/kdenetwork-4.10.3.tar.xz differ: char 25, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org