Attachment #200257 for bug #234085




# $FreeBSD$

PORTNAME=	python-poppler
PORTVERSION=	0.24.2
CATEGORIES=	graphics python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
DISTVERSIONPREFIX=	v

USE_GITHUB=	yes
GH_ACCOUNT=	wbsoft
GH_PROJECT=	${PORTNAME}-qt5

MAINTAINER=	m.ne@gmx.net
COMMENT=	Python bindings for the Poppler-Qt PDF rendering library

LICENSE=	LGPL21 LGPL3
LICENSE_COMB=	dual

LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5

USES=		pkgconfig pyqt:5 python:3.4+ qmake qt:5
USE_PYQT=	gui xml sip_build
USE_PYTHON=	distutils autoplist

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

.include <bsd.port.mk>

Line 0 Link Here

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




--- 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);
 

Line 0 Link Here

(-)graphics/py-python-poppler/pkg-descr (+9 lines)
	1	A Python binding for libpoppler-qt5 that aims for completeness and for being actively maintained.
	2
	3	Created and currently maintained by Wilbert Berendsen <wbsoft@xs4all.nl>.
	4
	5	Usage:
	6	import popplerqt5
	7	d = popplerqt5.Poppler.Document.load('file.pdf')
	8
	9	WWW: https://pypi.python.org/pypi/python-poppler-qt5

Return to bug 234085

Line 0 Link Here

(-)graphics/py-python-poppler/Makefile (+28 lines)
	1	# $FreeBSD$
	2
	3	PORTNAME= python-poppler
	4	PORTVERSION= 0.24.2
	5	CATEGORIES= graphics python
	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	7	DISTVERSIONPREFIX= v
	8
	9	USE_GITHUB= yes
	10	GH_ACCOUNT= wbsoft
	11	GH_PROJECT= ${PORTNAME}-qt5
	12
	13	MAINTAINER= m.ne@gmx.net
	14	COMMENT= Python bindings for the Poppler-Qt PDF rendering library
	15
	16	LICENSE= LGPL21 LGPL3
	17	LICENSE_COMB= dual
	18
	19	LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
	20
	21	USES= pkgconfig pyqt:5 python:3.4+ qmake qt:5
	22	USE_PYQT= gui xml sip_build
	23	USE_PYTHON= distutils autoplist
	24
	25	PYDISTUTILS_BUILD_TARGET= build_ext
	26	PYDISTUTILS_BUILDARGS+= --pyqt-sip-dir=${PYQT_SIPDIR}
	27
	28	.include <bsd.port.mk>

Line 0 Link Here

(-)graphics/py-python-poppler/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

Line 0 Link Here

(-)graphics/py-python-poppler/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