Attachment #207616 for bug #240677





PORTNAME=	python-poppler-qt5
DISTVERSIONPREFIX=	v
DISTVERSION=	0.74.0
PORTREVISION=	6
CATEGORIES=	graphics python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}



USES=		compiler:c++11-lang pkgconfig pyqt:5 python:3.4+ qmake qt:5
USE_PYQT=	gui xml sip_build
USE_PYTHON=	autoplist distutils
USE_GITHUB=	yes
GH_ACCOUNT=	wbsoft

PYDISTUTILS_BUILD_TARGET=	build_ext
PYDISTUTILS_BUILDARGS+=	--pyqt-sip-dir=${PYQT_SIPDIR}

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1545059766	1	TIMESTAMP = 1568875323
2	SHA256 (wbsoft-python-poppler-qt5-v0.24.2_GH0.tar.gz) = 542b5ab183e95debd4e05642425da6914e1b5c5a98a8c94752833d5b5ca7289b	2	SHA256 (wbsoft-python-poppler-qt5-v0.74.0_GH0.tar.gz) = 8e073ec496a1c39bbe14b53d70c0a8628b7ec3fe0f8db0709440a6a6b553109f
3	SIZE (wbsoft-python-poppler-qt5-v0.24.2_GH0.tar.gz) = 19858	3	SIZE (wbsoft-python-poppler-qt5-v0.74.0_GH0.tar.gz) = 23243




--- poppler-qt5.sip.orig	2018-12-19 10:55:11 UTC
+++ poppler-qt5.sip
@@ -1,15 +1,18 @@
-%Module(name=popplerqt5, version=0)
+%Module(name=popplerqt5)
 
 /*
  * Bindings for Poppler-Qt5 to Python
  * Maintained by Wilbert Berendsen <wbsoft@xs4all.nl>
  */
 
+%Feature QTXML_AVAILABLE
 
 %Import QtCore/QtCoremod.sip
 %Import QtGui/QtGuimod.sip
 
-%Feature QTXML_AVAILABLE
+%If(QTXML_AVAILABLE)
+%Import QtXml/QtXmlmod.sip
+%End
 
 %Timeline {
     POPPLER_V0_20_0




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.

--- types.sip.orig	2017-01-21 07:19:29 UTC
+++ types.sip
@@ -27,7 +27,7 @@
     foreach (Poppler::Document::RenderBackend value, set)
     {
         PyObject *obj = PyLong_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);
 

Return to bug 240677

Lines 2-9 Link Here

(-)Makefile (-4 / +6 lines)
2		2
3	PORTNAME= python-poppler-qt5	3	PORTNAME= python-poppler-qt5
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.24.2	5	DISTVERSION= 0.74.0
6	PORTREVISION= 6
7	CATEGORIES= graphics python	6	CATEGORIES= graphics python
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
9		8
Lines 17-27 Link Here
17		16
18	USES= compiler:c++11-lang pkgconfig pyqt:5 python:3.4+ qmake qt:5	17	USES= compiler:c++11-lang pkgconfig pyqt:5 python:3.4+ qmake qt:5
19	USE_PYQT= gui xml sip_build	18	USE_PYQT= gui xml sip_build
20	USE_PYTHON= distutils autoplist	19	USE_PYTHON= autoplist distutils
21	USE_GITHUB= yes	20	USE_GITHUB= yes
22	GH_ACCOUNT= wbsoft	21	GH_ACCOUNT= wbsoft
23		22
24	PYDISTUTILS_BUILD_TARGET= build_ext	23	PYDISTUTILS_BUILD_TARGET= build_ext
25	PYDISTUTILS_BUILDARGS+= --pyqt-sip-dir=${PYQT_SIPDIR}	24	PYDISTUTILS_BUILDARGS+= --pyqt-sip-dir=${PYQT_SIPDIR}
26		25
		26	post-install:
		27	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
		28
27	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Lines 1-23 Link Here

(-)files/patch-poppler-qt5.sip (-23 lines)
1	--- poppler-qt5.sip.orig 2018-12-19 10:55:11 UTC
2	+++ poppler-qt5.sip
3	@@ -1,15 +1,18 @@
4	-%Module(name=popplerqt5, version=0)
5	+%Module(name=popplerqt5)
6
7	/*
8	* Bindings for Poppler-Qt5 to Python
9	* Maintained by Wilbert Berendsen <wbsoft@xs4all.nl>
10	*/
11
12	+%Feature QTXML_AVAILABLE
13
14	%Import QtCore/QtCoremod.sip
15	%Import QtGui/QtGuimod.sip
16
17	-%Feature QTXML_AVAILABLE
18	+%If(QTXML_AVAILABLE)
19	+%Import QtXml/QtXmlmod.sip
20	+%End
21
22	%Timeline {
23	POPPLER_V0_20_0

Lines 1-16 Link Here

(-)files/patch-types.sip (-16 lines)
1	PyList_SET_ITEM() is supposed to be void, but as a macro it's an
2	expression and has a pointer value. Clang 4.0 trips on the bogus
3	pointer comparison; given the comparison, it should be PyList_SetItem()
4	which returns -1 on failure.
5
6	--- types.sip.orig 2017-01-21 07:19:29 UTC
7	+++ types.sip
8	@@ -27,7 +27,7 @@
9	foreach (Poppler::Document::RenderBackend value, set)
10	{
11	PyObject *obj = PyLong_FromLong ((long) value);
12	- if (obj == NULL \|\| PyList_SET_ITEM (l, i, obj) < 0)
13	+ if (obj == NULL \|\| PyList_SetItem (l, i, obj) < 0)
14	{
15	Py_DECREF(l);
16