python3-shiboken6
This commit is contained in:
@@ -1,17 +1,17 @@
|
||||
From 6d4ac91913f8dbc061a03fca1bd699a6248f3ad4 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Grulich <jgrulich@redhat.com>
|
||||
Date: Wed, 15 Apr 2026 15:54:49 +0200
|
||||
From c069622d35a00485742b125caf9439b31b1b972f Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Marin <christophe@krop.fr>
|
||||
Date: Tue, 7 Oct 2025 15:54:32 +0200
|
||||
Subject: [PATCH] Fix installation
|
||||
|
||||
Upstream decided to install files in non-standard locations.
|
||||
---
|
||||
sources/pyside6/CMakeLists.txt | 2 +-
|
||||
sources/shiboken6/libshiboken/CMakeLists.txt | 2 +-
|
||||
sources/shiboken6_generator/generator/CMakeLists.txt | 4 ++--
|
||||
sources/pyside6/CMakeLists.txt | 2 +-
|
||||
sources/shiboken6/generator/CMakeLists.txt | 4 ++--
|
||||
sources/shiboken6/libshiboken/CMakeLists.txt | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
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
|
||||
+++ b/sources/pyside6/CMakeLists.txt
|
||||
@@ -40,7 +40,7 @@ install(EXPORT PySide6Targets
|
||||
@@ -23,23 +23,11 @@ index bfe3956..b3f9946 100644
|
||||
FILE PySide6Targets.cmake)
|
||||
endif()
|
||||
|
||||
diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
|
||||
index bc3569b..de7b06b 100644
|
||||
--- a/sources/shiboken6/libshiboken/CMakeLists.txt
|
||||
+++ b/sources/shiboken6/libshiboken/CMakeLists.txt
|
||||
@@ -221,6 +221,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()
|
||||
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"
|
||||
diff --git a/sources/shiboken6/generator/CMakeLists.txt b/sources/shiboken6/generator/CMakeLists.txt
|
||||
index 997468f..d0948d9 100644
|
||||
--- a/sources/shiboken6/generator/CMakeLists.txt
|
||||
+++ b/sources/shiboken6/generator/CMakeLists.txt
|
||||
@@ -73,11 +73,11 @@ install(EXPORT "${package_name}Targets"
|
||||
if(NOT is_pyside6_superproject_build)
|
||||
install(TARGETS shiboken6
|
||||
EXPORT "${package_name}WheelTargets"
|
||||
@@ -53,6 +41,17 @@ index 33bb413..fd2a9f3 100644
|
||||
FILE "${package_name}Targets.cmake")
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user