Attachment 248267 Details for Bug 276263 – alternative patch

[patch] alternative patch

0001-graphics-py-python-poppler-qt5-Fix-build-with-recent.patch (text/plain), 4.25 KB, created by Tijl Coosemans on 2024-02-08 19:23:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2024-02-08 19:23:48 UTC

Size: 4.25 KB

patch

obsolete

>From de7f92dd0ba0f60d0a05397996f309630c75be79 Mon Sep 17 00:00:00 2001
>From: Tijl Coosemans <tijl@FreeBSD.org>
>Date: Thu, 8 Feb 2024 18:22:58 +0100
>Subject: [PATCH] graphics/py-python-poppler-qt5: Fix build with recent Poppler
>
>- Recent Poppler requires C++17.
>- Simplify port by using pep517 infrastructure from USES=python.
>- Respect CXXFLAGS and LDFLAGS.
>- Enable parallel build.
>---
> graphics/py-python-poppler-qt5/Makefile  | 31 +++++++++---------------
> graphics/py-python-poppler-qt5/pkg-plist | 26 --------------------
> 2 files changed, 12 insertions(+), 45 deletions(-)
> delete mode 100644 graphics/py-python-poppler-qt5/pkg-plist
>
>diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile
>index 5b6928418adb..23a1feb1fc73 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=	2
> CATEGORIES=	graphics python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -15,28 +15,21 @@ 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} )
>-
>-post-install:
>-	${RLN} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
>-	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5${_PY_SONAME}.so
>+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
> 
> .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
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 276263: 247600 | 248267 | 248337 | 249215