Date: Sun, 21 Mar 2021 08:30:59 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568905 - head/graphics/py-python-poppler-qt5 Message-ID: <202103210830.12L8Uxnx087266@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Sun Mar 21 08:30:59 2021 New Revision: 568905 URL: https://svnweb.freebsd.org/changeset/ports/568905 Log: 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) Modified: head/graphics/py-python-poppler-qt5/Makefile head/graphics/py-python-poppler-qt5/pkg-plist Modified: head/graphics/py-python-poppler-qt5/Makefile ============================================================================== --- head/graphics/py-python-poppler-qt5/Makefile Sun Mar 21 05:07:10 2021 (r568904) +++ head/graphics/py-python-poppler-qt5/Makefile Sun Mar 21 08:30:59 2021 (r568905) @@ -16,11 +16,23 @@ 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> Modified: head/graphics/py-python-poppler-qt5/pkg-plist ============================================================================== --- head/graphics/py-python-poppler-qt5/pkg-plist Sun Mar 21 05:07:10 2021 (r568904) +++ head/graphics/py-python-poppler-qt5/pkg-plist Sun Mar 21 08:30:59 2021 (r568905) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103210830.12L8Uxnx087266>