summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kde-base/pykde4/Manifest6
-rw-r--r--kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch12
-rw-r--r--kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch93
-rw-r--r--kde-base/pykde4/files/pykde4-mapped-type-fix.patch64
-rw-r--r--kde-base/pykde4/pykde4-4.5.90.ebuild2
5 files changed, 97 insertions, 80 deletions
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 0834bc40ec2..3949d6a6991 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,10 +1,8 @@
AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
-AUX pykde4-4.4.92-build-fix-sip.patch 557 RMD160 d9d1c299f6acbc97c75ff8ddc23bd13d1ff0bce6 SHA1 6cb4154b980320fcff792434b8abf7b9fce1ce68 SHA256 0b2fd1753e7fe41698a8c1c0568c4cd52fd14ddc6c010f91f6052fe89044cf6e
-AUX pykde4-mapped-type-fix.patch 1406 RMD160 7af64a0841d604fc695441524561142a0ad1e3fe SHA1 8167ae067f6cb47b7685c2d052b9d57d3e88ba10 SHA256 94cbc246a62fe0256e3a57bdfd1aae6b1a313229031433f65a389442c7fa10e2
+AUX pykde4-4.5.90-typedefs-fix.patch 2110 RMD160 93a7e6b0a23fda700342ac4178a33fbe457c8244 SHA1 59b3992de8def0e415a055246d2d3d0a2934d8d9 SHA256 4b441ad05c553383a94e4856462c0c747b81acc5fe44782cdcb4371715b7ddf3
DIST kdebindings-4.5.90.tar.bz2 7077557 RMD160 78627250786a0f81b46fd2dbb9be4704e682243d SHA1 721ea1ba951255701f7137bdf2c122fca61c6b55 SHA256 28214858cf0e686f46204e1f7460d29d59719488e189ccc7fae438066513f83d
-EBUILD pykde4-4.5.90.ebuild 1868 RMD160 adb470a400e1f234e02ef6ed57453e196d2ef2df SHA1 13a6e70e2174b93f5cd97f71a1828530679ac894 SHA256 dec8cb155f4a7b8108f11b929dd24f2b83e3c0c555f39f37fa370068e423b090
+EBUILD pykde4-4.5.90.ebuild 1919 RMD160 4a883d7c636c1a0db127a6ecc49836e234bf97a3 SHA1 21dfb7f3402141a740df618c3fff742d50729d87 SHA256 945a4f2e6789af3293295877717a93cb5ffdd77ae3dc9a7b25521841bd5b171a
EBUILD pykde4-4.5.9999.ebuild 1833 RMD160 2cb6087e11f9e0fe4b9e45a334a82a88fc7709bf SHA1 d513cb3ff83444e4aea85b05109ff5073cb09457 SHA256 c1d998a3ef8d4cb387d97517b0bd2c68b196a2181205ab9ac964594e9f7d6997
EBUILD pykde4-4.6.9999.ebuild 1857 RMD160 9e93cce5846dd356526cf7d149fde692fc2db303 SHA1 e00709826bdddaefdc51d1500d78dedc2b1858c9 SHA256 b17f3ba191d5ea239e7c5bb4474c94e2e79963ebc6345a798971e8dc47deddbb
EBUILD pykde4-9999.ebuild 1857 RMD160 9e93cce5846dd356526cf7d149fde692fc2db303 SHA1 e00709826bdddaefdc51d1500d78dedc2b1858c9 SHA256 b17f3ba191d5ea239e7c5bb4474c94e2e79963ebc6345a798971e8dc47deddbb
-MISC 0001-pykde4-4.5.90-depend-on-newer-PyQt4-with-declarative.patch 2948 RMD160 f5d684dc42c84bbdf43fe0511d0d967d7f4134d6 SHA1 3962fadd62dddba71eb02e706d760bfd0d4e2fc8 SHA256 011611cfe4b2f38ea5312d65a1078ab83035eef5de3cf2aa3a2c34cead13cf71
MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
diff --git a/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch b/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch
deleted file mode 100644
index 570eb15fc90..00000000000
--- a/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip
---- pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip 2010-05-27 19:21:46.000000000 +0200
-+++ pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip 2010-07-15 06:36:27.000000000 +0200
-@@ -19,7 +19,7 @@
-
- namespace Akonadi
- {
--class AddressAttribute : Akonadi::Attribute
-+class AddressAttribute : Akonadi::Attribute /NoDefaultCtors/
- {
- %TypeHeaderCode
- #include <akonadi/kmime/addressattribute.h>
diff --git a/kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch b/kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch
new file mode 100644
index 00000000000..4a5c16edbfc
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.5.90-typedefs-fix.patch
@@ -0,0 +1,93 @@
+--- pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip 2010-12-26 00:33:58.884995287 +0100
++++ pykde4-4.5.4/python/pykde4/sip/kdecore/typedefs.sip 2010-12-26 00:34:36.146000281 +0100
+@@ -582,90 +582,6 @@ template <TYPE1,TYPE2*>
+ %End
+ };
+
+-template <TYPE>
+-%MappedType QSet<TYPE>
+-{
+-%TypeHeaderCode
+-#include <qset.h>
+-%End
+-
+-%ConvertFromTypeCode
+- // Create the list.
+- PyObject *l;
+-
+- if ((l = PyList_New(sipCpp->size())) == NULL)
+- return NULL;
+-
+- // Set the list elements.
+- QSet<TYPE> set = *sipCpp;
+- int i = 0;
+- foreach (TYPE value, set)
+- {
+- PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj);
+- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
+- {
+- Py_DECREF(l);
+-
+- if (obj)
+- Py_DECREF(obj);
+-
+- return NULL;
+- }
+-
+- Py_DECREF(obj);
+- i++;
+- }
+-
+- return l;
+-%End
+-
+-%ConvertToTypeCode
+- // Check the type if that is all that is required.
+- if (sipIsErr == NULL)
+- {
+- if (!PyList_Check(sipPy))
+- return 0;
+- }
+-
+- // Check the type if that is all that is required.
+- if (sipIsErr == NULL)
+- {
+- if (!PyList_Check(sipPy))
+- return 0;
+-
+- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
+- return 0;
+- }
+-
+- QSet<TYPE> *qs = new QSet<TYPE>;
+-
+- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- {
+- int state;
+-
+- TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+-
+- if (*sipIsErr)
+- {
+- sipReleaseType(t, sipType_TYPE, state);
+-
+- delete qs;
+- return 0;
+- }
+-
+- *qs << *t;
+-
+- sipReleaseType(t, sipType_TYPE, state);
+- }
+-
+- *sipCppPtr = qs;
+-
+- return sipGetState(sipTransferObj);
+-%End
+-};
+-
+-
+ template <TYPE1,TYPE2>
+ %MappedType QPair<TYPE1,TYPE2>
+ {
diff --git a/kde-base/pykde4/files/pykde4-mapped-type-fix.patch b/kde-base/pykde4/files/pykde4-mapped-type-fix.patch
deleted file mode 100644
index ebf1a54026f..00000000000
--- a/kde-base/pykde4/files/pykde4-mapped-type-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip 2010/01/16 10:06:39 1075490
-+++ trunk/KDE/kdebindings/python/pykde4/sip/kdecore/typedefs.sip 2010/09/01 15:31:50 1170602
-@@ -733,61 +733,6 @@
- };
-
-
--%MappedType QList<uint>
--{
--%TypeHeaderCode
--#include <qlist.h>
--%End
--
--%ConvertFromTypeCode
-- // Create the list.
-- PyObject *l;
--
-- if ((l = PyList_New(sipCpp->size())) == NULL)
-- return NULL;
--
-- // Set the list elements.
-- for (int i = 0; i < sipCpp->size(); ++i) {
-- PyObject *pobj;
--
--#if PY_MAJOR_VERSION >= 3
-- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
--#else
-- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
--#endif
-- Py_DECREF(l);
--
-- return NULL;
-- }
--
-- PyList_SET_ITEM(l, i, pobj);
-- }
--
-- return l;
--%End
--
--%ConvertToTypeCode
-- // Check the type if that is all that is required.
-- if (sipIsErr == NULL)
-- return PyList_Check(sipPy);
--
-- QList<uint> *ql = new QList<uint>;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--#if PY_MAJOR_VERSION >= 3
-- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
--#else
-- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
--#endif
-- }
--
-- *sipCppPtr = ql;
--
-- return sipGetState(sipTransferObj);
--%End
--};
--
--
- template <TYPE*>
- %MappedType QStack<TYPE*>
- {
diff --git a/kde-base/pykde4/pykde4-4.5.90.ebuild b/kde-base/pykde4/pykde4-4.5.90.ebuild
index 8b6b272e197..0c8eb100d76 100644
--- a/kde-base/pykde4/pykde4-4.5.90.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.90.ebuild
@@ -25,6 +25,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-typedefs-fix.patch" )
+
pkg_setup() {
python_pkg_setup
kde4-meta_pkg_setup
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 21:33:07 +0000