svn commit: r432026 - in branches/2017Q1/devel/py-pykde4: . files

[Tobias C. Berner]

Author: tcberner
Date: Sat Jan 21 12:18:24 2017
New Revision: 432026
URL: https://svnweb.freebsd.org/changeset/ports/432026

Log:
  MFH: r431949
  
  Fix py-pykde4 against newest clang
  
  PyList_SET_ITEM() is supposed to be void, but as a macro it's an
  expression and has a pointer value. Clang 4.0 trips on the bogus
  pointer comparison; given the comparison, it should be PyList_SetItem()
  which returns -1 on failure.
  
  As the produced code may be changed by this, bump PORTREVISION.
  
  PR:		216253
  Submitted by:	Adriaan de Groot <groot at kde.org>
  Reported by:	jbeich
  Reviewed by:	rakuco, tcberner
  Approved by:	rakuco (mentor)
  Differential Revision:	https://reviews.freebsd.org/D9253
  
  PR:		216253
  Approved by:	ports-secteam (junovitch), rakuco (mentor)

Added:
  branches/2017Q1/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip
     - copied unchanged from r431949, head/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip
  branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip
     - copied unchanged from r431949, head/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip
  branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_predicate.sip
     - copied unchanged from r431949, head/devel/py-pykde4/files/patch-sip_solid_predicate.sip
Modified:
  branches/2017Q1/devel/py-pykde4/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/devel/py-pykde4/Makefile
==============================================================================
--- branches/2017Q1/devel/py-pykde4/Makefile	Sat Jan 21 12:16:01 2017	(r432025)
+++ branches/2017Q1/devel/py-pykde4/Makefile	Sat Jan 21 12:18:24 2017	(r432026)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pykde4
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-kde4 python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

Copied: branches/2017Q1/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip (from r431949, head/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip	Sat Jan 21 12:18:24 2017	(r432026, copy of r431949, head/devel/py-pykde4/files/patch-sip_phonon_abstractvideodataoutput.sip)
@@ -0,0 +1,16 @@
+PyList_SET_ITEM() is supposed to be void, but as a macro it's an 
+expression and has a pointer value. Clang 4.0 trips on the bogus
+pointer comparison; given the comparison, it should be PyList_SetItem()
+which returns -1 on failure.
+
+--- sip/phonon/abstractvideodataoutput.sip.orig	2014-08-14 20:17:11 UTC
++++ sip/phonon/abstractvideodataoutput.sip
+@@ -72,7 +72,7 @@ protected:
+     foreach (Phonon::Experimental::VideoFrame2::Format value, set)
+     {
+         PyObject *obj = PyInt_FromLong ((long) value);
+-        if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
++        if (obj == NULL || PyList_SetItem (l, i, obj) < 0)
+         {
+             Py_DECREF(l);
+ 

Copied: branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip (from r431949, head/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip	Sat Jan 21 12:18:24 2017	(r432026, copy of r431949, head/devel/py-pykde4/files/patch-sip_solid_powermanagement.sip)
@@ -0,0 +1,13 @@
+See patch-sip_phonon_abstractvideodataoutput.sip
+
+--- sip/solid/powermanagement.sip.orig	2014-08-14 20:17:11 UTC
++++ 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 || PyList_SetItem (l, i, obj) < 0)
+         {
+             Py_DECREF(l);
+ 

Copied: branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_predicate.sip (from r431949, head/devel/py-pykde4/files/patch-sip_solid_predicate.sip)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/devel/py-pykde4/files/patch-sip_solid_predicate.sip	Sat Jan 21 12:18:24 2017	(r432026, copy of r431949, head/devel/py-pykde4/files/patch-sip_solid_predicate.sip)
@@ -0,0 +1,13 @@
+See patch-sip_phonon_abstractvideodataoutput.sip
+
+--- sip/solid/predicate.sip.orig	2014-08-14 20:17:11 UTC
++++ 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 || PyList_SetItem (l, i, obj) < 0)
+         {
+             Py_DECREF(l);
+