Update for py-sip-4.16/py-qt4-4.11 using patches from upstream git.

7 files changed, 155 insertions, 8 deletions

diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile
index 0c5f8704a5d..5ff9dd18a36 100644
--- a/x11/py-kde4/Makefile
+++ b/x11/py-kde4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2014/08/13 10:57:38 adam Exp $
+# $NetBSD: Makefile,v 1.42 2014/08/21 21:34:33 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-kde4-${_KDE_VERSION}
 DISTNAME=	pykde4-${_KDE_VERSION}
@@ -43,8 +43,8 @@ SUBST_SED.pid32+=	-e '/typedef.*int.*pid_t/s/int/long/'
 #	${CP} ${FILESDIR}/FindPolkitQt.cmake ${WRKSRC}/cmake/modules
 
 # remove when file not patched any longer
-#post-install:
-#	${RM} -f ${DESTDIR}${PREFIX}/share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/typedefs.sip.orig
+post-install:
+	${RM} -f ${DESTDIR}${PREFIX}/share/sip${PYVERSSUFFIX}/PyKDE4/*/*.sip.orig
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
diff --git a/x11/py-kde4/distinfo b/x11/py-kde4/distinfo
index 2284ac62e62..b2c2c5c56dc 100644
--- a/x11/py-kde4/distinfo
+++ b/x11/py-kde4/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.8 2014/02/01 02:20:53 markd Exp $
+$NetBSD: distinfo,v 1.9 2014/08/21 21:34:33 wiz Exp $
 
 SHA1 (pykde4-4.11.5.tar.xz) = c71b0774fcd6385272fb01dd466e6778a904da19
 RMD160 (pykde4-4.11.5.tar.xz) = 311fca73ae8e2a877fe7e72c93f283c56861a8e4
 Size (pykde4-4.11.5.tar.xz) = 2050296 bytes
-SHA1 (patch-CMakeLists.txt) = 605557b9bdbc1b726e32132a21e5b575db18d386
+SHA1 (patch-CMakeLists.txt) = 7a759c951e80eac4a1260769a45e6586eb296b3e
 SHA1 (patch-__init__.py) = 721287a0ec82b79ea4a502526ed98ba44c6d979f
+SHA1 (patch-sip_phonon_backendcapabilities.sip) = ed27d219313b8b11f80b17989704fd72f4f6048a
+SHA1 (patch-sip_plasma_glapplet.sip) = 185a9eb2812df1e410493f2f4b91d010cca9be38
+SHA1 (patch-sip_solid_networking.sip) = 9b2ae3e8df88d093ce3f98a76b6de8f11fa9a283
+SHA1 (patch-tools_pykdeuic4_pykdeuic4.py) = 654dded41e86e3c4ec01d8806be3cc49d5a63aff
diff --git a/x11/py-kde4/patches/patch-CMakeLists.txt b/x11/py-kde4/patches/patch-CMakeLists.txt
index 99a2480fe54..905b7ed2840 100644
--- a/x11/py-kde4/patches/patch-CMakeLists.txt
+++ b/x11/py-kde4/patches/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2013/04/03 10:52:21 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2014/08/21 21:34:33 wiz Exp $
 
 Retain the python version number in sip install directory
 
---- CMakeLists.txt.orig	2013-03-01 06:38:30.000000000 +0000
+--- CMakeLists.txt.orig	2014-01-02 19:29:04.000000000 +0000
 +++ CMakeLists.txt
 @@ -20,6 +20,8 @@ option(PYKDEUIC4_ALTINSTALL "Enable para
  
@@ -13,7 +13,38 @@ Retain the python version number in sip install directory
  find_package(PythonLibrary)
  
  set_package_properties(KDE4 PROPERTIES DESCRIPTION "The KDE libraries"
-@@ -241,7 +243,7 @@ endforeach (_X ${SIP_DISABLE_FEATURES})
+@@ -113,15 +115,27 @@ set(SIP_DISABLE_FEATURES VendorID PyQt_N
+ # Use an extra option when compiling on Python 3.
+ if (PYTHON_VERSION_MAJOR GREATER 2)
+     if(PYQT4_VERSION STRGREATER "040904")
+-	    # Disable for newer PyQt
+-	    set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector)
++	    # Disable for features in newer Qt
++        if (PYQT4_VERSION STRGREATER "040a04")
++            # GLuint + QVector (PyQt > 4.11)
++            set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x PyKDE_GLuint)
++        else ()
++            # QVector (PyQt < 4.11)
++            set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector)
++        endif ()
+     else ()
+ 	    set(SIP_EXTRA_OPTIONS -g)
+     endif()
+ else (PYTHON_VERSION_MAJOR GREATER 2)
+     if(PYQT4_VERSION STRGREATER "040904")
+ 	# Disable for newer PyQt
+-    	set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3)
++        if (PYQT4_VERSION STRGREATER "040a04")
++            # GLuint + QVector (PyQt > 4.11)
++            set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3 -x PyKDE_GLuint)
++        else ()
++            # QVector (PyQt < 4.11)
++            set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3)
++        endif ()
+     else ()
+ 	    set(SIP_EXTRA_OPTIONS -g -x Py_v3)
+     endif()
+@@ -241,7 +255,7 @@ endforeach (_X ${SIP_DISABLE_FEATURES})
  
  get_filename_component(LIB_DIR ${KDE4_LIB_DIR} NAME)
  
diff --git a/x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip b/x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip
new file mode 100644
index 00000000000..ecd24151b39
--- /dev/null
+++ b/x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip
@@ -0,0 +1,35 @@
+$NetBSD: patch-sip_phonon_backendcapabilities.sip,v 1.1 2014/08/21 21:34:33 wiz Exp $
+
+--- sip/phonon/backendcapabilities.sip.orig	2014-01-02 19:29:04.000000000 +0000
++++ sip/phonon/backendcapabilities.sip
+@@ -26,15 +26,28 @@ namespace Phonon
+ {
+ namespace BackendCapabilities
+ {
++
++// SIP 4.16 renamed the PyQt4NoQMetaObject annotation to PyQtNoQMetaObject.
++// Since SIP does not have a preprocessor, we have to duplicate the class
++// definition with different annotations.
++%If (SIP_4_16 - )
++class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/
++{
++signals:
++    void                    capabilitiesChanged ();
++    void                    availableAudioOutputDevicesChanged ();
++    void                    availableAudioCaptureDevicesChanged ();
++};
++%End
++%If ( - SIP_4_16)
+ class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
+ {
+-
+ signals:
+     void                    capabilitiesChanged ();
+     void                    availableAudioOutputDevicesChanged ();
+     void                    availableAudioCaptureDevicesChanged ();
+ };
+-// Notifier
++%End
+ 
+ Phonon::BackendCapabilities::Notifier*  notifier ();
+ QStringList             availableMimeTypes ();
diff --git a/x11/py-kde4/patches/patch-sip_plasma_glapplet.sip b/x11/py-kde4/patches/patch-sip_plasma_glapplet.sip
new file mode 100644
index 00000000000..7ed7618527b
--- /dev/null
+++ b/x11/py-kde4/patches/patch-sip_plasma_glapplet.sip
@@ -0,0 +1,18 @@
+$NetBSD: patch-sip_plasma_glapplet.sip,v 1.1 2014/08/21 21:34:33 wiz Exp $
+
+--- sip/plasma/glapplet.sip.orig	2014-01-02 19:29:04.000000000 +0000
++++ sip/plasma/glapplet.sip
+@@ -18,8 +18,13 @@
+ // 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ //force
++
++%Feature PyKDE_GLuint
++
++%If (PyKDE_GLuint)
+ typedef unsigned int GLuint;
+ typedef unsigned int GLenum;
++%End
+ 
+ namespace Plasma
+ {
diff --git a/x11/py-kde4/patches/patch-sip_solid_networking.sip b/x11/py-kde4/patches/patch-sip_solid_networking.sip
new file mode 100644
index 00000000000..f002d7a034d
--- /dev/null
+++ b/x11/py-kde4/patches/patch-sip_solid_networking.sip
@@ -0,0 +1,33 @@
+$NetBSD: patch-sip_solid_networking.sip,v 1.1 2014/08/21 21:34:33 wiz Exp $
+
+--- sip/solid/networking.sip.orig	2014-01-02 19:29:04.000000000 +0000
++++ sip/solid/networking.sip
+@@ -51,6 +51,20 @@ Solid::Networking::Status  status ();
+ //ig void                    setDisconnectPolicy (Solid::Networking::ManagementPolicy policy);
+ //ig Solid::Networking::ManagementPolicy  disconnectPolicy ();
+ 
++// SIP 4.16 renamed the PyQt4NoQMetaObject annotation to PyQtNoQMetaObject.
++// Since SIP does not have a preprocessor, we have to duplicate the class
++// definition with different annotations.
++%If (SIP_4_16 - )
++class Notifier : QObject /Abstract,PyQtNoQMetaObject/
++{
++    void                    statusChanged (Solid::Networking::Status status);
++    void                    shouldConnect ();
++    void                    shouldDisconnect ();
++protected:
++                            Notifier ();
++};
++%End
++%If ( - SIP_4_16)
+ class Notifier : QObject /Abstract,PyQt4NoQMetaObject/
+ {
+     void                    statusChanged (Solid::Networking::Status status);
+@@ -59,6 +73,7 @@ class Notifier : QObject /Abstract,PyQt4
+ protected:
+                             Notifier ();
+ };
++%End
+ 
+ Solid::Networking::Notifier*  notifier ();
+ };
diff --git a/x11/py-kde4/patches/patch-tools_pykdeuic4_pykdeuic4.py b/x11/py-kde4/patches/patch-tools_pykdeuic4_pykdeuic4.py
new file mode 100644
index 00000000000..8525997e8d0
--- /dev/null
+++ b/x11/py-kde4/patches/patch-tools_pykdeuic4_pykdeuic4.py
@@ -0,0 +1,26 @@
+$NetBSD: patch-tools_pykdeuic4_pykdeuic4.py,v 1.1 2014/08/21 21:34:33 wiz Exp $
+
+--- tools/pykdeuic4/pykdeuic4.py.orig	2014-01-02 19:29:05.000000000 +0000
++++ tools/pykdeuic4/pykdeuic4.py
+@@ -23,6 +23,7 @@ import sys
+ import time
+ import optparse
+ 
++from PyQt4 import QtCore
+ from PyQt4.uic.Compiler import indenter, compiler
+ from PyQt4.uic.Compiler import qtproxies
+ from PyQt4.uic.objcreator import MATCH,NO_MATCH
+@@ -101,7 +102,12 @@ def processUI(uifile, output_filename=No
+     output.write(HEADER % (uifile, time.ctime()))
+     indenter.indentwidth = indent
+     comp = compiler.UICompiler()
+-    winfo = comp.compileUi(uifile, output, None)
++    pyqt_version_tuple = tuple(map(int, QtCore.PYQT_VERSION_STR.split(".")))
++    # the method signature for compileUI changed in 4.10.0
++    if pyqt_version_tuple < (4,10,0):
++        winfo = comp.compileUi(uifile, output, None)
++    else:
++        winfo = comp.compileUi(uifile, output, None, "")
+ 
+     if exe:
+         output.write(DISPLAY_CODE % winfo["uiclass"])