Author: urkud
Date: Wed Nov 24 10:49:34 2010
New Revision: 24838
URL: https://svn.nixos.org/websvn/nix/?rev=24838&sc=1
Log:
Make kdebindings compile with newer sip
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/default.nix Wed Nov 24
10:48:25 2010 (r24837)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/default.nix Wed Nov 24
10:49:34 2010 (r24838)
@@ -6,7 +6,7 @@
# some bindings are even broken.
kde.package rec {
- patches = [ ./python-site-packages-install-dir.diff ];
+ patches = [ ./python-site-packages-install-dir.diff ./sip-4.11.patch ];
preConfigure = ''
CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print
Config::CONFIG['sitearchdir']" | sed -e "s...@${ruby}@$out@")
Added: nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch Wed Nov 24
10:49:34 2010 (r24838)
@@ -0,0 +1,67 @@
+Make kdebindings compile against sip-4.11, from KDE svn
+Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170601)
++++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 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*>
+ {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
