[neon/qt6/qt6-base/Neon/release] debian: bump abi and sync patches to debian

[Carlos De Maine]

Git commit 06850a6825657fc0ab3b0052c72e9b65b6141682 by Carlos De Maine.
Committed on 16/02/2024 at 10:20.
Pushed by carlosdem into branch 'Neon/release'.

bump abi and sync patches to debian

M  +1    -1    debian/control
M  +9    -9    debian/patches/cross.patch
A  +22   -0    debian/patches/remove_rpath_from_examples.patch
M  +3    -3    debian/patches/series

https://invent.kde.org/neon/qt6/qt6-base/-/commit/06850a6825657fc0ab3b0052c72e9b65b6141682

diff --git a/debian/control b/debian/control
index 493ce58..1ea3c8f 100644
--- a/debian/control
+++ b/debian/control
@@ -122,7 +122,7 @@ Depends: fontconfig,
          shared-mime-info,
          ${misc:Depends},
          ${shlibs:Depends}
-Provides: qt6-base-private-abi (= 6.6.1),
+Provides: qt6-base-private-abi (= 6.6.2),
 Recommends: libcups2,
             libqt6sql6-sqlite | libqt6sql6-mysql | libqt6sql6-odbc | libqt6sql6-psql | libqt6sql6-ibase,
             qt6-gtk-platformtheme,
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
index 08193ce..d2a5cf7 100644
--- a/debian/patches/cross.patch
+++ b/debian/patches/cross.patch
@@ -1,25 +1,25 @@
-     ---
- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake |    2 --
+---
+ examples/sql/CMakeLists.txt                         |    2 +-
  src/tools/configure.cmake                           |    2 +-
- 2 files changed, 1 insertion(+), 3 deletions(-)
- 
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
 --- a/src/tools/configure.cmake
 +++ b/src/tools/configure.cmake
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ qt_feature("androiddeployqt" PRIVATE
      SECTION "Deployment"
      LABEL "Android deployment tool"
      PURPOSE "The Android deployment tool automates the process of creating Android packages."
 -    CONDITION NOT CMAKE_CROSSCOMPILING AND QT_FEATURE_regularexpression AND QT_FEATURE_settings)
-+    CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression AND QT_FEATURE_settings)
- 
++    CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression)
+
  qt_feature("macdeployqt" PRIVATE
      SECTION "Deployment"
 --- a/examples/sql/CMakeLists.txt
 +++ b/examples/sql/CMakeLists.txt
-@@ -15,6 +15,6 @@
+@@ -15,6 +15,6 @@ if(TARGET Qt6::Xml)
      qt_internal_add_example(masterdetail)
  endif()
- 
+
 -if(NOT CMAKE_CROSSCOMPILING)
 +if(QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING)
      qt_internal_add_example(sqlbrowser)
diff --git a/debian/patches/remove_rpath_from_examples.patch b/debian/patches/remove_rpath_from_examples.patch
new file mode 100644
index 0000000..067ad36
--- /dev/null
+++ b/debian/patches/remove_rpath_from_examples.patch
@@ -0,0 +1,22 @@
+Description: remove RPATH/RUNPATH from examples' binaries.
+ On Debian the examples are built against system's libraries, so there is no
+ need to set RPATH/RUNPATH.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: not-needed
+Last-Update: 2024-02-15
+
+---
+ cmake/QtBuildInternals/QtBuildInternalsConfig.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/cmake/QtBuildRepoExamplesHelpers.cmake
++++ b/cmake/QtBuildRepoExamplesHelpers.cmake
+@@ -97,7 +97,7 @@ macro(qt_examples_build_begin)
+     # This means that installed examples are not relocatable at the moment. We would need to
+     # annotate where each example is installed to, to be able to derive a relative rpath, and it
+     # seems there's no way to query such information from CMake itself.
+-    set(CMAKE_INSTALL_RPATH "${_default_install_rpath}")
++    #set(CMAKE_INSTALL_RPATH "${_default_install_rpath}")
+
+     install(CODE "
+ # Backup CMAKE_INSTALL_PREFIX because we're going to change it in each example subdirectory
diff --git a/debian/patches/series b/debian/patches/series
index e360fc9..cdfc766 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,12 +5,12 @@ Add-SH-detection.patch
 be_verbose_on_plugin_inclusion.patch
 
 # Debian specific
-remove_privacy_breaches.diff
 build_path_embedded_qtbuildinternalsextra_cmake.patch
 cross.patch
-forkfd_grow_stack_upwards_on_hppa.patch
 enable_skip_plugins.patch
-
+forkfd_grow_stack_upwards_on_hppa.patch
+remove_privacy_breaches.diff
+remove_rpath_from_examples.patch
 
 # Don't use yield on CPUs that might not support it
 armel-noyield.patch