diff options
| author | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2024-04-01 18:26:00 +0000 |
|---|---|---|
| committer | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2024-04-02 08:33:01 +0000 |
| commit | d39e65d2bc620a75947d947d346211593f02a054 (patch) | |
| tree | 50ac404e0e4d062eba778caa5f7de4dc38c93c44 | |
| parent | dba2cf6c9e05606a9024f20a06e42f84f9d9fd9b (diff) | |
| download | ports-d39e65d2bc620a75947d947d346211593f02a054.tar.gz ports-d39e65d2bc620a75947d947d346211593f02a054.zip | |
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)
(cherry picked from commit 5d826246f8a360246c1f8c8fdbed1618f9dbbfe9)
| -rw-r--r-- | graphics/py-python-poppler-qt5/Makefile | 26 | ||||
| -rw-r--r-- | graphics/py-python-poppler-qt5/pkg-plist | 26 |
2 files changed, 11 insertions, 41 deletions
diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile index 4a4a61268c4a..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= 1 +PORTREVISION= 3 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,26 +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} - -do-build: - (cd ${WRKSRC} ; sip-build-${PYTHON_VER} --qmake ${QMAKE} --verbose --no-make --build-dir build ; ${MAKE} -C ./build ) - -do-install: - (cd ${WRKSRC} ; ${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 |