pkgsrc-WIP-changes archive

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

py-pyside6: remove workaround



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Aug 21 12:06:55 2025 +0200
Changeset:	2bb3f26c9a2220bfd2087ba8fb2e222c2ad28cd1

Modified Files:
	py-pyside6/Makefile
	py-pyside6/distinfo
Removed Files:
	py-pyside6/patches/patch-sources_pyside6_qtexampleicons_CMakeLists.txt

Log Message:
py-pyside6: remove workaround

fixed in qt6-qtbase's bl3.mk file

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

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

diffstat:
 py-pyside6/Makefile                                        |  4 ----
 py-pyside6/distinfo                                        |  1 -
 .../patch-sources_pyside6_qtexampleicons_CMakeLists.txt    | 14 --------------
 3 files changed, 19 deletions(-)

diffs:
diff --git a/py-pyside6/Makefile b/py-pyside6/Makefile
index 4d655f6937..1e0735e43e 100644
--- a/py-pyside6/Makefile
+++ b/py-pyside6/Makefile
@@ -31,10 +31,6 @@ SUBST_STAGE.bash=	post-extract
 SUBST_FILES.bash=	sources/shiboken6/cmake/ShibokenHelpers.cmake
 SUBST_SED.bash=		-e "s|\#!/bin/bash|\#!${BASH}|g"
 
-# expects ${BUILDLINK_DIR}/qt6/lib/objects-Release/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o
-pre-configure:
-	${RM} -f ${BUILDLINK_DIR}/qt6/lib/cmake/Qt6ExampleIconsPrivate/*
-
 .include "../../devel/cmake/build.mk"
 
 .include "../../audio/qt6-qtspeech/buildlink3.mk"
diff --git a/py-pyside6/distinfo b/py-pyside6/distinfo
index 4ff82270bb..bc83c3ec0a 100644
--- a/py-pyside6/distinfo
+++ b/py-pyside6/distinfo
@@ -4,5 +4,4 @@ BLAKE2s (pyside-setup-everywhere-src-6.8.2.tar.xz) = dce62323acc9c62bfcc1df71afe
 SHA512 (pyside-setup-everywhere-src-6.8.2.tar.xz) = cc522143974d08133d68d3259caa5127916534e16678693866d65965a546db98b5b1b07d92f7c0918b7c8fb10213d94ad50259b22cf9ebc2a63b985068d75452
 Size (pyside-setup-everywhere-src-6.8.2.tar.xz) = 16609596 bytes
 SHA1 (patch-sources_pyside6_cmake_Macros_PySideModules.cmake) = 64124611147d88a4134b258ac5a6112f1b02d00b
-SHA1 (patch-sources_pyside6_qtexampleicons_CMakeLists.txt) = 017b888dfa6dff54c0c354c8f5fc7de057bab5b9
 SHA1 (patch-sources_shiboken6_libshiboken_helper.h) = 493bcbebe2a2fbc77fc0bb8cceb837bfba712d90
diff --git a/py-pyside6/patches/patch-sources_pyside6_qtexampleicons_CMakeLists.txt b/py-pyside6/patches/patch-sources_pyside6_qtexampleicons_CMakeLists.txt
deleted file mode 100644
index 16dbad30bf..0000000000
--- a/py-pyside6/patches/patch-sources_pyside6_qtexampleicons_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Avoid using Qt::ExampleIconsPrivate which has problems in 6.9.1.
-
---- sources/pyside6/qtexampleicons/CMakeLists.txt.orig	2025-08-21 09:44:25.683811555 +0000
-+++ sources/pyside6/qtexampleicons/CMakeLists.txt
-@@ -37,7 +37,6 @@ target_include_directories(QtExampleIcon
- get_property(SHIBOKEN_PYTHON_LIBRARIES GLOBAL PROPERTY shiboken_python_libraries)
- 
- target_link_libraries(QtExampleIcons PRIVATE
--                      Qt::ExampleIconsPrivate
-                       ${SHIBOKEN_PYTHON_LIBRARIES})
- 
- set_target_properties(QtExampleIcons PROPERTIES


Home | Main Index | Thread Index | Old Index