From 525d3dedb9d3f842046f422f23cc50ca92ff9492 Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 13 Nov 2014 10:53:49 +0000 Subject: Update to KDE SC 4.14.3 --- x11/py-kde4/Makefile | 5 +-- x11/py-kde4/PLIST | 5 +-- x11/py-kde4/patches/patch-CMakeLists.txt | 51 +++++----------------- .../patch-sip_phonon_backendcapabilities.sip | 35 --------------- x11/py-kde4/patches/patch-sip_plasma_glapplet.sip | 18 -------- x11/py-kde4/patches/patch-sip_solid_networking.sip | 33 -------------- .../patches/patch-tools_pykdeuic4_pykdeuic4.py | 26 ----------- 7 files changed, 14 insertions(+), 159 deletions(-) delete mode 100644 x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip delete mode 100644 x11/py-kde4/patches/patch-sip_plasma_glapplet.sip delete mode 100644 x11/py-kde4/patches/patch-sip_solid_networking.sip delete mode 100644 x11/py-kde4/patches/patch-tools_pykdeuic4_pykdeuic4.py (limited to 'x11/py-kde4') diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile index 4f3d4fdb38f..827d31127d8 100644 --- a/x11/py-kde4/Makefile +++ b/x11/py-kde4/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2014/11/07 19:39:43 adam Exp $ +# $NetBSD: Makefile,v 1.45 2014/11/13 10:53:49 markd Exp $ PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION} DISTNAME= pykde4-${_KDE_VERSION} -PKGREVISION= 6 CATEGORIES= misc COMMENT= Python bindings for the KDE integrated X11 desktop @@ -51,7 +50,7 @@ post-install: .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../misc/kdepimlibs4/buildlink3.mk" -.include "../../misc/nepomuk-core/buildlink3.mk" +#.include "../../misc/nepomuk-core/buildlink3.mk" .include "../../security/polkit-qt/buildlink3.mk" .include "../../x11/kdelibs4/buildlink3.mk" .include "../../x11/py-sip/buildlink3.mk" diff --git a/x11/py-kde4/PLIST b/x11/py-kde4/PLIST index ef154550411..9b42f207b63 100644 --- a/x11/py-kde4/PLIST +++ b/x11/py-kde4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2014/01/20 15:11:34 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2014/11/13 10:53:49 markd Exp $ bin/pykdeuic4 bin/pykdeuic4-${PYVERSSUFFIX} ${PLIST.py2x}lib/kde4/kpythonpluginfactory.so @@ -15,14 +15,12 @@ ${PYSITELIB}/PyKDE4/kparts.so ${PYSITELIB}/PyKDE4/kterminal.so ${PYSITELIB}/PyKDE4/ktexteditor.so ${PYSITELIB}/PyKDE4/kutils.so -${PYSITELIB}/PyKDE4/nepomuk.so ${PYSITELIB}/PyKDE4/phonon.so ${PYSITELIB}/PyKDE4/plasma.so ${PYSITELIB}/PyKDE4/polkitqt.so ${PYSITELIB}/PyKDE4/pykdeconfig.py ${PYSITELIB}/PyKDE4/pykdeconfig.pyc ${PYSITELIB}/PyKDE4/solid.so -${PYSITELIB}/PyKDE4/soprano.so ${PYSITELIB}/PyQt4/uic/pykdeuic4.py ${PYSITELIB}/PyQt4/uic/pykdeuic4.pyc ${PYSITELIB}/PyQt4/uic/widget-plugins/kde4.py @@ -901,6 +899,7 @@ share/sip${PYVERSSUFFIX}/PyKDE4/polkitqt/actionbuttons.sip share/sip${PYVERSSUFFIX}/PyKDE4/polkitqt/auth.sip share/sip${PYVERSSUFFIX}/PyKDE4/polkitqt/context.sip share/sip${PYVERSSUFFIX}/PyKDE4/polkitqt/polkitqtmod.sip +share/sip${PYVERSSUFFIX}/PyKDE4/pykde_config.sip share/sip${PYVERSSUFFIX}/PyKDE4/solid/acadapter.sip share/sip${PYVERSSUFFIX}/PyKDE4/solid/audiointerface.sip share/sip${PYVERSSUFFIX}/PyKDE4/solid/battery.sip diff --git a/x11/py-kde4/patches/patch-CMakeLists.txt b/x11/py-kde4/patches/patch-CMakeLists.txt index 905b7ed2840..64df59b34ce 100644 --- a/x11/py-kde4/patches/patch-CMakeLists.txt +++ b/x11/py-kde4/patches/patch-CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.3 2014/08/21 21:34:33 wiz Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.4 2014/11/13 10:53:49 markd Exp $ Retain the python version number in sip install directory ---- CMakeLists.txt.orig 2014-01-02 19:29:04.000000000 +0000 +--- CMakeLists.txt.orig 2014-08-14 20:17:11.000000000 +0000 +++ CMakeLists.txt -@@ -20,6 +20,8 @@ option(PYKDEUIC4_ALTINSTALL "Enable para +@@ -18,6 +18,8 @@ option(PYKDEUIC4_ALTINSTALL "Enable para set(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) @@ -13,43 +13,12 @@ Retain the python version number in sip install directory find_package(PythonLibrary) set_package_properties(KDE4 PROPERTIES DESCRIPTION "The KDE libraries" -@@ -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) +@@ -108,7 +110,7 @@ else () + endif () + set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) --set (SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) -+set (SIP_FILES_INSTALL_DIR ${SIP_DEFAULT_SIP_DIR}) +-set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) ++set(SIP_FILES_INSTALL_DIR ${SIP_DEFAULT_SIP_DIR}) - set(SIP_CONFIGURATION " - kde_version_parts = '${KDE_VERSION}'.split('.') + # Use an extra option when compiling on Python 3. + if (PYTHON_VERSION_MAJOR GREATER 2) diff --git a/x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip b/x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip deleted file mode 100644 index ecd24151b39..00000000000 --- a/x11/py-kde4/patches/patch-sip_phonon_backendcapabilities.sip +++ /dev/null @@ -1,35 +0,0 @@ -$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 deleted file mode 100644 index 7ed7618527b..00000000000 --- a/x11/py-kde4/patches/patch-sip_plasma_glapplet.sip +++ /dev/null @@ -1,18 +0,0 @@ -$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 deleted file mode 100644 index f002d7a034d..00000000000 --- a/x11/py-kde4/patches/patch-sip_solid_networking.sip +++ /dev/null @@ -1,33 +0,0 @@ -$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 deleted file mode 100644 index 8525997e8d0..00000000000 --- a/x11/py-kde4/patches/patch-tools_pykdeuic4_pykdeuic4.py +++ /dev/null @@ -1,26 +0,0 @@ -$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"]) -- cgit v1.2.3