Hello community, here is the log from the commit of package python-kde4 for openSUSE:Factory checked in at 2016-04-28 16:54:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kde4 (Old) and /work/SRC/openSUSE:Factory/.python-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kde4/python-kde4.changes 2016-01-28 17:25:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python-kde4.changes 2016-04-28 16:57:45.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 18 20:36:56 UTC 2016 - [email protected] + +- Add fix-build.diff to fix the build in Factory (boo#975915) + +------------------------------------------------------------------- python3-kde4.changes: same change New: ---- fix-build.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.avVkQF/_old 2016-04-28 16:57:47.000000000 +0200 +++ /var/tmp/diff_new_pack.avVkQF/_new 2016-04-28 16:57:47.000000000 +0200 @@ -26,6 +26,8 @@ Source0: pykde4-%{version}.tar.xz Patch0: arm-qreal-float.patch Patch1: arm-avoid-return-type-confusion.patch +# PATCH-FIX-OPENSUSE fix-build.diff boo#975915 [email protected] -- fix build on Factory +Patch2: fix-build.diff BuildRequires: fdupes BuildRequires: libjasper-devel BuildRequires: libkde4-devel @@ -126,6 +128,7 @@ %ifarch %arm %patch1 %endif +%patch2 -p1 %build %cmake_kde4 -d build -- -DPYKDEUIC4_ALTINSTALL=TRUE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE ++++++ python3-kde4.spec ++++++ --- /var/tmp/diff_new_pack.avVkQF/_old 2016-04-28 16:57:47.000000000 +0200 +++ /var/tmp/diff_new_pack.avVkQF/_new 2016-04-28 16:57:47.000000000 +0200 @@ -26,6 +26,8 @@ Source0: pykde4-%{version}.tar.xz Patch0: arm-qreal-float.patch Patch1: arm-avoid-return-type-confusion.patch +# PATCH-FIX-OPENSUSE fix-build.diff boo#975915 [email protected] -- fix build on Factory +Patch2: fix-build.diff BuildRequires: fdupes BuildRequires: libjasper-devel BuildRequires: libkde4-devel @@ -129,6 +131,7 @@ %ifarch %arm %patch1 %endif +%patch2 -p1 %build %cmake_kde4 -d build -- -DPYTHON_EXECUTABLE=/usr/bin/python3 -DPYKDEUIC4_ALTINSTALL=TRUE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE ++++++ fix-build.diff ++++++ diff -ur pykde4-4.14.3.orig/CMakeLists.txt pykde4-4.14.3/CMakeLists.txt --- pykde4-4.14.3.orig/CMakeLists.txt 2014-08-14 22:17:11.000000000 +0200 +++ pykde4-4.14.3/CMakeLists.txt 2016-04-18 20:29:24.000000000 +0200 @@ -166,7 +166,7 @@ file(GLOB kio_files_sip sip/kio/*.sip) set(SIP_EXTRA_FILES_DEPEND ${kio_files_sip}) -add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS}) +add_sip_python_module(PyKDE4.kio sip/kio/kiomod.sip ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS}) file(GLOB kutils_files_sip sip/kutils/*.sip) set(SIP_EXTRA_FILES_DEPEND ${kutils_files_sip}) @@ -190,7 +190,7 @@ file(GLOB dnssd_files_sip sip/dnssd/*.sip) set(SIP_EXTRA_FILES_DEPEND ${dnssd_files_sip}) -add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY}) +add_sip_python_module(PyKDE4.dnssd sip/dnssd/dnssdmod.sip ${KDE4_KDNSSD_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}) file(GLOB phonon_files_sip sip/phonon/*.sip) set(SIP_EXTRA_FILES_DEPEND ${phonon_files_sip})
