Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18787 from Rmys/master

Browse Source 
pyside6
This commit is contained in:
Rmys
2026-06-07 12:52:34 +03:00
committed by GitHub
parent dad18575d0 75f1089de6
commit 183588fd56
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/language/python3/pyside6/files/0001-Fix-installation.patch
+25 -26
View File
@@ -1,17 +1,17 @@
From 6d4ac91913f8dbc061a03fca1bd699a6248f3ad4 Mon Sep 17 00:00:00 2001 From c069622d35a00485742b125caf9439b31b1b972f Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com> From: Christophe Marin <christophe@krop.fr>
Date: Wed, 15 Apr 2026 15:54:49 +0200 Date: Tue, 7 Oct 2025 15:54:32 +0200
Subject: [PATCH] Fix installation Subject: [PATCH] Fix installation
Upstream decided to install files in non-standard locations. Upstream decided to install files in non-standard locations.
--- ---
sources/pyside6/CMakeLists.txt | 2 +- sources/pyside6/CMakeLists.txt | 2 +-
sources/shiboken6/libshiboken/CMakeLists.txt | 2 +- sources/shiboken6/generator/CMakeLists.txt | 4 ++--
sources/shiboken6_generator/generator/CMakeLists.txt | 4 ++-- sources/shiboken6/libshiboken/CMakeLists.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-) 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt
index bfe3956..b3f9946 100644 index 6b73d70..74aaba5 100644
--- a/sources/pyside6/CMakeLists.txt --- a/sources/pyside6/CMakeLists.txt
+++ b/sources/pyside6/CMakeLists.txt +++ b/sources/pyside6/CMakeLists.txt
@@ -40,7 +40,7 @@ install(EXPORT PySide6Targets @@ -40,7 +40,7 @@ install(EXPORT PySide6Targets
@@ -23,23 +23,11 @@ index bfe3956..b3f9946 100644
FILE PySide6Targets.cmake) FILE PySide6Targets.cmake)
endif() endif()
diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt diff --git a/sources/shiboken6/generator/CMakeLists.txt b/sources/shiboken6/generator/CMakeLists.txt
index bc3569b..de7b06b 100644 index 997468f..d0948d9 100644
--- a/sources/shiboken6/libshiboken/CMakeLists.txt --- a/sources/shiboken6/generator/CMakeLists.txt
+++ b/sources/shiboken6/libshiboken/CMakeLists.txt +++ b/sources/shiboken6/generator/CMakeLists.txt
@@ -221,6 +221,6 @@ if(NOT is_pyside6_superproject_build) @@ -73,11 +73,11 @@ install(EXPORT "${package_name}Targets"
install(EXPORT Shiboken6WheelTargets
NAMESPACE Shiboken6::
- DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/Shiboken6"
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6"
FILE Shiboken6Targets.cmake)
endif()
diff --git a/sources/shiboken6_generator/generator/CMakeLists.txt b/sources/shiboken6_generator/generator/CMakeLists.txt
index 33bb413..fd2a9f3 100644
--- a/sources/shiboken6_generator/generator/CMakeLists.txt
+++ b/sources/shiboken6_generator/generator/CMakeLists.txt
@@ -72,11 +72,11 @@ install(EXPORT "${package_name}Targets"
if(NOT is_pyside6_superproject_build) if(NOT is_pyside6_superproject_build)
install(TARGETS shiboken6 install(TARGETS shiboken6
EXPORT "${package_name}WheelTargets" EXPORT "${package_name}WheelTargets"
@@ -53,6 +41,17 @@ index 33bb413..fd2a9f3 100644
FILE "${package_name}Targets.cmake") FILE "${package_name}Targets.cmake")
endif() endif()
diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
index 973d14b..c4235f8 100644
--- a/sources/shiboken6/libshiboken/CMakeLists.txt
+++ b/sources/shiboken6/libshiboken/CMakeLists.txt
@@ -217,6 +217,6 @@ if(NOT is_pyside6_superproject_build)
install(EXPORT Shiboken6WheelTargets
NAMESPACE Shiboken6::
- DESTINATION "${LIB_INSTALL_DIR}/wheels/cmake/Shiboken6"
+ DESTINATION "${LIB_INSTALL_DIR}/cmake/Shiboken6"
FILE Shiboken6Targets.cmake)
endif()
-- --
2.53.0 2.51.0
programming/language/python3/pyside6/pspec.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Shiboken the Binding Generator</Summary> <Summary>Shiboken the Binding Generator</Summary>
<Description>Shiboken is the CPython-based binding code generator for C or C++ libraries. It uses an ApiExtractor library to parse the C or C++ headers and get the type information, using Clang.</Description> <Description>Shiboken is the CPython-based binding code generator for C or C++ libraries. It uses an ApiExtractor library to parse the C or C++ headers and get the type information, using Clang.</Description>
<Archive sha1sum="f6fcc74d4c9fa92fa8e497accef6ee47729db727" type="tarxz">https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.10.3-src/pyside-setup-everywhere-src-6.11.1.tar.xz</Archive> <Archive sha1sum="f6fcc74d4c9fa92fa8e497accef6ee47729db727" type="tarxz">https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-6.10.3-src/pyside-setup-everywhere-src-6.10.3.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>llvm</Dependency> <Dependency>llvm</Dependency>
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>