From 8c9b60a8307b4dafffb894b3d652389f6079b68a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 29 Apr 2017 22:57:15 +0200
Subject: pykde4: Remove kde4.pykde4

This package is broken since 0a3b7f994e5995f414b1db3e1d7ca2244220b4e1
(python-sip: 4.18.1 -> 4.19.1). Removing it seems reasonable since we're
dropping KDE4 anyway.

Fixes #24548.
---
 pkgs/desktops/kde-4.14/kde-package/4.14.3.nix      |  9 ------
 .../kde-4.14/kdebindings/pykde4-gcc-5.patch        | 27 -----------------
 pkgs/desktops/kde-4.14/kdebindings/pykde4.nix      | 35 ----------------------
 3 files changed, 71 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/pykde4.nix

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
index a05e6d0c62a2..401069785763 100644
--- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
@@ -10,7 +10,6 @@ hashes=builtins.listToAttrs[
   {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";}
   {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";}
   {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";}
-  {name="pykde4";value="1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";}
   {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";}
 ];
 versions=builtins.listToAttrs[
@@ -26,7 +25,6 @@ versions=builtins.listToAttrs[
   {name="libkexiv2";value="4.14.3";}
   {name="marble";value="4.14.3";}
   {name="okular";value="4.14.3";}
-  {name="pykde4";value="4.14.3";}
   {name="svgpart";value="4.14.3";}
 ];
 modules=[
@@ -62,13 +60,6 @@ modules=[
     { name="marble";  }
   ];
 }
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="pykde4";  }
-  ];
-}
 {
   module="kde-baseapps";
 sane="kde_baseapps";  split=true;
diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch b/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch
deleted file mode 100644
index 27925a3e3548..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/pykde4-gcc-5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 48d457e10a7f..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ kde, kdelibs, pythonPackages, kdepimlibs, shared_desktop_ontologies,
-  polkit_qt4, boost, lndir, pkgconfig }:
-
-let
-  inherit (pythonPackages) python pyqt4;
-  pydir = "lib/python${python.majorVersion}";
-in kde {
-
-  patches = [ ./pykde4-gcc-5.patch ];
-
-  # todo: polkit isn't found by the build system
-
-  buildInputs = [
-    python kdepimlibs shared_desktop_ontologies
-    boost polkit_qt4
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ pyqt4 ];
-
-  preConfigure =
-    ''
-      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
-      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
-      # needs to install a plugin.
-      mkdir -pv $out/${pydir}
-      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
-      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
-    '';
-
-  meta = {
-    description = "Python bindings for KDE";
-  };
-}
-- 
cgit 1.4.1