pkgsrc-WIP-changes archive

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

py-pyside-setup: add a patch to make shiboken use .buildlink.



Module Name:	pkgsrc-wip
Committed By:	Robert Swindells <rjs%NetBSD.org@localhost>
Pushed By:	rjs
Date:		Wed Oct 16 13:48:08 2024 +0100
Changeset:	71f94076224116e94e2a3a49eb1d3334eff66d81

Modified Files:
	py-pyside-setup/Makefile
	py-pyside-setup/distinfo
Added Files:
	py-pyside-setup/patches/patch-sources_pyside2_cmake_Macros_PySideModules.cmake

Log Message:
py-pyside-setup: add a patch to make shiboken use .buildlink.

Also add qt5-qtserialport as a dependency.

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

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

diffstat:
 py-pyside-setup/Makefile                                |  1 +
 py-pyside-setup/distinfo                                |  1 +
 ...tch-sources_pyside2_cmake_Macros_PySideModules.cmake | 17 +++++++++++++++++
 3 files changed, 19 insertions(+)

diffs:
diff --git a/py-pyside-setup/Makefile b/py-pyside-setup/Makefile
index af880bdcd2..1deddd3737 100644
--- a/py-pyside-setup/Makefile
+++ b/py-pyside-setup/Makefile
@@ -34,6 +34,7 @@ PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 .include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
 .include "../../x11/qt5-qtscript/buildlink3.mk"
 .include "../../x11/qt5-qtscxml/buildlink3.mk"
+.include "../../x11/qt5-qtserialport/buildlink3.mk"
 #.include "../../x11/qt5-qtspeech/buildlink3.mk"
 #.include "../../x11/qt5-qtwebengine/buildlink3.mk"
 .include "../../x11/qt5-qtx11extras/buildlink3.mk"
diff --git a/py-pyside-setup/distinfo b/py-pyside-setup/distinfo
index b416298352..d8b5a0224a 100644
--- a/py-pyside-setup/distinfo
+++ b/py-pyside-setup/distinfo
@@ -3,4 +3,5 @@ $NetBSD: $
 BLAKE2s (pyside-setup-opensource-src-5.15.15.tar.xz) = 403c535eccd8d4fe234dc4e1f2c43cedd0ea05fbd0e85305a31a777ab4fcdb8e
 SHA512 (pyside-setup-opensource-src-5.15.15.tar.xz) = a8c4e235983c681d6a81ca2d3b20c586a4941e63aac1dd3eafc24d0691558819b403cc0c4a6861d1dc02512e424a919ff0ce8fa897959966eac7f19a3840ab71
 Size (pyside-setup-opensource-src-5.15.15.tar.xz) = 3586600 bytes
+SHA1 (patch-sources_pyside2_cmake_Macros_PySideModules.cmake) = c753d3abba7e7b80ad71205612e861eb3698fc0d
 SHA1 (patch-sources_shiboken2_libshiboken_helper.h) = 4fb43ed185711529104f112d5b85bcf3f1688af8
diff --git a/py-pyside-setup/patches/patch-sources_pyside2_cmake_Macros_PySideModules.cmake b/py-pyside-setup/patches/patch-sources_pyside2_cmake_Macros_PySideModules.cmake
new file mode 100644
index 0000000000..9aceb018ba
--- /dev/null
+++ b/py-pyside-setup/patches/patch-sources_pyside2_cmake_Macros_PySideModules.cmake
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Make shiboken look in .buildlink for headers.
+
+--- sources/pyside2/cmake/Macros/PySideModules.cmake.orig	2024-08-28 09:49:26.000000000 +0000
++++ sources/pyside2/cmake/Macros/PySideModules.cmake
+@@ -94,7 +94,9 @@ macro(create_pyside_module)
+     # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until
+     # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git
+     string(REPLACE ";" ${PATH_SEP} core_includes "${Qt5Core_INCLUDE_DIRS}")
+-    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}${PATH_SEP}${core_includes})
++    set(buildlink_include_dir "${pyside2_SOURCE_DIR}/../../../../.buildlink/include")
++    set(buildlink_qt_include_dir "${pyside2_SOURCE_DIR}/../../../../.buildlink/qt5/include")
++    set(shiboken_include_dirs ${pyside2_SOURCE_DIR}${PATH_SEP}${buildlink_include_dir}${PATH_SEP}${buildlink_qt_include_dir}${PATH_SEP}${core_includes})
+     set(shiboken_framework_include_dirs_option "")
+     if(CMAKE_HOST_APPLE)
+         set(shiboken_framework_include_dirs "${QT_FRAMEWORK_INCLUDE_DIR}")


Home | Main Index | Thread Index | Old Index