pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-pyside6: fix build with qt 6.11 in pkgsrc-2026Q3



Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Sun Oct 25 23:35:28 2026 +1100
Changeset:	630a015d9445b0ebfb275516d5db49c5e9f9c66a

Modified Files:
	py-pyside6/Makefile
	py-pyside6/PLIST

Log Message:
py-pyside6: fix build with qt 6.11 in pkgsrc-2026Q3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=630a015d9445b0ebfb275516d5db49c5e9f9c66a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-pyside6/Makefile |  2 ++
 py-pyside6/PLIST    | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs:
diff --git a/py-pyside6/Makefile b/py-pyside6/Makefile
index 48e06a2fa8..c55cb7b76d 100644
--- a/py-pyside6/Makefile
+++ b/py-pyside6/Makefile
@@ -16,6 +16,8 @@ USE_LANGUAGES+=		c c++
 
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 PLIST_SUBST+=	PYTHON_VERSION=${PYTHON_VERSION}
+PLIST_SUBST+=	PYSTABLEABI=abi${PYTHON_VERSION:C/^(.).*$/\1/W}
+PLIST_SUBST+=	QTMAJORMINOR=${QTVERSION:R}
 
 REPLACE_PYTHON+=	sources/pyside-tools/pyside_tool.py
 REPLACE_PYTHON+=	sources/pyside-tools/qtpy2cpp_lib/tests/baseline/basic_test.py
diff --git a/py-pyside6/PLIST b/py-pyside6/PLIST
index 143536b4b3..c897ae8a13 100644
--- a/py-pyside6/PLIST
+++ b/py-pyside6/PLIST
@@ -178,12 +178,12 @@ bin/shiboken6
 bin/shiboken_tool.py
 bin/svgtoqml
 bin/uic
-lib/cmake/PySide6/PySide6Config.abi3.cmake
+lib/cmake/PySide6/PySide6Config.${PYSTABLEABI}.cmake
 lib/cmake/PySide6/PySide6Config.cmake
 lib/cmake/PySide6/PySide6ConfigVersion.cmake
 lib/cmake/PySide6/PySide6Targets-release.cmake
 lib/cmake/PySide6/PySide6Targets.cmake
-lib/cmake/Shiboken6/Shiboken6Config.abi3.cmake
+lib/cmake/Shiboken6/Shiboken6Config.${PYSTABLEABI}.cmake
 lib/cmake/Shiboken6/Shiboken6Config.cmake
 lib/cmake/Shiboken6/Shiboken6ConfigVersion.cmake
 lib/cmake/Shiboken6/Shiboken6Targets-release.cmake
@@ -195,14 +195,14 @@ lib/cmake/Shiboken6Tools/Shiboken6ToolsMacros.cmake
 lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets-release.cmake
 lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets.cmake
 lib/libpyside6.${PYSTABLEABI}.so
-lib/libpyside6.abi3.so.6.11
+lib/libpyside6.${PYSTABLEABI}.so.${QTMAJORMINOR}
 lib/libpyside6qml.${PYSTABLEABI}.so
-lib/libpyside6qml.abi3.so.6.11
-lib/libpyside6qml.abi3.so.${PKGVERSION}
+lib/libpyside6qml.${PYSTABLEABI}.so.${QTMAJORMINOR}
+lib/libpyside6qml.${PYSTABLEABI}.so.${PKGVERSION}
 lib/libpyside6remoteobjects.a
 lib/libshiboken6.${PYSTABLEABI}.so
-lib/libshiboken6.abi3.so.6.11
-lib/libshiboken6.abi3.so.${PKGVERSION}
+lib/libshiboken6.${PYSTABLEABI}.so.${QTMAJORMINOR}
+lib/libshiboken6.${PYSTABLEABI}.so.${PKGVERSION}
 lib/pkgconfig/pyside6.pc
 lib/pkgconfig/shiboken6.pc
 ${PYSITELIB}/PySide6/Qt3DAnimation.${PYSTABLEABI}.so


Home | Main Index | Thread Index | Old Index