From bb43b542d686c40c08a6fd081cfb6fe50d72d383 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Mar 2016 12:53:14 +0100
Subject: pykde4: Fix gcc 5 build failure

---
 .../kde-4.14/kdebindings/pykde4-gcc-5.patch        | 27 ++++++++++++++++++++++
 pkgs/desktops/kde-4.14/kdebindings/pykde4.nix      |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch b/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch
new file mode 100644
index 000000000000..27925a3e3548
--- /dev/null
+++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch
@@ -0,0 +1,27 @@
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0ed8c85dd15fb18a902b22a7555ba4f7cf01cb
+
+Patch created by: Erik Zeek
+
+See also: https://bugs.gentoo.org/show_bug.cgi?id=567022
+
+--- a/CMakeLists.txt
++++ a/CMakeLists.txt
+@@ -166,7 +166,7 @@ add_sip_python_module(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS} ${Q
+ 
+ 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_SOLID_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS})
+ 
+ file(GLOB kutils_files_sip sip/kutils/*.sip)
+ set(SIP_EXTRA_FILES_DEPEND ${kutils_files_sip})
+@@ -190,7 +190,7 @@ add_sip_python_module(PyKDE4.knewstuff sip/knewstuff/knewstuffmod.sip ${KDE4_KNE
+ 
+ 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})
+
diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
index 191b96380e6f..5a911d4b3ea3 100644
--- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
+++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
@@ -5,6 +5,8 @@ let pydir = "lib/python${python.majorVersion}"; in
 
 kde {
 
+  patches = [ ./pykde4-gcc-5.patch ];
+
   # todo: polkit isn't found by the build system
 
   buildInputs = [
-- 
cgit 1.4.1