PyList_SET_ITEM doesn't return an interesting value, so avoid pointer

ordering issues.

4 files changed, 49 insertions, 3 deletions

diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile
index c3a4dbc7e8f..9329278b412 100644
--- a/x11/py-kde4/Makefile
+++ b/x11/py-kde4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2016/10/07 18:26:13 adam Exp $
+# $NetBSD: Makefile,v 1.52 2016/12/16 00:04:54 joerg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-kde4-${_KDE_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 DISTNAME=	pykde4-${_KDE_VERSION}
 CATEGORIES=	misc
 COMMENT=	Python bindings for the KDE integrated X11 desktop
diff --git a/x11/py-kde4/distinfo b/x11/py-kde4/distinfo
index e639e72a8cf..73e27c7838c 100644
--- a/x11/py-kde4/distinfo
+++ b/x11/py-kde4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2016/01/10 19:07:58 markd Exp $
+$NetBSD: distinfo,v 1.13 2016/12/16 00:04:54 joerg Exp $
 
 SHA1 (pykde4-4.14.3.tar.xz) = 9cc8e70d3b107a876cf579beab1f582861cd2c48
 RMD160 (pykde4-4.14.3.tar.xz) = 3ea2492cd31704e559456cb78dd85660fae7e74c
@@ -6,3 +6,5 @@ SHA512 (pykde4-4.14.3.tar.xz) = 42430f83bf41dc5d7511369250ff480fd7b90954b4ace8db
 Size (pykde4-4.14.3.tar.xz) = 2006504 bytes
 SHA1 (patch-CMakeLists.txt) = f09b05a952c3ad4e08cfde47a24ffb17e22edd6c
 SHA1 (patch-__init__.py) = 721287a0ec82b79ea4a502526ed98ba44c6d979f
+SHA1 (patch-sip_solid_powermanagement.sip) = a0b961cca434b1998bcd86bf781af72b92cbf0ca
+SHA1 (patch-sip_solid_predicate.sip) = 0304cbd05eb6f1b878db2a2411e218158ba366fa
diff --git a/x11/py-kde4/patches/patch-sip_solid_powermanagement.sip b/x11/py-kde4/patches/patch-sip_solid_powermanagement.sip
new file mode 100644
index 00000000000..8f29d450272
--- /dev/null
+++ b/x11/py-kde4/patches/patch-sip_solid_powermanagement.sip
@@ -0,0 +1,22 @@
+$NetBSD: patch-sip_solid_powermanagement.sip,v 1.1 2016/12/16 00:04:54 joerg Exp $
+
+--- sip/solid/powermanagement.sip.orig	2016-12-15 12:53:38.625458181 +0000
++++ sip/solid/powermanagement.sip
+@@ -83,7 +83,7 @@ bool                    stopSuppressingS
+ #else
+         PyObject *obj = PyInt_FromLong ((long) value);
+ #endif
+-        if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
++        if (obj == NULL)
+         {
+             Py_DECREF(l);
+ 
+@@ -92,7 +92,7 @@ bool                    stopSuppressingS
+ 
+             return NULL;
+         }
+-
++        PyList_SET_ITEM (l, i, obj);
+         Py_DECREF(obj);
+         i++;
+     }
diff --git a/x11/py-kde4/patches/patch-sip_solid_predicate.sip b/x11/py-kde4/patches/patch-sip_solid_predicate.sip
new file mode 100644
index 00000000000..8a1469082f8
--- /dev/null
+++ b/x11/py-kde4/patches/patch-sip_solid_predicate.sip
@@ -0,0 +1,22 @@
+$NetBSD: patch-sip_solid_predicate.sip,v 1.1 2016/12/16 00:04:54 joerg Exp $
+
+--- sip/solid/predicate.sip.orig	2016-12-15 12:52:41.763919370 +0000
++++ sip/solid/predicate.sip
+@@ -112,7 +112,7 @@ Py_BEGIN_ALLOW_THREADS
+ #else
+         PyObject *obj = PyInt_FromLong ((long) value);
+ #endif
+-        if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
++        if (obj == NULL)
+         {
+             Py_DECREF(l);
+ 
+@@ -121,7 +121,7 @@ Py_BEGIN_ALLOW_THREADS
+ 
+             return NULL;
+         }
+-
++        PyList_SET_ITEM (l, i, obj);
+         Py_DECREF(obj);
+         i++;
+     }