[neon/qt6/pyside6/Neon/unstable] debian/patches: get the last cmake include revert needed

Carlos De Maine null at kde.org
Mon Dec 1 02:24:07 GMT 2025


Git commit c5f64b9c964929e2ac6e478b7230bf94fc4c3bd1 by Carlos De Maine.
Committed on 01/12/2025 at 02:24.
Pushed by carlosdem into branch 'Neon/unstable'.

get the last cmake include revert needed

M  +9    -6    debian/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch

https://invent.kde.org/neon/qt6/pyside6/-/commit/c5f64b9c964929e2ac6e478b7230bf94fc4c3bd1

diff --git a/debian/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch b/debian/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch
index 78c20fa..a0cc00f 100644
--- a/debian/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch
+++ b/debian/patches/0001-Revert-Modify-headers-installation-for-CMake-builds.patch
@@ -27,17 +27,20 @@ diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
 index 59c63fd..03b814e 100644
 --- a/build_scripts/platforms/unix.py
 +++ b/build_scripts/platforms/unix.py
-@@ -108,8 +108,8 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False):
+@@ -108,10 +108,10 @@
              "{st_build_dir}/{st_package_name}/scripts/shiboken_tool.py",
              force=False, _vars=_vars)
  
--    if config.is_internal_shiboken_module_build() or config.is_internal_pyside_build():
--        # <install>/{cmake_package_name}/include/* -> <package_for_wheels>/{st_package_name}/include
-+    if config.is_internal_shiboken_generator_build() or config.is_internal_pyside_build():
-+        # <install>/include/* -> <setup>/{st_package_name}/include
+-    if config.is_internal_shiboken_generator_build() or config.is_internal_pyside_build():
+-        # <install>/include/* -> <setup>/include/{st_package_name}
++    if config.is_internal_shiboken_module_build() or config.is_internal_pyside_build():
++        # <install>/{cmake_package_name}/include/* -> <package_for_wheels>/{st_package_name}/include
          copydir(
-             "{install_dir}/{cmake_package_name}/include",
+-            "{install_dir}/include/{cmake_package_name}",
++            "{install_dir}/{cmake_package_name}/include",
              destination_dir / "include",
+             _vars=_vars)
+ 
 diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
 index e023ff0..83f06c3 100644
 --- a/build_scripts/platforms/windows_desktop.py


More information about the Neon-commits mailing list