pkgsrc-WIP-changes archive

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

py-pyside-setup: got a bit further



Module Name:	pkgsrc-wip
Committed By:	Robert Swindells <rjs%NetBSD.org@localhost>
Pushed By:	rjs
Date:		Sat Oct 12 21:17:26 2024 +0100
Changeset:	f40f3cc0bc235bc60f29f46eedcfe337a57a4463

Modified Files:
	py-pyside-setup/Makefile
	py-pyside-setup/distinfo
Added Files:
	py-pyside-setup/patches/patch-sources_shiboken2_libshiboken_helper.h

Log Message:
py-pyside-setup: got a bit further

Don't know why it can't find GL/gl.h

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

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

diffstat:
 py-pyside-setup/Makefile                               | 15 ++++++++++++++-
 py-pyside-setup/distinfo                               |  1 +
 .../patch-sources_shiboken2_libshiboken_helper.h       | 18 ++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diffs:
diff --git a/py-pyside-setup/Makefile b/py-pyside-setup/Makefile
index 1e7a33850d..af880bdcd2 100644
--- a/py-pyside-setup/Makefile
+++ b/py-pyside-setup/Makefile
@@ -15,7 +15,7 @@ LICENSE=	gnu-gpl-v2
 
 #WRKSRC=		${WRKDIR}/PySide-${VERSION}
 
-USE_TOOLS+=		cmake pkg-config
+USE_TOOLS+=		pkg-config
 USE_LANGUAGES+=		c c++
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_PREFIX:STRING="${PREFIX}"
 
@@ -24,7 +24,20 @@ PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
 .include "../../devel/cmake/build.mk"
 
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+#.include "../../x11/qt5-qtcharts/buildlink3.mk"
+.include "../../x11/qt5-qtquickcontrols/buildlink3.mk"
+.include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
+.include "../../x11/qt5-qtscript/buildlink3.mk"
+.include "../../x11/qt5-qtscxml/buildlink3.mk"
+#.include "../../x11/qt5-qtspeech/buildlink3.mk"
+#.include "../../x11/qt5-qtwebengine/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.include "../../lang/clang/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pyside-setup/distinfo b/py-pyside-setup/distinfo
index ac138d2b07..b416298352 100644
--- a/py-pyside-setup/distinfo
+++ b/py-pyside-setup/distinfo
@@ -3,3 +3,4 @@ $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_shiboken2_libshiboken_helper.h) = 4fb43ed185711529104f112d5b85bcf3f1688af8
diff --git a/py-pyside-setup/patches/patch-sources_shiboken2_libshiboken_helper.h b/py-pyside-setup/patches/patch-sources_shiboken2_libshiboken_helper.h
new file mode 100644
index 0000000000..8a69f15cdd
--- /dev/null
+++ b/py-pyside-setup/patches/patch-sources_shiboken2_libshiboken_helper.h
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Need a pointer for the thread private data on NetBSD.
+
+--- sources/shiboken2/libshiboken/helper.h.orig	2024-10-11 23:19:44.504367762 +0000
++++ sources/shiboken2/libshiboken/helper.h
+@@ -92,7 +92,11 @@ class AutoArrayPointer
+         T *data;
+ };
+ 
++#ifdef __NetBSD__
++using ThreadId = void *;
++#else
+ using ThreadId = unsigned long long;
++#endif
+ LIBSHIBOKEN_API ThreadId currentThreadId();
+ LIBSHIBOKEN_API ThreadId mainThreadId();
+ 


Home | Main Index | Thread Index | Old Index