diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bb4a965..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pykde4-4.14.3.tar.xz diff --git a/0001-use-LIB_PYTHON-realpath.patch b/0001-use-LIB_PYTHON-realpath.patch deleted file mode 100644 index 85ad4bc..0000000 --- a/0001-use-LIB_PYTHON-realpath.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 34bed3ceb7cd2bb43e67acce97f4cc3e8bbc1c1d Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Tue, 11 Mar 2014 09:51:17 -0500 -Subject: [PATCH 1/3] use LIB_PYTHON realpath - -Use GET_FILENAME_COMPONENT( ... REALPATH). PYTHON_LIBRARY as returned -by cmake, whose target is often a symlink. Some distro packaging -reserves such library symlinks for -devel and not runtime. - -REVIEW: 116719 ---- - kpythonpluginfactory/CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt -index c24160e..a777dac 100644 ---- a/kpythonpluginfactory/CMakeLists.txt -+++ b/kpythonpluginfactory/CMakeLists.txt -@@ -3,7 +3,8 @@ - set(kpythonpluginfactory_SRCS - kpythonpluginfactory.cpp) - --GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARIES} NAME) -+GET_FILENAME_COMPONENT(PYTHON_LIBRARY_REALPATH "${PYTHON_LIBRARY}" REALPATH) -+GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY_REALPATH} NAME) - ADD_DEFINITIONS(-DLIB_PYTHON="${LIB_PYTHON}") - ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000) - --- -2.9.3 - diff --git a/0002-Add-some-missing-link-libraries.patch b/0002-Add-some-missing-link-libraries.patch deleted file mode 100644 index 00283cc..0000000 --- a/0002-Add-some-missing-link-libraries.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b0137f694f946c7f10ac2863a71b4cdeda15eb87 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Wed, 14 Sep 2016 23:54:40 +0200 -Subject: [PATCH 2/3] Add some missing(?) link libraries - -This fixes the following build errors in openSUSE Factory: - -CMakeFiles/python_module_PyKDE4_dnssd.dir/sip/dnssd/sipdnssdpart2.cpp.o: -In function `meth_DNSSD_ServiceBrowser_resolveHostName': -/home/abuild/rpmbuild/BUILD/pykde4-4.14.3/build/sip/dnssd/sipdnssdpart2.cpp:408: -undefined reference to `QHostAddress::QHostAddress(QHostAddress -const&)' -/home/abuild/rpmbuild/BUILD/pykde4-4.14.3/build/sip/dnssd/sipdnssdpart2.cpp:408: -undefined reference to `QHostAddress::~QHostAddress()' -collect2: error: ld returned 1 exit status -... -CMakeFiles/python_module_PyKDE4_kio.dir/sip/kio/sipkiopart3.cpp.o: In -function `meth_KFilePlacesModel_deviceForIndex': -/home/abuild/rpmbuild/BUILD/pykde4-4.14.3/build/sip/kio/sipkiopart3.cpp:18560: -undefined reference to `Solid::Device::Device(Solid::Device const&)' -/home/abuild/rpmbuild/BUILD/pykde4-4.14.3/build/sip/kio/sipkiopart3.cpp:18560: -undefined reference to `Solid::Device::~Device()' -CMakeFiles/python_module_PyKDE4_kio.dir/sip/kio/sipkiopart4.cpp.o: In -function `meth_KDeviceListModel_deviceForIndex': -/home/abuild/rpmbuild/BUILD/pykde4-4.14.3/build/sip/kio/sipkiopart4.cpp:27090: -undefined reference to `Solid::Device::Device(Solid::Device const&)' -/home/abuild/rpmbuild/BUILD/pykde4-4.14.3/build/sip/kio/sipkiopart4.cpp:27090: -undefined reference to `Solid::Device::~Device()' -collect2: error: ld returned 1 exit status - -REVIEW: 127705 ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b0768cf..b919d1b 100644 ---- a/CMakeLists.txt -+++ b/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_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_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}) --- -2.9.3 - diff --git a/0003-Fix-build-with-sip-4.19.patch b/0003-Fix-build-with-sip-4.19.patch deleted file mode 100644 index 61ef78d..0000000 --- a/0003-Fix-build-with-sip-4.19.patch +++ /dev/null @@ -1,599 +0,0 @@ -From 2d1eadf5d0148c88cb4393993f0269e196cbe7b1 Mon Sep 17 00:00:00 2001 -From: Johannes Huber -Date: Mon, 9 Jan 2017 11:52:12 +0100 -Subject: [PATCH 3/3] Fix build with sip 4.19 - -REVIEW: 129799 ---- - sip/dnssd/remoteservice.sip | 10 +++++----- - sip/kdecore/kmimetype.sip | 10 +++++----- - sip/kdecore/ksharedconfig.sip | 4 ++-- - sip/kdecore/ksycocaentry.sip | 10 +++++----- - sip/kdecore/typedefs.sip | 30 +++++++++++++++--------------- - sip/kdeui/kcompletion.sip | 10 +++++----- - sip/kdeui/kxmlguibuilder.sip | 4 ++-- - sip/kio/kservicegroup.sip | 10 +++++----- - sip/ktexteditor/markinterface.sip | 10 +++++----- - sip/phonon/objectdescription.sip | 10 +++++----- - sip/soprano/pluginmanager.sip | 30 +++++++++++++++--------------- - 11 files changed, 69 insertions(+), 69 deletions(-) - -diff --git a/sip/dnssd/remoteservice.sip b/sip/dnssd/remoteservice.sip -index 5c5397a..44db887 100644 ---- a/sip/dnssd/remoteservice.sip -+++ b/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(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ DNSSD::RemoteService *t = reinterpret_cast(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 --git a/sip/kdecore/kmimetype.sip b/sip/kdecore/kmimetype.sip -index b2d21f7..2945210 100644 ---- a/sip/kdecore/kmimetype.sip -+++ b/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(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KMimeType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ KMimeType *t = reinterpret_cast(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 --git a/sip/kdecore/ksharedconfig.sip b/sip/kdecore/ksharedconfig.sip -index 54b1599..9442d80 100644 ---- a/sip/kdecore/ksharedconfig.sip -+++ b/sip/kdecore/ksharedconfig.sip -@@ -65,7 +65,7 @@ typedef KSharedConfig::Ptr KSharedConfigPtr; - 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 KSharedConfigPtr; - 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 --git a/sip/kdecore/ksycocaentry.sip b/sip/kdecore/ksycocaentry.sip -index 4632e4a..ceb85fa 100644 ---- a/sip/kdecore/ksycocaentry.sip -+++ b/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(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KSycocaEntry, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ KSycocaEntry *t = reinterpret_cast(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 --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip -index af53f85..23956b7 100644 ---- a/sip/kdecore/typedefs.sip -+++ b/sip/kdecore/typedefs.sip -@@ -397,8 +397,8 @@ template - 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 - - 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 - { - int state1, state2; - -- TYPE1 *t1 = reinterpret_cast(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); -- TYPE2 *t2 = reinterpret_cast(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); -+ TYPE1 *t1 = reinterpret_cast(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); -+ TYPE2 *t2 = reinterpret_cast(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; - return 0; -@@ -468,8 +468,8 @@ template - - qm->insert(*t1, *t2); - -- sipReleaseInstance(t1, sipClass_TYPE1, state1); -- sipReleaseInstance(t2, sipClass_TYPE2, state2); -+ sipReleaseType(t1, sipType_TYPE1, state1); -+ sipReleaseType(t2, sipType_TYPE2, state2); - } - - *sipCppPtr = qm; -@@ -669,7 +669,7 @@ template - TYPE *t = (TYPE *)(sipCpp->at(i)); - PyObject *tobj; - -- if ((tobj = sipConvertFromNewInstance(t, sipClass_TYPE, sipTransferObj)) == NULL) -+ if ((tobj = sipConvertFromNewType(t, sipType_TYPE, sipTransferObj)) == NULL) - { - Py_DECREF(l); - delete t; -@@ -691,7 +691,7 @@ template - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, SIP_NOT_NONE)) - return 0; - - return 1; -@@ -702,11 +702,11 @@ template - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - int state; -- TYPE *t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ TYPE *t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t, sipClass_TYPE, state); -+ sipReleaseType(t, sipType_TYPE, state); - - delete qv; - return 0; -@@ -714,7 +714,7 @@ template - - qv->append(t); - -- sipReleaseInstance(t, sipClass_TYPE, state); -+ sipReleaseType(t, sipType_TYPE, state); - } - - *sipCppPtr = qv; -diff --git a/sip/kdeui/kcompletion.sip b/sip/kdeui/kcompletion.sip -index f1d327f..938506a 100644 ---- a/sip/kdeui/kcompletion.sip -+++ b/sip/kdeui/kcompletion.sip -@@ -176,7 +176,7 @@ public: - #else - PyObject *kobj = PyInt_FromLong((int)i.key()); - #endif -- PyObject *tobj = sipConvertFromNewInstance(t, sipClass_KShortcut, sipTransferObj); -+ PyObject *tobj = sipConvertFromNewType(t, sipType_KShortcut, sipTransferObj); - - if (kobj == NULL || tobj == NULL || PyDict_SetItem(d, kobj, tobj) < 0) - { -@@ -213,7 +213,7 @@ public: - return 0; - - while (PyDict_Next(sipPy, &i, &kobj, &tobj)) -- if (!sipCanConvertToInstance(tobj, sipClass_KShortcut, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(tobj, sipType_KShortcut, SIP_NOT_NONE)) - return 0; - - return 1; -@@ -229,11 +229,11 @@ public: - #else - int k = PyInt_AsLong(kobj); - #endif -- KShortcut *t = reinterpret_cast(sipConvertToInstance(tobj, sipClass_KShortcut, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ KShortcut *t = reinterpret_cast(sipConvertToType(tobj, sipType_KShortcut, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t, sipClass_KShortcut, state); -+ sipReleaseType(t, sipType_KShortcut, state); - - delete qm; - return 0; -@@ -241,7 +241,7 @@ public: - - qm->insert((KCompletionBase::KeyBindingType)k, *t); - -- sipReleaseInstance(t, sipClass_KShortcut, state); -+ sipReleaseType(t, sipType_KShortcut, state); - } - - *sipCppPtr = qm; -diff --git a/sip/kdeui/kxmlguibuilder.sip b/sip/kdeui/kxmlguibuilder.sip -index 41ae2aa..e4cf187 100644 ---- a/sip/kdeui/kxmlguibuilder.sip -+++ b/sip/kdeui/kxmlguibuilder.sip -@@ -49,10 +49,10 @@ QAction *containerAction; - PyObject *pyWidget; - PyObject *pyContainerAction; - -- if ((pyWidget = sipConvertFromNewInstance(res, sipClass_QWidget, NULL)) == NULL) -+ if ((pyWidget = sipConvertFromNewType(res, sipType_QWidget, NULL)) == NULL) - return NULL; - -- if ((pyContainerAction = sipConvertFromNewInstance(containerAction, sipClass_QAction, NULL)) == NULL) -+ if ((pyContainerAction = sipConvertFromNewType(containerAction, sipType_QAction, NULL)) == NULL) - return NULL; - - sipRes = Py_BuildValue ("NN", pyWidget, pyContainerAction); -diff --git a/sip/kio/kservicegroup.sip b/sip/kio/kservicegroup.sip -index a1ef981..1ddce37 100644 ---- a/sip/kio/kservicegroup.sip -+++ b/sip/kio/kservicegroup.sip -@@ -151,7 +151,7 @@ public: - KServiceGroup::SPtr *t = new KServiceGroup::SPtr (sipCpp->at(i)); - PyObject *tobj; - -- if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KServiceGroup, sipTransferObj)) == NULL) -+ if ((tobj = sipConvertFromNewType(t->data(), sipType_KServiceGroup, sipTransferObj)) == NULL) - { - Py_DECREF(l); - delete t; -@@ -173,7 +173,7 @@ public: - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceGroup, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceGroup, SIP_NOT_NONE)) - return 0; - - return 1; -@@ -184,11 +184,11 @@ public: - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - int state; -- KServiceGroup *t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceGroup, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ KServiceGroup *t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceGroup, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t, sipClass_KServiceGroup, state); -+ sipReleaseType(t, sipType_KServiceGroup, state); - - delete ql; - return 0; -@@ -198,7 +198,7 @@ public: - - ql->append(*tptr); - -- sipReleaseInstance(t, sipClass_KServiceGroup, state); -+ sipReleaseType(t, sipType_KServiceGroup, state); - } - - *sipCppPtr = ql; -diff --git a/sip/ktexteditor/markinterface.sip b/sip/ktexteditor/markinterface.sip -index d9b0ec9..888c506 100644 ---- a/sip/ktexteditor/markinterface.sip -+++ b/sip/ktexteditor/markinterface.sip -@@ -158,7 +158,7 @@ signals: - #else - PyObject *t1obj = PyInt_FromLong ((long)t1); - #endif -- PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_KTextEditor_Mark, sipTransferObj); -+ PyObject *t2obj = sipConvertFromNewType(t2, sipType_KTextEditor_Mark, sipTransferObj); - - if (t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0) - { -@@ -203,7 +203,7 @@ signals: - #endif - return 0; - -- if (!sipCanConvertToInstance(t2obj, sipClass_KTextEditor_Mark, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(t2obj, sipType_KTextEditor_Mark, SIP_NOT_NONE)) - return 0; - } - -@@ -221,11 +221,11 @@ signals: - #else - int t1 = PyInt_AS_LONG (t1obj); - #endif -- KTextEditor::Mark *t2 = reinterpret_cast(sipConvertToInstance(t2obj, sipClass_KTextEditor_Mark, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); -+ KTextEditor::Mark *t2 = reinterpret_cast(sipConvertToType(t2obj, sipType_KTextEditor_Mark, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t2, sipClass_KTextEditor_Mark, state2); -+ sipReleaseType(t2, sipType_KTextEditor_Mark, state2); - - delete qm; - return 0; -@@ -233,7 +233,7 @@ signals: - - qm->insert(t1, t2); - -- sipReleaseInstance(t2, sipClass_KTextEditor_Mark, state2); -+ sipReleaseType(t2, sipType_KTextEditor_Mark, state2); - } - - *sipCppPtr = qm; -diff --git a/sip/phonon/objectdescription.sip b/sip/phonon/objectdescription.sip -index 2b86d5e..015b2ef 100644 ---- a/sip/phonon/objectdescription.sip -+++ b/sip/phonon/objectdescription.sip -@@ -116,7 +116,7 @@ void registerMetaTypes (); - DNSSD::RemoteService::Ptr *t = new Phonon::ObjectDescription (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; -@@ -138,7 +138,7 @@ void registerMetaTypes (); - 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; -@@ -149,11 +149,11 @@ void registerMetaTypes (); - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - int state; -- DNSSD::RemoteService *t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ DNSSD::RemoteService *t = reinterpret_cast(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; -@@ -163,7 +163,7 @@ void registerMetaTypes (); - - ql->append(*tptr); - -- sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state); -+ sipReleaseType(t, sipType_DNSSD_RemoteService, state); - } - - *sipCppPtr = ql; -diff --git a/sip/soprano/pluginmanager.sip b/sip/soprano/pluginmanager.sip -index c2be1c3..fe990f8 100644 ---- a/sip/soprano/pluginmanager.sip -+++ b/sip/soprano/pluginmanager.sip -@@ -73,7 +73,7 @@ public: - Soprano::Backend* t = const_cast(sipCpp->at(i)); - PyObject *tobj; - -- if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Backend, sipTransferObj)) == NULL) -+ if ((tobj = sipConvertFromType(t, sipType_Soprano_Backend, sipTransferObj)) == NULL) - { - Py_DECREF(l); - return NULL; -@@ -93,7 +93,7 @@ public: - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Backend, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Backend, SIP_NOT_NONE)) - return 0; - - return 1; -@@ -104,18 +104,18 @@ public: - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - int state; -- const Soprano::Backend*t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Backend, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ const Soprano::Backend*t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Backend, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(const_cast(t), sipClass_Soprano_Backend, state); -+ sipReleaseType(const_cast(t), sipType_Soprano_Backend, state); - - delete ql; - return 0; - } - ql->append(t); - -- sipReleaseInstance(const_cast(t), sipClass_Soprano_Backend, state); -+ sipReleaseType(const_cast(t), sipType_Soprano_Backend, state); - } - - *sipCppPtr = ql; -@@ -144,7 +144,7 @@ public: - Soprano::Parser* t = const_cast(sipCpp->at(i)); - PyObject *tobj; - -- if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Parser, sipTransferObj)) == NULL) -+ if ((tobj = sipConvertFromType(t, sipType_Soprano_Parser, sipTransferObj)) == NULL) - { - Py_DECREF(l); - return NULL; -@@ -164,7 +164,7 @@ public: - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Parser, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Parser, SIP_NOT_NONE)) - return 0; - - return 1; -@@ -175,18 +175,18 @@ public: - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - int state; -- const Soprano::Parser*t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Parser, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ const Soprano::Parser*t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Parser, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(const_cast(t), sipClass_Soprano_Parser, state); -+ sipReleaseType(const_cast(t), sipType_Soprano_Parser, state); - - delete ql; - return 0; - } - ql->append(t); - -- sipReleaseInstance(const_cast(t), sipClass_Soprano_Parser, state); -+ sipReleaseType(const_cast(t), sipType_Soprano_Parser, state); - } - - *sipCppPtr = ql; -@@ -215,7 +215,7 @@ public: - Soprano::Serializer* t = const_cast(sipCpp->at(i)); - PyObject *tobj; - -- if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Serializer, sipTransferObj)) == NULL) -+ if ((tobj = sipConvertFromType(t, sipType_Soprano_Serializer, sipTransferObj)) == NULL) - { - Py_DECREF(l); - return NULL; -@@ -235,7 +235,7 @@ public: - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Serializer, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Serializer, SIP_NOT_NONE)) - return 0; - - return 1; -@@ -246,18 +246,18 @@ public: - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - int state; -- const Soprano::Serializer*t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Serializer, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ const Soprano::Serializer*t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Serializer, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(const_cast(t), sipClass_Soprano_Serializer, state); -+ sipReleaseType(const_cast(t), sipType_Soprano_Serializer, state); - - delete ql; - return 0; - } - ql->append(t); - -- sipReleaseInstance(const_cast(t), sipClass_Soprano_Serializer, state); -+ sipReleaseType(const_cast(t), sipType_Soprano_Serializer, state); - } - - *sipCppPtr = ql; --- -2.9.3 - diff --git a/add_qt_kde_definitions.diff b/add_qt_kde_definitions.diff deleted file mode 100644 index e64d6ab..0000000 --- a/add_qt_kde_definitions.diff +++ /dev/null @@ -1,20 +0,0 @@ -From: Sune Vuorela -From: Modestas Vainius -Subject: define Qt/KDE definitions when building standalone -Forwarded: no -Last-Update: 2011-06-30 -Origin: vendor - -Index: b/CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,8 @@ set_package_properties(PythonInterp PROP - - include_directories(${KDE4_INCLUDES}) - -+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT) -+ - find_package(SIP) - set_package_properties(SIP PROPERTIES DESCRIPTION "The SIP binding generator" - URL "http://riverbankcomputing.com" TYPE REQUIRED diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..8e7a9a0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +python2 is being retired soonx, and python3 FTBFS (bug #1705463) diff --git a/fix_kpythonpluginfactory_build.diff b/fix_kpythonpluginfactory_build.diff deleted file mode 100644 index 71f5928..0000000 --- a/fix_kpythonpluginfactory_build.diff +++ /dev/null @@ -1,26 +0,0 @@ -From: Modestas Vainius -Subject: Include Python.h first as Qt includes steal "slots" keyword -Forwarded: no -Origin: vendor -Last-Update: 2008-12-05 - -Index: pykde4-4.9.80/kpythonpluginfactory/kpythonpluginfactory.cpp -=================================================================== ---- pykde4-4.9.80.orig/kpythonpluginfactory/kpythonpluginfactory.cpp 2012-11-14 16:14:05.000000000 +0000 -+++ pykde4-4.9.80/kpythonpluginfactory/kpythonpluginfactory.cpp 2012-11-19 17:23:32.497203781 +0000 -@@ -18,6 +18,7 @@ - Boston, MA 02111-1307, USA. - */ - -+#include - #include - #include - #include -@@ -25,7 +26,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/kubuntu_kpythonpluginfactory_3.2support.diff b/kubuntu_kpythonpluginfactory_3.2support.diff deleted file mode 100644 index 072a33b..0000000 --- a/kubuntu_kpythonpluginfactory_3.2support.diff +++ /dev/null @@ -1,42 +0,0 @@ -Index: b/kpythonpluginfactory/kpythonpluginfactory.cpp -=================================================================== ---- a/kpythonpluginfactory/kpythonpluginfactory.cpp -+++ b/kpythonpluginfactory/kpythonpluginfactory.cpp -@@ -33,6 +33,12 @@ - #define PY3 - #endif - -+#if PY_MAJOR_VERSION >= 3 -+#if PY_MINOR_VERSION >= 2 -+#define PY3.2 -+#endif -+#endif -+ - /* - This implements a plugin factory for running Python plugins. It also - supports io-slaves with a kdemain() entry point. -@@ -106,8 +112,13 @@ void KPythonPluginFactory::initialize() - kDebug() << "Initializing Python interpreter."; - pythonLib = LoadPythonLibrary(); - -+#ifdef PY3.2 -+ Py_Initialize (); -+ PyEval_InitThreads (); -+#else - PyEval_InitThreads (); - Py_Initialize (); -+#endif - if (!Py_IsInitialized ()) - { - //pythonInit = 0; -@@ -117,8 +128,10 @@ void KPythonPluginFactory::initialize() - kDebug() << "Succesfully initialized Python interpreter."; - - threadState = PyThreadState_GET(); -+#ifndef PY3.2 - // free the lock - PyEval_ReleaseLock(); -+#endif - } - } - diff --git a/make_pykde4_respect_sip_flags.diff b/make_pykde4_respect_sip_flags.diff deleted file mode 100644 index 5beb93a..0000000 --- a/make_pykde4_respect_sip_flags.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -up pykde4-4.13.97/CMakeLists.txt.203 pykde4-4.13.97/CMakeLists.txt ---- pykde4-4.13.97/CMakeLists.txt.203 2014-08-07 10:22:41.392650212 -0500 -+++ pykde4-4.13.97/CMakeLists.txt 2014-08-07 10:23:15.158294656 -0500 -@@ -101,6 +101,9 @@ include_directories( - ${KDEPIMLIBS_INCLUDE_DIRS} - ) - -+# Pull in ARM configuration options if needed -+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "") -+ - set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip) - set(SIP_CONCAT_PARTS 8) - if (WIN32) -@@ -108,7 +111,7 @@ if (WIN32) - else () - set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG}) - endif () --set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) -+set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK}) - - set(SIP_FILES_INSTALL_DIR ${SIP_DEFAULT_SIP_DIR}) - diff --git a/pykde4-4.11.2-pythonpluginfactory_python3.patch b/pykde4-4.11.2-pythonpluginfactory_python3.patch deleted file mode 100644 index cfde749..0000000 --- a/pykde4-4.11.2-pythonpluginfactory_python3.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -up pykde4-4.11.2/CMakeLists.txt.207 pykde4-4.11.2/CMakeLists.txt ---- pykde4-4.11.2/CMakeLists.txt.207 2013-10-16 14:59:36.027327310 -0500 -+++ pykde4-4.11.2/CMakeLists.txt 2013-10-16 15:00:13.068628265 -0500 -@@ -283,7 +283,9 @@ install(DIRECTORY sip/ DESTINATION ${SIP - add_subdirectory(tools) - #add_subdirectory(docs) - add_subdirectory(examples) --if (PYTHON_VERSION_MAJOR LESS 3) -+# Due to version specific ABI tagging in Python 3 so files, we can build for -+# all Python 3 versions without a problem. -+if ((PYTHON_VERSION_MAJOR LESS 3 AND DEFAULT_PYTHON_VERSION) OR PYTHON_VERSION_MAJOR GREATER 2) - add_subdirectory(kpythonpluginfactory) - endif () - -diff -up pykde4-4.11.2/kpythonpluginfactory/kpythonpluginfactory.cpp.207 pykde4-4.11.2/kpythonpluginfactory/kpythonpluginfactory.cpp ---- pykde4-4.11.2/kpythonpluginfactory/kpythonpluginfactory.cpp.207 2013-10-16 14:59:36.023327383 -0500 -+++ pykde4-4.11.2/kpythonpluginfactory/kpythonpluginfactory.cpp 2013-10-16 14:59:36.026327328 -0500 -@@ -29,6 +29,10 @@ - #include - #include - -+#if PY_MAJOR_VERSION >= 3 -+#define PY3 -+#endif -+ - /* - This implements a plugin factory for running Python plugins. It also - supports io-slaves with a kdemain() entry point. -@@ -347,17 +351,48 @@ int kdemain( int argc, char **argv ) - PyObject *pModule; - char *protocol = argv[1]; - -+#ifdef PY3 -+ /* Python 3 requires wchar_t*s for its Py_SetProgramName() and -+ PySys_SetArgv() calls. Python 2 uses the typical char*s. This is -+ probably not the best way to do it, but the algorithm is based on -+ Python 3's main(). -+ */ -+ wchar_t **program_args = (wchar_t **)PyMem_Malloc( -+ sizeof(wchar_t *) * (argc + 1)); -+ char *old_locale; -+ const char *argv_i; -+ -+ if (!program_args) { -+ /* out of memory */ -+ Py_FatalError("out of memory"); -+ } -+ for (int i = 0; i < argc; i++) { -+ program_args[i] = (wchar_t *)PyMem_Malloc( -+ sizeof(wchar_t) * (strlen(argv[i]) + 1)); -+ if (!program_args[i]) { -+ Py_FatalError("out of memory"); -+ } -+ argv_i = argv[i]; -+ if (mbsrtowcs(program_args[i], &argv_i, strlen(argv[i]), NULL) < 0) { -+ /* The conversion failed. */ -+ Py_FatalError("conversion to wchar_t* failed"); -+ } -+ } -+#else -+ char **program_args = argv; -+#endif // PY3 -+ - kDebug() << "Python kioslave starting"; - KComponentData slave(protocol); - kDebug() << "Created KComponentData for protocol " << protocol; - - QLibrary *pyLib = LoadPythonLibrary(); - -- Py_SetProgramName(argv[0]); -+ Py_SetProgramName(program_args[0]); - Py_Initialize(); - - //PyEval_InitThreads(); -- PySys_SetArgv(1, argv); -+ PySys_SetArgv(1, program_args); - - QString completePath = KStandardDirs::locate("data", QString("kio_python/%1/%2.py").arg(protocol).arg(protocol)); - kDebug() << "Path to Python kioslace is " << completePath; -@@ -388,8 +423,8 @@ int kdemain( int argc, char **argv ) - } - PyObject *pClass, *pArgs, *pArg1, *pArg2; - pArgs = PyTuple_New(2); -- pArg1 = PyString_FromString(argv[2]); -- pArg2 = PyString_FromString(argv[3]); -+ pArg1 = PyBytes_FromString(argv[2]); -+ pArg2 = PyBytes_FromString(argv[3]); - PyTuple_SetItem(pArgs, 0, pArg1); - PyTuple_SetItem(pArgs, 1, pArg2); - RunFunction(factoryFunction, pArgs); diff --git a/pykde4-4.13.97-use_system_sip_dir.patch b/pykde4-4.13.97-use_system_sip_dir.patch deleted file mode 100644 index c0c0d33..0000000 --- a/pykde4-4.13.97-use_system_sip_dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up pykde4-4.13.97/CMakeLists.txt.use_system_sip_dir pykde4-4.13.97/CMakeLists.txt ---- pykde4-4.13.97/CMakeLists.txt.use_system_sip_dir 2014-07-29 12:05:46.000000000 -0500 -+++ pykde4-4.13.97/CMakeLists.txt 2014-08-07 10:02:34.770363996 -0500 -@@ -108,7 +108,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}) - - # Use an extra option when compiling on Python 3. - if (PYTHON_VERSION_MAJOR GREATER 2) diff --git a/pykde4-4.14.3-checkstate-sip-4.19.5.patch b/pykde4-4.14.3-checkstate-sip-4.19.5.patch deleted file mode 100644 index ffc5384..0000000 --- a/pykde4-4.14.3-checkstate-sip-4.19.5.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up pykde4-4.14.3/sip/kdeui/kfontchooser.sip.me pykde4-4.14.3/sip/kdeui/kfontchooser.sip ---- pykde4-4.14.3/sip/kdeui/kfontchooser.sip.me 2018-01-17 13:16:50.738465947 +0100 -+++ pykde4-4.14.3/sip/kdeui/kfontchooser.sip 2018-01-17 13:28:24.665226258 +0100 -@@ -59,7 +59,7 @@ public: - - typedef QFlags DisplayFlags; - -- explicit KFontChooser (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState* sizeIsRelativeState = 0) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::DisplayFrame, const QStringList& = QStringList(), int = 8, Qt::CheckState* = 0)]; -+ explicit KFontChooser (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState sizeIsRelativeState = Qt::Unchecked) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::DisplayFrame, const QStringList& = QStringList(), int = 8, Qt::CheckState* = 0)]; - %MethodCode - Py_BEGIN_ALLOW_THREADS - sipCpp = new sipKFontChooser (a0, *a1, *a2, a3, &a4); -diff -up pykde4-4.14.3/sip/kdeui/kfontdialog.sip.me pykde4-4.14.3/sip/kdeui/kfontdialog.sip ---- pykde4-4.14.3/sip/kdeui/kfontdialog.sip.me 2018-01-17 13:18:31.112670465 +0100 -+++ pykde4-4.14.3/sip/kdeui/kfontdialog.sip 2018-01-17 13:28:00.121154351 +0100 -@@ -28,7 +28,7 @@ class KFontDialog : KDialog - - - public: -- explicit KFontDialog (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const QStringList& fontlist = QStringList(), Qt::CheckState* sizeIsRelativeState = 0) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::NoDisplayFlags, const QStringList& = QStringList(), Qt::CheckState* = 0)]; -+ explicit KFontDialog (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const QStringList& fontlist = QStringList(), Qt::CheckState sizeIsRelativeState = Qt::Unchecked) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::NoDisplayFlags, const QStringList& = QStringList(), Qt::CheckState* = 0)]; - %MethodCode - Py_BEGIN_ALLOW_THREADS - sipCpp= new sipKFontDialog (a0, *a1, *a2, &a3); diff --git a/pykde4-4.8.3-webkit.patch b/pykde4-4.8.3-webkit.patch deleted file mode 100644 index d5f6d8a..0000000 --- a/pykde4-4.8.3-webkit.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -up pykde4-4.8.3/CMakeLists.txt.webkit pykde4-4.8.3/CMakeLists.txt ---- pykde4-4.8.3/CMakeLists.txt.webkit 2012-05-14 13:37:25.955000001 +0200 -+++ pykde4-4.8.3/CMakeLists.txt 2012-05-14 14:18:31.840000524 +0200 -@@ -70,7 +70,6 @@ INCLUDE_DIRECTORIES( - ${QT_QTSQL_INCLUDE_DIR} - ${QT_QTXML_INCLUDE_DIR} - ${QT_QTSVG_INCLUDE_DIR} -- ${QT_QTWEBKIT_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR} - ${KDE4_INCLUDE_DIR}/solid - ${KDE4_INCLUDE_DIR}/kio -diff -up pykde4-4.8.3/sip/plasma/abstractrunner.sip.webkit pykde4-4.8.3/sip/plasma/abstractrunner.sip ---- pykde4-4.8.3/sip/plasma/abstractrunner.sip.webkit 2012-05-14 14:09:57.797000001 +0200 -+++ pykde4-4.8.3/sip/plasma/abstractrunner.sip 2012-05-14 14:11:08.439995732 +0200 -@@ -94,7 +94,6 @@ - #include - #include - #include --#include - %End - - namespace Plasma -@@ -288,8 +287,6 @@ protected: - sipType = sipType_Plasma_SvgWidget; - else if (dynamic_cast(sipCpp)) - sipType = sipType_Plasma_TabBar; -- else if (dynamic_cast(sipCpp)) -- sipType = sipType_Plasma_WebView; - else if (dynamic_cast(sipCpp)) - sipType = sipType_Plasma_CheckBox; - else if (dynamic_cast(sipCpp)) -diff -up pykde4-4.8.3/sip/plasma/animation.sip.webkit pykde4-4.8.3/sip/plasma/animation.sip ---- pykde4-4.8.3/sip/plasma/animation.sip.webkit 2012-05-14 14:21:54.546998613 +0200 -+++ pykde4-4.8.3/sip/plasma/animation.sip 2012-05-14 14:22:11.819999510 +0200 -@@ -163,8 +163,6 @@ protected: - sipType = sipType_Plasma_SvgWidget; - else if (dynamic_cast(sipCpp)) - sipType = sipType_Plasma_TabBar; -- else if (dynamic_cast(sipCpp)) -- sipType = sipType_Plasma_WebView; - else if (dynamic_cast(sipCpp)) - sipType = sipType_Plasma_CheckBox; - else if (dynamic_cast(sipCpp)) -@@ -292,5 +290,4 @@ public: - #include - #include - #include --#include - %End -diff -up pykde4-4.8.3/sip/plasma/plasmamod.sip.webkit pykde4-4.8.3/sip/plasma/plasmamod.sip ---- pykde4-4.8.3/sip/plasma/plasmamod.sip.webkit 2011-07-27 20:37:15.301683294 +0200 -+++ pykde4-4.8.3/sip/plasma/plasmamod.sip 2012-05-14 14:21:40.506000083 +0200 -@@ -27,7 +27,6 @@ - %Import QtGui/QtGuimod.sip - %Import QtNetwork/QtNetworkmod.sip - %Import QtSvg/QtSvgmod.sip --%Import QtWebKit/QtWebKitmod.sip - %Import QtXml/QtXmlmod.sip - %Import QtDeclarative/QtDeclarativemod.sip - %Import QtScript/QtScriptmod.sip -@@ -116,5 +115,4 @@ - %Include toolbutton.sip - %Include treeview.sip - %Include videowidget.sip --%Include webview.sip - %Include windoweffects.sip diff --git a/pykde4-dont-change-environment-cause-crash.patch b/pykde4-dont-change-environment-cause-crash.patch deleted file mode 100644 index 2c21eee..0000000 --- a/pykde4-dont-change-environment-cause-crash.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up pykde4-4.10.5/__init__.py.me pykde4-4.10.5/__init__.py ---- pykde4-4.10.5/__init__.py.me 2018-12-04 13:31:43.545667006 +0100 -+++ pykde4-4.10.5/__init__.py 2018-12-04 13:31:51.116708365 +0100 -@@ -1,4 +1,13 @@ - import sys,DLFCN --# This is needed to ensure that dynamic_cast and RTTI works inside kdelibs. --sys.setdlopenflags(DLFCN.RTLD_NOW|DLFCN.RTLD_GLOBAL) -- -\ Kein Zeilenumbruch am Dateiende. -+ -+def main(): -+ dlopenflag = sys.getdlopenflags() -+ try: -+ # This is needed to ensure that dynamic_cast and RTTI works inside kdelibs. -+ sys.setdlopenflags(DLFCN.RTLD_NOW|DLFCN.RTLD_GLOBAL) -+ finally: -+ # set to default dlopenflag to avoid problem in other modules -+ sys.setdlopenflags(dlopenflag) -+ -+if __name__=='__main__': -+ main() diff --git a/pykde4.spec b/pykde4.spec deleted file mode 100644 index e68dae0..0000000 --- a/pykde4.spec +++ /dev/null @@ -1,731 +0,0 @@ -%define pyqt4_version_min 4.9.5 -%define sip_version_min 4.14 -%if 0%{?fedora} > 17 -%define python3 1 -%endif -%if 0%{?fedora} || 0%{?epel} -%define qscintilla 1 -%define webkit 1 -%endif -%if 0%{?fedora} < 24 -%define akonadi 1 -%define nepomuk 1 -%endif - -%{!?__python2:%global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch:%global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%{!?python2_version:%global python2_version %(%{__python2} -c "import sys; sys.stdout.write(sys.version[:3])")} - -Name: pykde4 -Version: 4.14.3 -Release: 30%{?dist} -Summary: Python bindings for KDE4 - -# http://techbase.kde.org/Policies/Licensing_Policy -License: LGPLv2+ -URL: http://developer.kde.org/language-bindings/ -%global revision %(echo %{version} | cut -d. -f3) -%if %{revision} >= 50 -%global stable unstable -%else -%global stable stable -%endif -Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz - -Source2: pykdeuic4.sh - -# Revert https://reviewboard.kde.org/r/101903 -# hard-codes sip path to /usr/share/sip, instead of respecting system path -Patch100: pykde4-4.13.97-use_system_sip_dir.patch - -## upstreamable patches - -## upstream patches -Patch1: 0001-use-LIB_PYTHON-realpath.patch -Patch2: 0002-Add-some-missing-link-libraries.patch -Patch3: 0003-Fix-build-with-sip-4.19.patch - -# debian patches -Patch201: add_qt_kde_definitions.diff -Patch202: fix_kpythonpluginfactory_build.diff -Patch203: make_pykde4_respect_sip_flags.diff -# rebased pythonpluginfactory_python3.diff -Patch207: pykde4-4.11.2-pythonpluginfactory_python3.patch -Patch209: kubuntu_kpythonpluginfactory_3.2support.diff - -# downstream/rhel patches -Patch300: pykde4-4.8.3-webkit.patch -Patch301: pykde4-dont-change-environment-cause-crash.patch -Patch302: pykde4-4.14.3-checkstate-sip-4.19.5.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1546784 -Patch303: pykdeuic4-shbang.patch - -BuildRequires: gcc-c++ gcc -BuildRequires: kdelibs4-devel >= 4.14 -%if 0%{?nepomuk} -BuildRequires: nepomuk-devel -%endif -%if 0%{?akonadi} -BuildRequires: kdepimlibs-devel >= 4.14 -BuildRequires: pkgconfig(akonadi) -%endif -BuildRequires: pkgconfig(qimageblitz) -BuildRequires: pkgconfig(soprano) -%if 0%{?webkit} -BuildRequires: pkgconfig(QtWebKit) -BuildRequires: PyQt4-webkit-devel -%endif -BuildRequires: PyQt4-devel >= %{pyqt4_version_min}, sip-devel >= %{sip_version_min} -BuildRequires: python2-devel -%if 0%{?python3} -BuildRequires: python3-devel -BuildRequires: python3-PyQt4-devel >= %{pyqt4_version_min}, python3-sip-devel >= %{sip_version_min} -%global python3_abiflags %(%{__python3} -c "import sys ; print (\\"%s\\" % (getattr(sys,'abiflags','')))") -%endif -%if 0%{?qscintilla} -BuildRequires: qscintilla-devel >= 2.4 -%endif - -%{?kdelibs4_requires} -Requires: kate4-part -%global pyqt4_version %((%{__python} -c 'import PyQt4.pyqtconfig; print(PyQt4.pyqtconfig._pkg_config["pyqt_version_str"])' 2> /dev/null || echo %{pyqt4_version_min}) | cut -d- -f 1) -Requires: PyQt4 >= %{pyqt4_version} -%if 0%{?webkit} -Requires: PyQt4-webkit -%endif -%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} -Provides: python-kde4 = %{version}-%{release} -Obsoletes: PyKDE4 < 4.7.97-1 -Provides: PyKDE4 = %{version}-%{release} -Provides: PyKDE4%{?_isa} = %{version}-%{release} - -%if ! 0%{?akonadi} -Obsoletes: pykde4-akonadi < 4.14.3-15 -%endif - -%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$ - -%description -%{summary}. - -%package akonadi -Summary: Akonadi runtime support for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: python-kde4-akonadi = %{version}-%{release} -Obsoletes: PyKDE4-akonadi < 4.7.97-1 -Provides: PyKDE4-akonadi = %{version}-%{release} -Provides: PyKDE4-akonadi%{?_isa} = %{version}-%{release} -%description akonadi -%{summary}. - -%package devel -Summary: Files needed to build %{name}-based applications -# when -examples split out from -devel -Obsoletes: pykde4-devel < 4.14.3-8 -Provides: python-kde4-devel = %{version}-%{release} -Obsoletes: PyKDE4-devel < 4.7.97-1 -Provides: PyKDE4-devel = %{version}-%{release} -Provides: PyKDE4-devel%{?_isa} = %{version}-%{release} -%if 0%{?akonadi} -Requires: %{name}-akonadi%{?_isa} = %{version}-%{release} -%endif -Requires: PyQt4-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -%description devel -%{summary}. - -%package examples -Summary: Programming examples for %{name} -# when -examples split out from -devel -Obsoletes: pykde4-devel < 4.14.3-8 -Requires: %{name}%{?_isa} = %{version}-%{release} -%description examples -%{summary}. - -%package -n python3-pykde4 -Summary: Python 3 bindings for KDE -Provides: python3-kde4 = %{version}-%{release} -Obsoletes: python3-PyKDE4 < 4.7.97-1 -%if ! 0%{?akonadi} -Obsoletes: python3-pykde4-akonadi < 4.14.3-15 -%endif -Provides: python3-PyKDE4 = %{version}-%{release} -Provides: python3-PyKDE4%{?_isa} = %{version}-%{release} -%{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}} -Requires: python3-PyQt4 >= %{pyqt4_version} -%description -n python3-pykde4 -%{summary}. - -%package -n python3-pykde4-akonadi -Summary: Akonadi runtime support for %{name} -Provides: python3-kde4-akonadi = %{version}-%{release} -Obsoletes: python3-PyKDE4-akonadi < 4.7.97-1 -Provides: python3-PyKDE4-akonadi = %{version}-%{release} -Provides: python3-PyKDE4-akonadi%{?_isa} = %{version}-%{release} -Requires: python3-PyKDE4%{?_isa} = %{version}-%{release} -%description -n python3-pykde4-akonadi -%{summary}. - -%package -n python3-pykde4-devel -Summary: Files needed to build %{name}-based applications -# when -examples split out from -devel -Obsoletes: python3-pykde4-devel < 4.14.3-8 -Requires: python3-PyQt4-devel -Requires: python3-pykde4%{?_isa} = %{version}-%{release} -%if 0%{?akonadi} -Requires: python3-pykde4-akonadi%{?_isa} = %{version}-%{release} -%endif -Obsoletes: python3-PyKDE4-devel < 4.7.97-1 -Provides: python3-PyKDE4-devel = %{version}-%{release} -Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} -%description -n python3-pykde4-devel -%{summary}. - -%package -n python3-pykde4-examples -Summary: Programming examples for %{name} -# when -examples split out from -devel -Obsoletes: python3-pykde4-devel < 4.14.3-8 -Requires: python3-pykde4%{?_isa} = %{version}-%{release} -%description -n python3-pykde4-examples -%{summary}. - - -%prep -%setup -q -n pykde4-%{version} - -%patch100 -p1 -b .use_system_sip_dir - -%patch1 -p1 -b .0001 -%patch2 -p1 -b .0002 -%patch3 -p1 -b .0003 - -%patch201 -p1 -b .201 -%patch202 -p1 -b .202 -%patch203 -p1 -b .203 -# omit these for now, needs work -- rex -#patch207 -p1 -b .207 -#patch209 -p1 -b .209 - -%if ! 0%{?webkit} -%patch300 -p1 -b .webkit -%endif -%patch301 -p1 -b .crash-with-other-python-module -%patch302 -p1 -b .checkstate-sip-4.19.5 -%patch303 -p1 - -%build -%if 0%{?python3} -mkdir -p %{_target_cpu}-python3 -pushd %{_target_cpu}-python3 -%{cmake_kde4} \ - -DPYTHON_EXECUTABLE:PATH=%{__python3} \ - .. - -make %{?_smp_mflags} -popd -%endif - -mkdir -p %{_target_cpu} -pushd %{_target_cpu} -%{cmake_kde4} \ - -DPYKDEUIC4_ALTINSTALL:BOOL=ON \ - -DPYTHON_EXECUTABLE:PATH=%{?__python2}%{!?__python2:%{__python}} \ - .. - -make %{?_smp_mflags} -popd - - -%install -%if 0%{?python3} -make install/fast DESTDIR=%{buildroot} -C %{_target_cpu}-python3 -mv %{buildroot}%{_datadir}/sip %{buildroot}%{_datadir}/python3-sip - -# omit conflict with base kpythonpluginfactory -rm -fv %{buildroot}%{_kde4_libdir}/kde4/kpythonpluginfactory.so - -# install pykde4 examples under correct dir -mkdir -p %{buildroot}%{_docdir}/python3-pykde4 -rm -fv %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py? -mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/python3-pykde4/ -%endif - -make install/fast DESTDIR=%{buildroot} -C %{_target_cpu} - -# install pykde4 examples under correct dir -mkdir -p %{buildroot}%{_docdir}/pykde4 -rm -fv %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py? -mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ - -# install pyuic4 wrapper to support both python2/python3 -rm -fv %{buildroot}%{_bindir}/pykdeuic4{,-%{python2_version},-%{python3_version}} -install -p -m755 -D %{SOURCE2} \ - %{buildroot}%{_bindir}/pykdeuic4 -sed -i \ - -e "s|@PYTHON3@|%{__python3}|g" \ - -e "s|@PYTHON2@|%{__python2}|g" \ - %{buildroot}%{_bindir}/pykdeuic4 - -## unpackaged files -%if ! 0%{?nepomuk} -rm -fv %{buildroot}%{python2_sitearch}/PyKDE4/nepomuk.so -rm -fv %{buildroot}%{python3_sitearch}/PyKDE4/nepomuk.so -%endif - - -%files -%license COPYING -%dir %{python2_sitearch}/PyKDE4/ -%{python2_sitearch}/PyKDE4/__init__.py* -%{python2_sitearch}/PyKDE4/dnssd.so -%{python2_sitearch}/PyKDE4/kdecore.so -%{python2_sitearch}/PyKDE4/kdeui.so -%{python2_sitearch}/PyKDE4/khtml.so -%{python2_sitearch}/PyKDE4/kio.so -%{python2_sitearch}/PyKDE4/knewstuff.so -%{python2_sitearch}/PyKDE4/kparts.so -%{python2_sitearch}/PyKDE4/kterminal.so -%{python2_sitearch}/PyKDE4/ktexteditor.so -%{python2_sitearch}/PyKDE4/kutils.so -%if 0%{?nepomuk} -%{python2_sitearch}/PyKDE4/nepomuk.so -%endif -%{python2_sitearch}/PyKDE4/phonon.so -%{python2_sitearch}/PyKDE4/plasma.so -%{python2_sitearch}/PyKDE4/pykdeconfig.py* -%{python2_sitearch}/PyKDE4/solid.so -%{python2_sitearch}/PyKDE4/soprano.so -%{python2_sitearch}/PyQt4/uic/ -%dir %{_docdir}/pykde4 -%{_kde4_libdir}/kde4/kpythonpluginfactory.so - -%if 0%{?akonadi} -%files akonadi -%{python2_sitearch}/PyKDE4/akonadi.so -%endif - -%files devel -%{_kde4_bindir}/pykdeuic4 -%{_datadir}/sip/PyKDE4/ - -%files examples -%{_docdir}/pykde4/examples/ - -%if 0%{?python3} -%files -n python3-pykde4 -%license COPYING -%dir %{python3_sitearch}/PyKDE4/ -%{python3_sitearch}/PyKDE4/__init__.py* -%{python3_sitearch}/PyKDE4/__pycache__/ -%{python3_sitearch}/PyKDE4/dnssd.so -%{python3_sitearch}/PyKDE4/kdecore.so -%{python3_sitearch}/PyKDE4/kdeui.so -%{python3_sitearch}/PyKDE4/khtml.so -%{python3_sitearch}/PyKDE4/kio.so -%{python3_sitearch}/PyKDE4/knewstuff.so -%{python3_sitearch}/PyKDE4/kparts.so -%{python3_sitearch}/PyKDE4/kterminal.so -%{python3_sitearch}/PyKDE4/ktexteditor.so -%{python3_sitearch}/PyKDE4/kutils.so -%if 0%{?nepomuk} -%{python3_sitearch}/PyKDE4/nepomuk.so -%endif -%{python3_sitearch}/PyKDE4/phonon.so -%{python3_sitearch}/PyKDE4/plasma.so -%{python3_sitearch}/PyKDE4/pykdeconfig.py -%{python3_sitearch}/PyKDE4/solid.so -%{python3_sitearch}/PyKDE4/soprano.so -%{python3_sitearch}/PyQt4/uic/ -%dir %{_docdir}/python3-pykde4/ - -%if 0%{?akonadi} -%files -n python3-pykde4-akonadi -%{python3_sitearch}/PyKDE4/akonadi.so -%endif - -%files -n python3-pykde4-devel -%{_kde4_bindir}/pykdeuic4 -%{_datadir}/python3-sip/PyKDE4/ - -%files -n python3-pykde4-examples -%{_docdir}/python3-pykde4/examples/ -%endif - - -%changelog -* Sat Feb 02 2019 Fedora Release Engineering - 4.14.3-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Dec 04 2018 Than Ngo - 4.14.3-29 -- improved patch to fix segfault with other python module - -* Tue Oct 09 2018 Than Ngo - 4.14.3-28 -- fixed #1546784, python shbang - -* Tue Jul 24 2018 Than Ngo - 4.14.3-27 -- fixed FTBFS - -* Fri Jul 13 2018 Fedora Release Engineering - 4.14.3-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 4.14.3-25 -- Rebuilt for Python 3.7 - -* Fri Apr 13 2018 Rex Dieter - 4.14.3-24 -- rebuild (sip) - -* Mon Feb 19 2018 Rex Dieter - 4.14.3-23 -- pykdeuic4.py: omit shbang (#1546784) - -* Fri Feb 09 2018 Fedora Release Engineering - 4.14.3-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 15 2018 Than Ngo - 4.14.3-21 -- fixed bz#1456075, import error in PyKDE4 -- fixed bz#1442464, segfault with other python module -- fixed build failure sip-4.19.5 - -* Thu Aug 03 2017 Fedora Release Engineering - 4.14.3-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 4.14.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jul 05 2017 Rex Dieter - 4.14.3-18 -- rebuild (sip) - -* Sat Feb 11 2017 Fedora Release Engineering - 4.14.3-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Rex Dieter - 4.14.3-16 -- filter provides - -* Sun Jan 01 2017 Rex Dieter - 4.14.3-15 -- pykde4 FTBFS against sip-4.19+ (#1416859) -- disable akonadi support (f24+) - -* Mon Dec 19 2016 Miro Hrončok - 4.14.3-14 -- Rebuild for Python 3.6 - -* Tue Jul 19 2016 Fedora Release Engineering - 4.14.3-13 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Tue Jul 05 2016 Rex Dieter - 4.14.3-12 -- rebuild (sip) - -* Wed Feb 17 2016 Rex Dieter 4.14.3-11 -- disable nepomuk f24+ - -* Thu Feb 04 2016 Fedora Release Engineering - 4.14.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Nov 10 2015 Fedora Release Engineering - 4.14.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Mon Oct 19 2015 Rex Dieter 4.14.3-8 -- new -examples subpkg, non-multilib subpkg (#1001259) - -* Thu Jun 18 2015 Fedora Release Engineering - 4.14.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Jun 12 2015 Rex Dieter 4.14.3-6 -- rebuild (sip/PyQt4) - -* Fri Jun 05 2015 Rex Dieter 4.14.3-5 -- -devel/python3-pykde4-devel: use pykdeuic4 wrapper (see also #1193107) - -* Sat May 02 2015 Kalev Lember - 4.14.3-4 -- Rebuilt for GCC 5 C++11 ABI change - -* Sat Jan 31 2015 Rex Dieter 4.14.3-3 -- Requires: kate4-part - -* Sat Jan 17 2015 Rex Dieter 4.14.3-2 -- kde-applications fixes, cleanup - -* Sat Nov 08 2014 Rex Dieter - 4.14.3-1 -- 4.14.3 - -* Sat Oct 11 2014 Rex Dieter - 4.14.2-1 -- 4.14.2 - -* Mon Sep 15 2014 Rex Dieter - 4.14.1-1 -- 4.14.1 - -* Sun Aug 17 2014 Fedora Release Engineering - 4.14.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Aug 16 2014 Rex Dieter 4.14.0-2 -- respin - -* Thu Aug 14 2014 Rex Dieter - 4.14.0-1 -- 4.14.0 - -* Fri Aug 08 2014 Rex Dieter 4.13.97-4 -- fix out-of-src-tree build (kde#338137) - -* Fri Aug 08 2014 Rex Dieter 4.13.97-3 -- fix use_system_sip_dir.patch harder - -* Thu Aug 07 2014 Rex Dieter 4.13.97-2 -- fix/rebase use_system_sip_dir.patch - -* Tue Aug 05 2014 Rex Dieter - 4.13.97-1 -- 4.13.97 - -* Mon Jul 14 2014 Rex Dieter - 4.13.3-1 -- 4.13.3 - -* Mon Jun 30 2014 Rex Dieter 4.13.2-2 -- upstream fix for PyQt-4.11 ftbfs - -* Mon Jun 09 2014 Rex Dieter - 4.13.2-1 -- 4.13.2 - -* Sat Jun 07 2014 Fedora Release Engineering - 4.13.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Jun 02 2014 Rex Dieter 4.13.1-4 -- FTBFS using sip-4.16 - -* Wed May 28 2014 Rex Dieter 4.13.1-3 -- rebuild (sip/PyQt4) - -* Mon May 12 2014 Rex Dieter 4.13.1-2 -- rebuild (f21-python) - -* Sat May 10 2014 Rex Dieter 4.13.1-1 -- 4.13.1 - -* Fri Apr 11 2014 Rex Dieter - 4.13.0-1 -- 4.13.0 - -* Thu Apr 03 2014 Rex Dieter - 4.12.97-1 -- 4.12.97 - -* Sat Mar 22 2014 Rex Dieter - 4.12.95-1 -- 4.12.95 - -* Wed Mar 19 2014 Rex Dieter - 4.12.90-1 -- 4.12.90 - -* Sun Mar 16 2014 Rex Dieter - 4.12.3-3 -- rebuild (sip) -- s/python_site/python2_site/ - -* Fri Mar 07 2014 Rex Dieter 4.12.3-2 -- python_library_realpath.patch - -* Sat Mar 01 2014 Rex Dieter - 4.12.3-1 -- 4.12.3 - -* Mon Feb 17 2014 Rex Dieter 4.12.2-4 -- drop pykde4_akonadi macro usage - -* Mon Feb 17 2014 Rex Dieter 4.12.2-3 -- flesh out python(3)-kde4 related Provides - -* Sat Feb 15 2014 Rex Dieter 4.12.2-2 -- rebuild (sip) - -* Fri Jan 31 2014 Rex Dieter - 4.12.2-1 -- 4.12.2 - -* Fri Jan 10 2014 Rex Dieter - 4.12.1-1 -- 4.12.1 - -* Thu Dec 19 2013 Rex Dieter - 4.12.0-1 -- 4.12.0 - -* Sun Dec 01 2013 Rex Dieter - 4.11.97-1 -- 4.11.97 - -* Thu Nov 21 2013 Rex Dieter - 4.11.95-1 -- 4.11.95 - -* Fri Nov 15 2013 Rex Dieter 4.11.90-2 -- make kate-part dep unversioned - -* Fri Nov 15 2013 Rex Dieter 4.11.90-1 -- 4.11.90 - -* Sat Nov 02 2013 Rex Dieter - 4.11.3-1 -- 4.11.3 - -* Wed Oct 16 2013 Rex Dieter 4.11.2-2 -- rebuild (sip/PyQt4), rebase patches - -* Sat Sep 28 2013 Rex Dieter - 4.11.2-1 -- 4.11.2 - -* Tue Sep 03 2013 Rex Dieter - 4.11.1-1 -- 4.11.1 - -* Thu Aug 08 2013 Than Ngo - 4.11.0-1 -- 4.11.0 - -* Wed Jul 31 2013 Rex Dieter 4.10.97-2 -- rebuild - -* Thu Jul 25 2013 Rex Dieter - 4.10.97-1 -- 4.10.97 - -* Tue Jul 23 2013 Rex Dieter - 4.10.95-1 -- 4.10.95 - -* Thu Jun 27 2013 Rex Dieter - 4.10.90-1 -- 4.10.90 - -* Mon Jun 17 2013 Rex Dieter 4.10.4-2 -- rebuild (sip) - -* Sat Jun 01 2013 Rex Dieter - 4.10.4-1 -- 4.10.4 - -* Mon May 06 2013 Than Ngo - 4.10.3-1 -- 4.10.3 - -* Sun Mar 31 2013 Rex Dieter - 4.10.2-1 -- 4.10.2 - -* Fri Mar 22 2013 Rex Dieter 4.10.1-3 -- introduce/use feature macros for qscintilla, webkit - -* Mon Mar 04 2013 Rex Dieter 4.10.1-2 -- rebuild (sip/PyQt4) - -* Sat Mar 02 2013 Rex Dieter 4.10.1-1 -- 4.10.1 - -* Thu Jan 31 2013 Rex Dieter - 4.10.0-1 -- 4.10.0 - -* Sun Jan 20 2013 Rex Dieter - 4.9.98-1 -- 4.9.98 - -* Sun Jan 13 2013 Rex Dieter 4.9.97-4 -- manually specify PYTHON_LIBRARIES again, fixes regression that tries - to load libpython.so from python-devel - -* Mon Jan 07 2013 Rex Dieter 4.9.97-3 -- fix kpythonpluginfactory (kde#312618) - -* Fri Jan 04 2013 Rex Dieter 4.9.97-2 -- fixup/cleanup pykdeuic4 naming and multilib-hackery - -* Fri Jan 04 2013 Rex Dieter - 4.9.97-1 -- 4.9.97 - -* Thu Dec 20 2012 Rex Dieter - 4.9.95-1 -- 4.9.95 - -* Mon Dec 03 2012 Rex Dieter 4.9.90-1 -- 4.9.90 (4.10 beta2) - -* Mon Dec 03 2012 Than Ngo - 4.9.4-1 -- 4.9.4 - -* Wed Nov 21 2012 Rex Dieter 4.9.3-2 -- upstream patch to fix text handling - -* Sat Nov 03 2012 Rex Dieter - 4.9.3-1 -- 4.9.3 - -* Mon Oct 08 2012 Rex Dieter - 4.9.2-3 -- (re)enable python3 support -- better sip414/pyqt495 patch - -* Mon Oct 01 2012 Rex Dieter 4.9.2-2 -- rebuild (sip) - -* Sat Sep 29 2012 Rex Dieter - 4.9.2-1 -- 4.9.2 - -* Mon Sep 03 2012 Than Ngo - 4.9.1-1 -- 4.9.1 - -* Thu Jul 26 2012 Lukas Tinkl - 4.9.0-1 -- 4.9.0 - -* Sat Jul 21 2012 Fedora Release Engineering - 4.8.97-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Jul 11 2012 Rex Dieter - 4.8.97-1 -- 4.8.97 - -* Wed Jun 27 2012 Jaroslav Reznik - 4.8.95-1 -- 4.8.95 - -* Sat Jun 09 2012 Rex Dieter - 4.8.90-1 -- 4.8.90 - -* Tue May 29 2012 Rex Dieter 4.8.80-1 -- 4.8.80 - -* Mon May 14 2012 Than Ngo 4.8.3-3 -- add rhel condition - -* Mon Apr 30 2012 Rex Dieter 4.8.3-2 -- drop BR: kde-workspace-devel - -* Mon Apr 30 2012 Jaroslav Reznik - 4.8.3-1 -- 4.8.3 - -* Mon Apr 16 2012 Rex Dieter 4.8.2-2 -- borrow make_pykde4_respect_sip_flags.diff from debian - -* Fri Mar 30 2012 Rex Dieter - 4.8.2-1 -- 4.8.2 - -* Mon Mar 05 2012 Jaroslav Reznik - 4.8.1-1 -- 4.8.1 - -* Sun Jan 22 2012 Rex Dieter - 4.8.0-1 -- 4.8.0 - -* Wed Jan 04 2012 Rex Dieter 4.7.97-1 -- 4.7.97 - -* Sun Jan 01 2012 Rex Dieter 4.7.95-10 -- PyKDE4 -> pykde4 rename - -* Fri Dec 23 2011 Rex Dieter 4.7.95-2 -- rebuild (sip/PyQt4) - -* Wed Dec 21 2011 Radek Novacek - 4.7.95-1 -- 4.7.95 - -* Mon Dec 05 2011 Rex Dieter 4.7.90-1 -- 4.7.90 - -* Thu Nov 24 2011 Jaroslav Reznik 4.7.80-1 -- 4.7.80 (beta 1) - -* Sat Oct 29 2011 Rex Dieter 4.7.3-1 -- 4.7.3 -- pkgconfig-style deps -- Provides: pykde4 -- tighten subpkg deps via %%_isa - -* Sat Oct 08 2011 Rex Dieter 4.7.2-2 -- Requires: kate-part - -* Tue Oct 04 2011 Rex Dieter 4.7.2-1 -- 4.7.2 - -* Fri Sep 16 2011 Rex Dieter 4.7.1-2 -- drop BR: kdesdk-devel/kate-devel kdegraphics-devel/okular-devel - -* Wed Sep 14 2011 Radek Novacek 4.7.1-1 -- 4.7.1 - -* Tue Jul 26 2011 Jaroslav Reznik 4.7.0-1 -- 4.7.0 - -* Fri Jul 08 2011 Rex Dieter 4.6.95-1 -- 4.6.95 - -* Thu Jul 07 2011 Rex Dieter 4.6.90-1 -- first try - diff --git a/pykdeuic4-shbang.patch b/pykdeuic4-shbang.patch deleted file mode 100644 index dce7749..0000000 --- a/pykdeuic4-shbang.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -up pykde4-4.14.3/tools/pykdeuic4/pykdeuic4.py.shbang pykde4-4.14.3/tools/pykdeuic4/pykdeuic4.py ---- pykde4-4.14.3/tools/pykdeuic4/pykdeuic4.py.shbang 2014-08-14 15:17:11.000000000 -0500 -+++ pykde4-4.14.3/tools/pykdeuic4/pykdeuic4.py 2018-02-19 12:50:17.121849886 -0600 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # - # Copyright (C) 2007-9 Simon Edwards - # Copyright (C) 2011 Luca Beltrame diff --git a/pykdeuic4.sh b/pykdeuic4.sh deleted file mode 100644 index 95e7494..0000000 --- a/pykdeuic4.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -python3 -c "import PyKDE4" &> /dev/null -if [ $? -eq 0 ]; then - exec python3 -m PyQt4.uic.pykdeuic4 ${1+"$@"} -else - exec python2 -m PyQt4.uic.pykdeuic4 ${1+"$@"} -fi diff --git a/sources b/sources deleted file mode 100644 index 824a036..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -945a7492f1ab8cc874e0822f62484b12 pykde4-4.14.3.tar.xz