Date: Mon, 1 Apr 2024 18:30:34 GMT From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5d826246f8a3 - main - graphics/py-python-poppler-qt5: fix build on FreeBSD 13 Message-ID: <202404011830.431IUYnF053446@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d826246f8a360246c1f8c8fdbed1618f9dbbfe9 commit 5d826246f8a360246c1f8c8fdbed1618f9dbbfe9 Author: Rodrigo Osorio <rodrigo@FreeBSD.org> AuthorDate: 2024-04-01 18:26:00 +0000 Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> CommitDate: 2024-04-01 18:29:38 +0000 graphics/py-python-poppler-qt5: fix build on FreeBSD 13 Patch picked from upstream repo Fix the build failures on older FreeBSD versions due to the recently updated graphics/poppler port. PR: 276263 Reported by: Martin Neubauer <m.ne@gmx.net> (maintainer) --- graphics/py-python-poppler-qt5/Makefile | 28 +++++++++++----------------- graphics/py-python-poppler-qt5/pkg-plist | 26 -------------------------- 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile index 378ced9fd6e5..6de67c1f9bed 100644 --- a/graphics/py-python-poppler-qt5/Makefile +++ b/graphics/py-python-poppler-qt5/Makefile @@ -1,7 +1,7 @@ PORTNAME= python-poppler-qt5 DISTVERSIONPREFIX= v DISTVERSION= 21.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,28 +15,22 @@ LICENSE_COMB= dual BUILD_DEPENDS= qmake-qt5:devel/qt5-qmake LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 -USES= compiler:c++11-lang gl pkgconfig pyqt:5 python qt:5 +USES= compiler:c++17-lang gl pkgconfig pyqt:5 python qt:5 USE_GITHUB= yes GH_ACCOUNT= frescobaldi USE_GL= gl -USE_PYQT= pyqt5 sip:build -USE_PYTHON= flavors pep517 +USE_PYQT= pyqt5 +USE_PYTHON= autoplist pep517 USE_QT= core gui xml -PLIST_SUB= _PY_SONAME=${_PY_SONAME} - -_PY_SONAME= ${PYTHON_EXT_SUFFIX} - -BINARY_ALIAS= qmake=${QMAKE} - -do-build: - (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${SIP} ${SIP_ARGS} ; ${SETENV} ${MAKE_ENV} ${MAKE} -C ./build ) - -do-install: - (cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} ) +PEP517_BUILD_CONFIG_SETTING= -C--build-dir=build \ + -C--jobs=${MAKE_JOBS_NUMBER} -C--qmake=${QMAKE} \ + -C--qmake-setting='CONFIG += c++17' \ + -C--qmake-setting='QMAKE_CXXFLAGS += ${CXXFLAGS}' \ + -C--qmake-setting='QMAKE_LFLAGS += ${LDFLAGS}' \ + -C--verbose post-install: - ${RLN} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so + @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${PYTHON_EXT_SUFFIX}.so .include <bsd.port.mk> diff --git a/graphics/py-python-poppler-qt5/pkg-plist b/graphics/py-python-poppler-qt5/pkg-plist deleted file mode 100644 index bcbefe9bb5bc..000000000000 --- a/graphics/py-python-poppler-qt5/pkg-plist +++ /dev/null @@ -1,26 +0,0 @@ -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-annotation.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-convert.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-document.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-embedded-file.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-font-info.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-font-iterator.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-form.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-link-destination.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-link.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-media.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-movie-object.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-opt-content-model.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-page-transition.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-page.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-qt5.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-sound-object.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-text-box.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/popplerqt5.toml -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/timeline.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/types.sip -%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/version.sip -%%PYTHON_SITELIBDIR%%/popplerqt5%%_PY_SONAME%%.so -%%PYTHON_SITELIBDIR%%/popplerqt5.so -%%PYTHON_SITELIBDIR%%/python_poppler_qt5-21.3.0.dist-info/INSTALLER -%%PYTHON_SITELIBDIR%%/python_poppler_qt5-21.3.0.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/python_poppler_qt5-21.3.0.dist-info/RECORD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404011830.431IUYnF053446>