From owner-svn-ports-all@freebsd.org Sun Mar 21 08:31:00 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 58BD156B0F2; Sun, 21 Mar 2021 08:31:00 +0000 (UTC) (envelope-from kai@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 4F39nc26rHz4bSC; Sun, 21 Mar 2021 08:31:00 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3B9DC17365; Sun, 21 Mar 2021 08:31:00 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12L8V0xu087272; Sun, 21 Mar 2021 08:31:00 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12L8Uxnx087266; Sun, 21 Mar 2021 08:30:59 GMT (envelope-from kai@FreeBSD.org) Message-Id: <202103210830.12L8Uxnx087266@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Sun, 21 Mar 2021 08:30:59 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: head/graphics/py-python-poppler-qt5 X-SVN-Commit-Revision: 568905 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Mar 2021 08:31:00 -0000 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: (maintainer) [1] Approved by: (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 + +.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 +.include 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