pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/py-kde4 py-kde4: support for sip 4.19
details: https://anonhg.NetBSD.org/pkgsrc/rev/cc53f40a9a58
branches: trunk
changeset: 374178:cc53f40a9a58
user: markd <markd%pkgsrc.org@localhost>
date: Wed Jan 17 19:21:20 2018 +0000
description:
py-kde4: support for sip 4.19
diffstat:
x11/py-kde4/Makefile | 6 +-
x11/py-kde4/PLIST | 3 +-
x11/py-kde4/distinfo | 16 +-
x11/py-kde4/patches/patch-sip_dnssd_remoteservice.sip | 47 +++++
x11/py-kde4/patches/patch-sip_kdecore_kmimetype.sip | 47 +++++
x11/py-kde4/patches/patch-sip_kdecore_ksharedconfig.sip | 24 ++
x11/py-kde4/patches/patch-sip_kdecore_ksycocaentry.sip | 47 +++++
x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip | 100 ++++++++++++
x11/py-kde4/patches/patch-sip_kdeui_kcompletion.sip | 47 +++++
x11/py-kde4/patches/patch-sip_kdeui_kfontchooser.sip | 19 ++
x11/py-kde4/patches/patch-sip_kdeui_kfontdialog.sip | 19 ++
x11/py-kde4/patches/patch-sip_kdeui_kxmlguibuilder.sip | 19 ++
x11/py-kde4/patches/patch-sip_kio_kautomount.sip | 24 ++
x11/py-kde4/patches/patch-sip_kio_kservicegroup.sip | 47 +++++
x11/py-kde4/patches/patch-sip_ktexteditor_markinterface.sip | 47 +++++
x11/py-kde4/patches/patch-sip_phonon_objectdescription.sip | 47 +++++
16 files changed, 553 insertions(+), 6 deletions(-)
diffs (truncated from 654 to 300 lines):
diff -r ae9c1e2caa22 -r cc53f40a9a58 x11/py-kde4/Makefile
--- a/x11/py-kde4/Makefile Wed Jan 17 19:18:47 2018 +0000
+++ b/x11/py-kde4/Makefile Wed Jan 17 19:21:20 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2018/01/01 21:18:56 adam Exp $
+# $NetBSD: Makefile,v 1.58 2018/01/17 19:21:20 markd Exp $
PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION}
-PKGREVISION= 10
+PKGREVISION= 11
DISTNAME= pykde4-${_KDE_VERSION}
CATEGORIES= misc
COMMENT= Python bindings for the KDE integrated X11 desktop
@@ -53,7 +53,7 @@
.include "../../lang/python/extension.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
#.include "../../misc/nepomuk-core/buildlink3.mk"
-.include "../../security/polkit-qt/buildlink3.mk"
+#.include "../../security/polkit-qt/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../x11/py-sip/buildlink3.mk"
.include "../../x11/py-qt4/buildlink3.mk"
diff -r ae9c1e2caa22 -r cc53f40a9a58 x11/py-kde4/PLIST
--- a/x11/py-kde4/PLIST Wed Jan 17 19:18:47 2018 +0000
+++ b/x11/py-kde4/PLIST Wed Jan 17 19:21:20 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/11/13 10:53:49 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/01/17 19:21:20 markd Exp $
bin/pykdeuic4
bin/pykdeuic4-${PYVERSSUFFIX}
${PLIST.py2x}lib/kde4/kpythonpluginfactory.so
@@ -17,7 +17,6 @@
${PYSITELIB}/PyKDE4/kutils.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
diff -r ae9c1e2caa22 -r cc53f40a9a58 x11/py-kde4/distinfo
--- a/x11/py-kde4/distinfo Wed Jan 17 19:18:47 2018 +0000
+++ b/x11/py-kde4/distinfo Wed Jan 17 19:21:20 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2016/12/16 00:04:54 joerg Exp $
+$NetBSD: distinfo,v 1.14 2018/01/17 19:21:20 markd Exp $
SHA1 (pykde4-4.14.3.tar.xz) = 9cc8e70d3b107a876cf579beab1f582861cd2c48
RMD160 (pykde4-4.14.3.tar.xz) = 3ea2492cd31704e559456cb78dd85660fae7e74c
@@ -6,5 +6,19 @@
Size (pykde4-4.14.3.tar.xz) = 2006504 bytes
SHA1 (patch-CMakeLists.txt) = f09b05a952c3ad4e08cfde47a24ffb17e22edd6c
SHA1 (patch-__init__.py) = 721287a0ec82b79ea4a502526ed98ba44c6d979f
+SHA1 (patch-sip_dnssd_remoteservice.sip) = ba00fdf234585686bb11f04b7e0fd5b322739e36
+SHA1 (patch-sip_kdecore_kmimetype.sip) = 50c2df2246b9f4263e307933e5b532db895b30aa
+SHA1 (patch-sip_kdecore_ksharedconfig.sip) = 748d6e014b31586ff6824065579bcbcfe2ec4cd2
+SHA1 (patch-sip_kdecore_ksycocaentry.sip) = 174773d04ebcfeb5b0730590e7d7e12011ee2107
+SHA1 (patch-sip_kdecore_typedefs.sip) = 3357640a33d07fb6c4c8e02e6a95149a773de0c9
+SHA1 (patch-sip_kdeui_kcompletion.sip) = ce3547028efb1f997117114d2189241bc03f6276
+SHA1 (patch-sip_kdeui_kfontchooser.sip) = 988d5207b5db4fd9a6dab46d6e5264ba6a00eaf4
+SHA1 (patch-sip_kdeui_kfontdialog.sip) = af921a11d407645dc50a591e34ffd93b3a0ccf16
+SHA1 (patch-sip_kdeui_kxmlguibuilder.sip) = 73649f5f57759aa35ff9cae9a4fd98763e4359f1
+SHA1 (patch-sip_kio_kautomount.sip) = 61b675b849502b2fc59bb6b654a328dc4bef9e7e
+SHA1 (patch-sip_kio_kservicegroup.sip) = f7ee1f7b3fa9427bf1ef4e62a4943d1c61ed1d6a
+SHA1 (patch-sip_ktexteditor_markinterface.sip) = f60d8f3fd905e36136434883b0456eda9a84d9e8
+SHA1 (patch-sip_phonon_objectdescription.sip) = 29ef03ba93faefcfa3df915f5ca9947343ea2b1c
SHA1 (patch-sip_solid_powermanagement.sip) = a0b961cca434b1998bcd86bf781af72b92cbf0ca
SHA1 (patch-sip_solid_predicate.sip) = 0304cbd05eb6f1b878db2a2411e218158ba366fa
+SHA1 (patch-sip_soprano_pluginmanager.sip) = 2d9131583273bb47daffd55a2bc470ed1bbfda09
diff -r ae9c1e2caa22 -r cc53f40a9a58 x11/py-kde4/patches/patch-sip_dnssd_remoteservice.sip
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-kde4/patches/patch-sip_dnssd_remoteservice.sip Wed Jan 17 19:21:20 2018 +0000
@@ -0,0 +1,47 @@
+$NetBSD: patch-sip_dnssd_remoteservice.sip,v 1.1 2018/01/17 19:21:20 markd Exp $
+
+build with sip 4.19
+
+--- sip/dnssd/remoteservice.sip.orig 2014-08-14 20:17:11.000000000 +0000
++++ sip/dnssd/remoteservice.sip
+@@ -66,7 +66,7 @@ protected:
+ DNSSD::RemoteService::Ptr *t = new DNSSD::RemoteService::Ptr (sipCpp->at(i));
+ PyObject *tobj;
+
+- if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_DNSSD_RemoteService, sipTransferObj)) == NULL)
++ if ((tobj = sipConvertFromNewType(t->data(), sipType_DNSSD_RemoteService, sipTransferObj)) == NULL)
+ {
+ Py_DECREF(l);
+ delete t;
+@@ -88,7 +88,7 @@ protected:
+ return 0;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, SIP_NOT_NONE))
++ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, SIP_NOT_NONE))
+ return 0;
+
+ return 1;
+@@ -99,11 +99,11 @@ protected:
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ {
+ int state;
+- DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state,
sipIsErr));
++ DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
++ sipReleaseType(t, sipType_DNSSD_RemoteService, state);
+
+ delete ql;
+ return 0;
+@@ -113,7 +113,7 @@ protected:
+
+ ql->append(*tptr);
+
+- sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
++ sipReleaseType(t, sipType_DNSSD_RemoteService, state);
+ }
+
+ *sipCppPtr = ql;
diff -r ae9c1e2caa22 -r cc53f40a9a58 x11/py-kde4/patches/patch-sip_kdecore_kmimetype.sip
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-kde4/patches/patch-sip_kdecore_kmimetype.sip Wed Jan 17 19:21:20 2018 +0000
@@ -0,0 +1,47 @@
+$NetBSD: patch-sip_kdecore_kmimetype.sip,v 1.1 2018/01/17 19:21:20 markd Exp $
+
+build with sip 4.19
+
+--- sip/kdecore/kmimetype.sip.orig 2014-08-14 20:17:11.000000000 +0000
++++ sip/kdecore/kmimetype.sip
+@@ -100,7 +100,7 @@ public:
+ KMimeType::Ptr *t = new KMimeType::Ptr (sipCpp->at(i));
+ PyObject *tobj;
+
+- if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KMimeType, sipTransferObj)) == NULL)
++ if ((tobj = sipConvertFromNewType(t->data(), sipType_KMimeType, sipTransferObj)) == NULL)
+ {
+ Py_DECREF(l);
+ delete t;
+@@ -122,7 +122,7 @@ public:
+ return 0;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KMimeType, SIP_NOT_NONE))
++ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KMimeType, SIP_NOT_NONE))
+ return 0;
+
+ return 1;
+@@ -133,11 +133,11 @@ public:
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ {
+ int state;
+- KMimeType *t = reinterpret_cast<KMimeType *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KMimeType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++ KMimeType *t = reinterpret_cast<KMimeType *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KMimeType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t, sipClass_KMimeType, state);
++ sipReleaseType(t, sipType_KMimeType, state);
+
+ delete ql;
+ return 0;
+@@ -147,7 +147,7 @@ public:
+
+ ql->append(*tptr);
+
+- sipReleaseInstance(t, sipClass_KMimeType, state);
++ sipReleaseType(t, sipType_KMimeType, state);
+ }
+
+ *sipCppPtr = ql;
diff -r ae9c1e2caa22 -r cc53f40a9a58 x11/py-kde4/patches/patch-sip_kdecore_ksharedconfig.sip
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-kde4/patches/patch-sip_kdecore_ksharedconfig.sip Wed Jan 17 19:21:20 2018 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-sip_kdecore_ksharedconfig.sip,v 1.1 2018/01/17 19:21:20 markd Exp $
+
+build with sip 4.19
+
+--- sip/kdecore/ksharedconfig.sip.orig 2014-08-14 20:17:11.000000000 +0000
++++ sip/kdecore/ksharedconfig.sip
+@@ -65,7 +65,7 @@ typedef KSharedConfig::Ptr KSharedConfig
+ KSharedConfigPtr kcpp = *sipCpp;
+ KSharedConfig *ksc = kcpp.data ();
+ ksc->ref.ref();
+- PyObject *pyKsc = sipConvertFromInstance(ksc, sipClass_KSharedConfig, sipTransferObj);
++ PyObject *pyKsc = sipConvertFromType(ksc, sipType_KSharedConfig, sipTransferObj);
+ return pyKsc;
+ %End
+
+@@ -74,7 +74,7 @@ typedef KSharedConfig::Ptr KSharedConfig
+ return 1;
+
+ int state;
+- KSharedConfig* ksc = (KSharedConfig *)sipConvertToInstance(sipPy, sipClass_KSharedConfig, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr);
++ KSharedConfig* ksc = (KSharedConfig *)sipConvertToType(sipPy, sipType_KSharedConfig, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr);
+ *sipCppPtr = new KSharedConfigPtr (ksc);
+ ksc->ref.deref();
+ return sipGetState(sipTransferObj);
diff -r ae9c1e2caa22 -r cc53f40a9a58 x11/py-kde4/patches/patch-sip_kdecore_ksycocaentry.sip
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-kde4/patches/patch-sip_kdecore_ksycocaentry.sip Wed Jan 17 19:21:20 2018 +0000
@@ -0,0 +1,47 @@
+$NetBSD: patch-sip_kdecore_ksycocaentry.sip,v 1.1 2018/01/17 19:21:20 markd Exp $
+
+build with sip 4.19
+
+--- sip/kdecore/ksycocaentry.sip.orig 2014-08-14 20:17:11.000000000 +0000
++++ sip/kdecore/ksycocaentry.sip
+@@ -83,7 +83,7 @@ private:
+ KSycocaEntry::Ptr *t = new KSycocaEntry::Ptr (sipCpp->at(i));
+ PyObject *tobj;
+
+- if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KSycocaEntry, sipTransferObj)) == NULL)
++ if ((tobj = sipConvertFromNewType(t->data(), sipType_KSycocaEntry, sipTransferObj)) == NULL)
+ {
+ Py_DECREF(l);
+ delete t;
+@@ -105,7 +105,7 @@ private:
+ return 0;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KSycocaEntry, SIP_NOT_NONE))
++ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KSycocaEntry, SIP_NOT_NONE))
+ return 0;
+
+ return 1;
+@@ -116,11 +116,11 @@ private:
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ {
+ int state;
+- KSycocaEntry *t = reinterpret_cast<KSycocaEntry *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KSycocaEntry, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++ KSycocaEntry *t = reinterpret_cast<KSycocaEntry *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KSycocaEntry, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t, sipClass_KSycocaEntry, state);
++ sipReleaseType(t, sipType_KSycocaEntry, state);
+
+ delete ql;
+ return 0;
+@@ -130,7 +130,7 @@ private:
+
+ ql->append(*tptr);
+
+- sipReleaseInstance(t, sipClass_KSycocaEntry, state);
++ sipReleaseType(t, sipType_KSycocaEntry, state);
+ }
+
+ *sipCppPtr = ql;
diff -r ae9c1e2caa22 -r cc53f40a9a58 x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip Wed Jan 17 19:21:20 2018 +0000
@@ -0,0 +1,100 @@
+$NetBSD: patch-sip_kdecore_typedefs.sip,v 1.3 2018/01/17 19:21:20 markd Exp $
+
+build with sip 4.19
+
+--- sip/kdecore/typedefs.sip.orig 2014-08-14 20:17:11.000000000 +0000
++++ sip/kdecore/typedefs.sip
+@@ -397,8 +397,8 @@ template <TYPE1,TYPE2>
+ TYPE1 *t1 = new TYPE1(i.key());
+ TYPE2 *t2 = new TYPE2(i.value());
+
+- PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
+- PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj);
++ PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj);
++ PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj);
+
+ if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
+ {
+@@ -438,10 +438,10 @@ template <TYPE1,TYPE2>
+
+ while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
+ {
+- if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE))
++ if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE))
+ return 0;
+
+- if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))
++ if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE))
+ return 0;
+ }
+
+@@ -454,13 +454,13 @@ template <TYPE1,TYPE2>
+ {
+ int state1, state2;
+
+- TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
+- TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
++ TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
++ TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t1, sipClass_TYPE1, state1);
+- sipReleaseInstance(t2, sipClass_TYPE2, state2);
++ sipReleaseType(t1, sipType_TYPE1, state1);
++ sipReleaseType(t2, sipType_TYPE2, state2);
+
+ delete qm;
Home |
Main Index |
Thread Index |
Old Index