From nobody Tue Apr 02 08:36:11 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V81SD0Yhwz5G2Gs; Tue, 2 Apr 2024 08:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V81SD01q4z4Ssj; Tue, 2 Apr 2024 08:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712046972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPQrxTZdVMF9LNvIx9YWkQWYjctHqWdP4x1baDazVyY=; b=qdB65iC1knEGjtzfJYsjfKX4RRKCgljTZLZWVHi3eobxwhUd8lvHefzLcQPhlsYLo8VjSB Tf5uYzJtZVFtOkXhJ2zuwqwC8QhPm2XbfhNVoVcmwM8ndC9llsai7uPGsOhoV/OAqfiSUL ToMV6H4VXVj1oo3ZjyPzF8a3X/H+JSXcLKY3f243jwWiPnkdNc+ulOHLoayKY6WjJSiKyU GhhZPXXRnZd1iVnIdHwfMPs0gxByx1tMo6OxCXXMPrUMeumHZVWUyscCaJkcB9NPbYACx8 mJ7I4FixnX/ApY1ODUZ4XZK2FV/8PWkIb7ubGnY/NZEhVl+l3RzfeTxFDm2F+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712046972; a=rsa-sha256; cv=none; b=I1FrbYwMuNJajsfYzadZHGX8eatEaddvATwuxaTn0utWx2uRg5fIAY+hpa7GvocJuMudFe GqYbFFMy65BWReZx+NNxQ2OrCYUuCKZ33hmrq37o23ezi/IRrAqjVD4uRS2++l7Cuf934n +S7Adzdh3UgtUXjNlMuOG+YJ25CiK1IAJSKPmOpzzPPqCV5rhfwPs0e55j82/3kYiSCIGa B3CGKO9kLMZnmXRsh4rXaoQg3hxyRTeNZ0PUb7DQxm+/8Zxl/UdVbQ7GXmZQ6oNs0eA1l1 WKoKRzQlUoeyFwWHsiPlbLWrZ1ZGgYQuTCvJIxpzMYrBWLVXcOhmUMeKK1LXvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712046972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPQrxTZdVMF9LNvIx9YWkQWYjctHqWdP4x1baDazVyY=; b=FJ3Q0XyJuzY0g4zumlKUfe0Q1XL1xr3tQYO06w+UxLWO1vt3hbN9YPtnnKw1ElLvxjttMX H2kr0N8BQS8lko15Tq3PUk7bwwyh/qYTurk2fA8d1nZICHNPp4iFjZ0g+U9S+/iXD4defc HwKMMvxUPSkFqiz+NCx+2hV8Nb2TZs5v2poPnyDk0zCqCer4e4ikPcJudWFpQXzn1qj5zL xPOmU6Kz3TC/7g2DkAOSxUyDeoFkWiD+4gPtp4ryp4/35ihUIBMbi328iFJHmKDqQc5GTz XEUCaC0B92QHbafor7PjJ1IbgU/yYz9IRZvUR1sSP4qTJmojZ9Y2IMc1eBa+qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V81SC6gSVzjX2; Tue, 2 Apr 2024 08:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4328aBvM079927; Tue, 2 Apr 2024 08:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4328aBGR079924; Tue, 2 Apr 2024 08:36:11 GMT (envelope-from git) Date: Tue, 2 Apr 2024 08:36:11 GMT Message-Id: <202404020836.4328aBGR079924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rodrigo Osorio Subject: git: d39e65d2bc62 - 2024Q1 - graphics/py-python-poppler-qt5: fix build on FreeBSD 13 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: d39e65d2bc620a75947d947d346211593f02a054 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=d39e65d2bc620a75947d947d346211593f02a054 commit d39e65d2bc620a75947d947d346211593f02a054 Author: Rodrigo Osorio AuthorDate: 2024-04-01 18:26:00 +0000 Commit: Rodrigo Osorio CommitDate: 2024-04-02 08:33:01 +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 (maintainer) (cherry picked from commit 5d826246f8a360246c1f8c8fdbed1618f9dbbfe9) --- graphics/py-python-poppler-qt5/Makefile | 26 +++++++++++--------------- 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 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