dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add patched pykde4

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2391 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2010-09-02 18:19:27 +00:00
parent a7be10ccbe
commit ee3e6a6140
6 changed files with 189 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch Normal file
View File

@@ -0,0 +1,22 @@
diff -Naur pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt pykde4-4.4.3/python/pykde4/CMakeLists.txt
--- pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt 2010-03-29 14:57:40.000000000 +0200
+++ pykde4-4.4.3/python/pykde4/CMakeLists.txt 2010-05-31 15:49:17.095615617 +0200
@@ -75,6 +75,9 @@
${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 ${PYQT4_SIP_DIR} sip)
SET(SIP_CONCAT_PARTS 8)
IF (WIN32)
@@ -82,7 +85,7 @@
ELSE (WIN32)
SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
ENDIF (WIN32)
-SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
+SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
# Use an extra option when compiling on Python 3.
IF (PYTHON_3)

12
kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch Normal file
View File

@@ -0,0 +1,12 @@
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>

64
kde-base/pykde4/files/pykde4.patch Normal file
View File

@@ -0,0 +1,64 @@
--- 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*>
{