summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorkai <kai@35697150-7ecd-e111-bb59-0022644237b5>2021-03-21 08:30:59 +0000
committerkai <kai@35697150-7ecd-e111-bb59-0022644237b5>2021-03-21 08:30:59 +0000
commite3fbb663d3f8f2e93804be0bad4ce064016f004d (patch)
tree66c09ef5cebd3a0de8bcfc53c32c378de40c0c9e /graphics
parent7681166fc6d11ec880ba2220210ac058a61a6844 (diff)
downloadfreebsd-ports-e3fbb663d3f8f2e93804be0bad4ce064016f004d.tar.gz
freebsd-ports-e3fbb663d3f8f2e93804be0bad4ce064016f004d.tar.bz2
graphics/py-python-poppler-qt5: Fix packaging with Python 3.8 and onward
* Add a workaround to make the transition from Python 3.7 to Python 3.8 possible because the name of the .so file is slightly different between the two releases. * Use PYTHONPREFIX_SITELIBDIR instead PYTHON_SITELIBDIR to make the port PREFIX safe. * Also add "gl" to USE, introduce USE_{GL,QT} to fix stage QA issues and pet portclippy by sorting the entries of USE_PYQT as well. [1] PR: 254427 Submitted by: <m.ne@gmx.net> (maintainer) [1] Approved by: <m.ne@gmx.net> (maintainer) git-svn-id: http://svn.freebsd.org/ports/head@568905 35697150-7ecd-e111-bb59-0022644237b5
Diffstat (limited to 'graphics')
-rw-r--r--graphics/py-python-poppler-qt5/Makefile22
-rw-r--r--graphics/py-python-poppler-qt5/pkg-plist2
2 files changed, 18 insertions, 6 deletions
diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile
index c532b5fea4c6..006f0e677632 100644
--- a/graphics/py-python-poppler-qt5/Makefile
+++ b/graphics/py-python-poppler-qt5/Makefile
@@ -16,10 +16,22 @@ LICENSE_COMB= dual
BUILD_DEPENDS= qmake:devel/qt5-qmake
LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
-USES= compiler:c++11-lang pkgconfig pyqt:5 python:3.5+ qt:5
+USES= compiler:c++11-lang gl pkgconfig pyqt:5 python:3.5+ qt:5
USE_GITHUB= yes
GH_ACCOUNT= frescobaldi
-USE_PYQT= gui xml sip_build qtbuilder
+USE_GL= gl
+USE_PYQT= gui qtbuilder xml sip_build
+USE_QT= core gui xml
+
+PLIST_SUB= _PY_SONAME=${_PY_SONAME}
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3800
+_PY_SONAME= .cpython-${PYTHON_SUFFIX}m
+.else
+_PY_SONAME= ${PYTHON_EXT_SUFFIX}
+.endif
do-build:
(cd ${WRKSRC} ; sip-build --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
@@ -28,7 +40,7 @@ do-install:
(cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
post-install:
- ${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
- @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so
+ ${RLN} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
+ @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/py-python-poppler-qt5/pkg-plist b/graphics/py-python-poppler-qt5/pkg-plist
index 8c4c89d42cfa..86d2009f37c9 100644
--- a/graphics/py-python-poppler-qt5/pkg-plist
+++ b/graphics/py-python-poppler-qt5/pkg-plist
@@ -19,7 +19,7 @@
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/timeline.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/types.sip
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/version.sip
-%%PYTHON_SITELIBDIR%%/popplerqt5.cpython-%%PYTHON_SUFFIX%%m.so
+%%PYTHON_SITELIBDIR%%/popplerqt5%%_PY_SONAME%%.so
%%PYTHON_SITELIBDIR%%/popplerqt5.so
%%PYTHON_SITELIBDIR%%/python_poppler_qt5-0.75.0.dist-info/INSTALLER
%%PYTHON_SITELIBDIR%%/python_poppler_qt5-0.75.0.dist-info/METADATA