From nobody Mon Jun 19 18:49:31 2023 X-Original-To: dev-commits-ports-all@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 4QlJhq5PcBz4fCWr; Mon, 19 Jun 2023 18:49:31 +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 4QlJhq3Y15z4FB0; Mon, 19 Jun 2023 18:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687200571; 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=EeJw+Nr1jSgDb5yQEsxmJzfGMovYuFM2+M48qCi/RgQ=; b=gtU2Jzc584A+WqNV3FrlfGb3dBi6s8NUjCKy2CDWws4dKpYphpFck13UIYEOcC5SYixm8n JFiqr/4CejemQ3zA+Gk8IVnkbxbvYVwhIBXYmhojdqnjoEe0Cvya4gQAxI4XIZpVtMZttE s1BnO9ehJyr/weSUwOwzUxw6Yjl/hw0GSMunGg1/KQDW+1z/OxXzYLoyp79gJTXLs0uDiT 8Zve2l1xcDBq16wilxot96NrHnZ0j08An9hjCbGaUam8BO35uDNESwLMXMMBlGJcHQ6Qs1 7xJR3Ib/rQBixLuu3jak5CrXtOxa7LRLw69PCuiPwsGpu+AqkWKCsFPKumFoZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687200571; 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=EeJw+Nr1jSgDb5yQEsxmJzfGMovYuFM2+M48qCi/RgQ=; b=wcVZOQEN5wX3X3h29+zbqs4bxFXKW/fJY60Jf/jP9jO26pV3b5BogzQAzjXVBXuw3ZZKEO +c30u9+CdZviTJLzp8Q2nuAjFanX0e4Ppa5/jw4zni4FK/v+v0aksDMzJ6T/TODSGy/Ukl bRZH2kkHEbBRMt+ESZYB2dNEqaa/CWzQdTOmi5uUsjdPOenET6DBqiHkVQpLDwukm516N+ ceEZ90ww/uH2D5n2vW8y4sIyE2Vs+a0yCXcjzAmUi/JUhGaoNknivSn+OpCkHA+vaMvrAx uPQTcbO/ZN6aPpRjMhz9ah9l4ioq9JUDLyJ706u+GLV+Or2OBAFnY/cyI16hhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687200571; a=rsa-sha256; cv=none; b=W+EknnTLdnepTuQ0+24DRofH/BX1GAKNxaIwY8fHxP5PbmtTxAHUj/81hV80yvATZKXQRL J1l7gUKYMSuBM/BxbzmD8aNw0s8XkNlqtZWt5cTs99bBIqU8fZYIH1dDGNYt4TMDmrZArz Ny0mPNTdMr1EV9uMV5F+BBbDOfZSuEBO5soOADAcbXr9xO4JeWa4QAWNGFX4LvyTkOE6d8 FZ88sNCQ24RwfkRgIbNGlYwPSbkZslYmZKEoIHAtymWuuFVz259ONzlEjl9XaQjk8/CUAa tWR7CUc2sYlmx5CbnFNEWvK9AWqWRwOxD8IcXXTTdgAqstzPtmoHFyvQ/q8Qlg== 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 4QlJhq1KFSzSjV; Mon, 19 Jun 2023 18:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JInVPC097856; Mon, 19 Jun 2023 18:49:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JInVAR097855; Mon, 19 Jun 2023 18:49:31 GMT (envelope-from git) Date: Mon, 19 Jun 2023 18:49:31 GMT Message-Id: <202306191849.35JInVAR097855@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc=20Bartoletti?= Subject: git: bc270d279601 - main - devel/shiboken*: fix conflicts between 2 and 6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc270d27960177a72fc03b1ec741f9c2819a2a56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc270d27960177a72fc03b1ec741f9c2819a2a56 commit bc270d27960177a72fc03b1ec741f9c2819a2a56 Author: Loïc Bartoletti AuthorDate: 2023-06-15 18:25:34 +0000 Commit: Loïc Bartoletti CommitDate: 2023-06-19 18:49:17 +0000 devel/shiboken*: fix conflicts between 2 and 6 shiboken_tool.py is an useless tool which doesn't works on 2 nor 6. rm'em all --- devel/shiboken2/Makefile | 6 ++++-- devel/shiboken2/pkg-plist | 1 - devel/shiboken6/Makefile | 5 +++-- devel/shiboken6/pkg-plist | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/devel/shiboken2/Makefile b/devel/shiboken2/Makefile index e9ec5893ae25..1f386c9a3c69 100644 --- a/devel/shiboken2/Makefile +++ b/devel/shiboken2/Makefile @@ -1,6 +1,6 @@ PORTNAME= shiboken2 DISTVERSION= 5.15.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -26,7 +26,7 @@ USE_PYTHON= flavors USE_QT= buildtools:build core gui network qmake:build testlib \ xml xmlpatterns -SHEBANG_FILES= shiboken_tool.py +#SHEBANG_FILES= shiboken_tool.py CMAKE_ARGS+= "-DCMAKE_CXX_FLAGS=-lexecinfo" \ "-DCMAKE_STANDARD_LIBRARIES=-lexecinfo" \ @@ -46,6 +46,7 @@ PLIST_SUB+= PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER} WRKSRC= ${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/shiboken2 post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/shiboken_tool.py ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -f -d ${PYTHONPREFIX_SITELIBDIR} \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} @@ -53,4 +54,5 @@ post-install: -f -d ${PYTHONPREFIX_SITELIBDIR} \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + .include diff --git a/devel/shiboken2/pkg-plist b/devel/shiboken2/pkg-plist index c9b2ddfc6e91..757275ef2f8b 100644 --- a/devel/shiboken2/pkg-plist +++ b/devel/shiboken2/pkg-plist @@ -1,5 +1,4 @@ bin/shiboken2 -bin/shiboken_tool.py include/shiboken2/autodecref.h include/shiboken2/basewrapper.h include/shiboken2/bindingmanager.h diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile index 1ac6f98010e1..7ff38e41972e 100644 --- a/devel/shiboken6/Makefile +++ b/devel/shiboken6/Makefile @@ -26,8 +26,7 @@ USE_LDCONFIG= yes USE_PYTHON= flavors USE_QT= 5compat base declarative doc imageformats quick3d quicktimeline networkauth shadertools svg tools translations wayland -# TODO: avoid a conflict with shiboken2 -SHEBANG_FILES= shiboken_tool.py +#SHEBANG_FILES= shiboken_tool.py CMAKE_ARGS+= -DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" \ -DLLVM_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm" \ @@ -43,4 +42,6 @@ PLIST_SUB+= DISTVERSION=${DISTVERSION} PLIST_SUB+= PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER} WRKSRC= ${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION}/sources/shiboken6 +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/shiboken_tool.py .include diff --git a/devel/shiboken6/pkg-plist b/devel/shiboken6/pkg-plist index 25003ef03c6d..16459fef12d3 100644 --- a/devel/shiboken6/pkg-plist +++ b/devel/shiboken6/pkg-plist @@ -1,5 +1,4 @@ bin/shiboken6 -bin/shiboken_tool.py include/shiboken6/autodecref.h include/shiboken6/basewrapper.h include/shiboken6/basewrapper_p.h