diff options
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/pykde4/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/pykde4/files/pykde4-typedefs-fix.patch | 155 | ||||
| -rw-r--r-- | kde-base/pykde4/pykde4-4.5.5.ebuild | 7 |
3 files changed, 162 insertions, 3 deletions
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest index dc73c972cc4..f9fd08a5b74 100644 --- a/kde-base/pykde4/Manifest +++ b/kde-base/pykde4/Manifest @@ -1,8 +1,9 @@ AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2 AUX pykde4-4.5.90-typedefs-fix.patch 2110 RMD160 93a7e6b0a23fda700342ac4178a33fbe457c8244 SHA1 59b3992de8def0e415a055246d2d3d0a2934d8d9 SHA256 4b441ad05c553383a94e4856462c0c747b81acc5fe44782cdcb4371715b7ddf3 +AUX pykde4-typedefs-fix.patch 3309 RMD160 c81c29abdd9adaa73ffbf899fd722b861ba95a10 SHA1 f0e0318e996ccd82eaa9304c184b8d4cda4d7a50 SHA256 5a94419ae8edc80b7231ed3d3afb23d497fc47adf798b6e18bca9060788f87d7 DIST kdebindings-4.5.5.tar.bz2 7134992 RMD160 c69f387c8dd5e3205fa8a436cc63cecf9511f38e SHA1 5f754f0b6989df9557c5ccec18b4f96207fceb94 SHA256 7bfa2df7e8a01c7f1a9cfd2e79e544794b94490d3ca3576cbbedb2328ef257c5 DIST kdebindings-4.5.95.tar.bz2 7079055 RMD160 67f41b2ae5a67e2d731cb3efc3094cde350116ef SHA1 55ce512006f53b31c41675fabe4565b6e4eb4483 SHA256 104b1d5fcd20078004146c65b35114015e9f4e8cc07f1c61aaac717eb4db7712 -EBUILD pykde4-4.5.5.ebuild 1885 RMD160 6838002123b4223e309e623a3a6f686a107e9008 SHA1 5b59b6956a0f6c428f41c53e61b46aa975dc6e55 SHA256 68fc568a29cbd509e54179cd308b03395f2d14490078c7267223a79bb13e820b +EBUILD pykde4-4.5.5.ebuild 1964 RMD160 9447f5ffd503a25c908736b679cd97abe5492605 SHA1 ae1ddaadd96ff11235a2a4d011dd47c795b29370 SHA256 46a9fafb0b71697cc27a59495fffecface74eb9114a4ec746dc9d8378bbf55b1 EBUILD pykde4-4.5.95.ebuild 1872 RMD160 45aff7ddb683c0332f502c145ed6c18dadafaa9d SHA1 a606bfa106375e9dbbb7453b284126f9f4f6418a SHA256 2c1233e89da81eb27e85318a1294aa7526dc8a22a3f23dc2c7f86c98aa00807a EBUILD pykde4-4.5.9999.ebuild 1833 RMD160 2cb6087e11f9e0fe4b9e45a334a82a88fc7709bf SHA1 d513cb3ff83444e4aea85b05109ff5073cb09457 SHA256 c1d998a3ef8d4cb387d97517b0bd2c68b196a2181205ab9ac964594e9f7d6997 EBUILD pykde4-4.6.9999.ebuild 1861 RMD160 8d3437d432ea3addd9c5443d786549493d48e468 SHA1 8c78e2af1b4bc227b3d55166a84f7591e71dd8b7 SHA256 fe45252a72637c6e6097ddd4add69880110eddab16ccc46261f8bc08c1dc6b4f diff --git a/kde-base/pykde4/files/pykde4-typedefs-fix.patch b/kde-base/pykde4/files/pykde4-typedefs-fix.patch new file mode 100644 index 00000000000..6fb5714ad05 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-typedefs-fix.patch @@ -0,0 +1,155 @@ +--- pykde4-4.5.5/python/pykde4/sip/kdecore/typedefs.sip~ 2010-11-02 12:51:10.000000000 +0000 ++++ pykde4-4.5.5/python/pykde4/sip/kdecore/typedefs.sip 2011-01-08 22:34:29.006096324 +0000 +@@ -582,90 +582,6 @@ + %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> + { +@@ -730,61 +646,6 @@ + + return sipGetState(sipTransferObj); + %End +-}; +- +- +-%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 + }; + + diff --git a/kde-base/pykde4/pykde4-4.5.5.ebuild b/kde-base/pykde4/pykde4-4.5.5.ebuild index 19aeaca0653..bbdfeb0d7c7 100644 --- a/kde-base/pykde4/pykde4-4.5.5.ebuild +++ b/kde-base/pykde4/pykde4-4.5.5.ebuild @@ -18,13 +18,16 @@ IUSE="debug doc examples semantic-desktop" # blocker added due to compatibility issues and error during compile time DEPEND=" !dev-python/pykde + >=dev-python/sip-4.12 $(add_kdebase_dep kdelibs 'opengl,semantic-desktop?') semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') ) - aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,aqua] ) - !aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,X] ) + aqua? ( >=dev-python/PyQt4-4.8.2[dbus,sql,svg,webkit,aqua] ) + !aqua? ( >=dev-python/PyQt4-4.8.2[dbus,sql,svg,webkit,X] ) " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-typedefs-fix.patch" ) + pkg_setup() { python_pkg_setup kde4-meta_pkg_setup |