[neon/qt6/qt6-base/Neon/release] debian/patches: refresh patches

Carlos De Maine null at kde.org
Sun Oct 22 09:19:19 BST 2023 

Git commit c4cb10e1459dde820c042444f2b2a7e20b5f015e by Carlos De Maine.
Committed on 22/10/2023 at 10:19.
Pushed by carlosdem into branch 'Neon/release'.

refresh patches

M  +3    -5    debian/patches/Add-SH-detection.patch
M  +1    -1    debian/patches/armel-noyield.patch
M  +1    -1    debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch
M  +5    -5    debian/patches/cross.patch
M  +4    -4    debian/patches/force_shared_libzstd.patch
M  +3    -3    debian/patches/forkfd_grow_stack_upwards_on_hppa.patch
M  +1    -1    debian/patches/remove_privacy_breaches.diff
M  +2    -2    debian/patches/remove_rpath_from_examples.patch
M  +1    -1    debian/patches/series

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

diff --git a/debian/patches/Add-SH-detection.patch b/debian/patches/Add-SH-detection.patch
index 6d50e59..1e02454 100644
--- a/debian/patches/Add-SH-detection.patch
+++ b/debian/patches/Add-SH-detection.patch
@@ -7,11 +7,9 @@ Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1043225
 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 
-Index: qt6-base-6.4.2+dfsg/src/corelib/global/qprocessordetection.h
-===================================================================
---- qt6-base-6.4.2+dfsg.orig/src/corelib/global/qprocessordetection.h
-+++ qt6-base-6.4.2+dfsg/src/corelib/global/qprocessordetection.h
-@@ -294,12 +294,12 @@
+--- a/src/corelib/global/qprocessordetection.h
++++ b/src/corelib/global/qprocessordetection.h
+@@ -311,12 +311,12 @@
  
      SuperH is bi-endian, use endianness auto-detection implemented below.
  */
diff --git a/debian/patches/armel-noyield.patch b/debian/patches/armel-noyield.patch
index 74b1ae2..1946a65 100644
--- a/debian/patches/armel-noyield.patch
+++ b/debian/patches/armel-noyield.patch
@@ -6,7 +6,7 @@ Description: Don't use yield on CPUs that might not support it
 
 --- a/src/corelib/global/qsimd_p.h
 +++ b/src/corelib/global/qsimd_p.h
-@@ -401,7 +401,9 @@ static inline void qYieldCpu()
+@@ -415,7 +415,9 @@
           https://stackoverflow.com/a/70076751/134841
           https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105416
      */
diff --git a/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch b/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch
index bf93bca..737dfc0 100644
--- a/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch
+++ b/debian/patches/build_path_embedded_qtbuildinternalsextra_cmake.patch
@@ -14,7 +14,7 @@ https://reproducible-builds.org/docs/build-path/
 
 --- a/cmake/QtBuildInternalsExtra.cmake.in
 +++ b/cmake/QtBuildInternalsExtra.cmake.in
-@@ -75,9 +75,6 @@ endif()
+@@ -74,9 +74,6 @@
  set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL
      "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)
  
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
index e84f821..ee464d0 100644
--- a/debian/patches/cross.patch
+++ b/debian/patches/cross.patch
@@ -5,7 +5,7 @@
 
 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-@@ -151,8 +151,6 @@ function(qt_build_internals_disable_pkg_
+@@ -170,8 +170,6 @@
      set(FEATURE_pkg_config "${pkg_config_enabled}" CACHE STRING "Using pkg-config")
      if(NOT pkg_config_enabled)
          qt_build_internals_disable_pkg_config()
@@ -16,18 +16,18 @@
  
 --- a/src/tools/configure.cmake
 +++ b/src/tools/configure.cmake
-@@ -2,7 +2,7 @@ qt_feature("androiddeployqt" PRIVATE
+@@ -5,7 +5,7 @@
      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)
-+    CONDITION (QT_FORCE_BUILD_TOOLS OR NOT CMAKE_CROSSCOMPILING) AND QT_FEATURE_regularexpression)
+-    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)
  
  qt_feature("macdeployqt" PRIVATE
      SECTION "Deployment"
 --- a/examples/sql/CMakeLists.txt
 +++ b/examples/sql/CMakeLists.txt
-@@ -12,6 +12,6 @@ if(TARGET Qt::Xml)
+@@ -15,6 +15,6 @@
      qt_internal_add_example(masterdetail)
  endif()
  
diff --git a/debian/patches/force_shared_libzstd.patch b/debian/patches/force_shared_libzstd.patch
index 7c1ac1f..09a453c 100644
--- a/debian/patches/force_shared_libzstd.patch
+++ b/debian/patches/force_shared_libzstd.patch
@@ -12,14 +12,14 @@ Forwarded: not-needed
 
 --- a/cmake/FindWrapZSTD.cmake
 +++ b/cmake/FindWrapZSTD.cmake
-@@ -25,11 +25,8 @@ include(FindPackageHandleStandardArgs)
+@@ -28,11 +28,8 @@
  if(TARGET zstd::libzstd_static OR TARGET zstd::libzstd_shared)
      find_package_handle_standard_args(WrapZSTD
                                        REQUIRED_VARS zstd_VERSION VERSION_VAR zstd_VERSION)
--    if(TARGET zstd::libzstd_static)
--        set(zstdtargetsuffix "_static")
--    else()
+-    if(TARGET zstd::libzstd_shared)
 -        set(zstdtargetsuffix "_shared")
+-    else()
+-        set(zstdtargetsuffix "_static")
 -    endif()
 +    set(zstdtargetsuffix "_shared")
 +
diff --git a/debian/patches/forkfd_grow_stack_upwards_on_hppa.patch b/debian/patches/forkfd_grow_stack_upwards_on_hppa.patch
index 0d87ac1..11cc7c8 100644
--- a/debian/patches/forkfd_grow_stack_upwards_on_hppa.patch
+++ b/debian/patches/forkfd_grow_stack_upwards_on_hppa.patch
@@ -6,9 +6,9 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1042018
 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Last-Update: 2023-07-28
 
---- ./src/3rdparty/forkfd/forkfd_linux.c.save	2023-07-27 12:04:02.940466337 +0000
-+++ ./src/3rdparty/forkfd/forkfd_linux.c	2023-07-27 12:06:53.522077424 +0000
-@@ -168,7 +168,12 @@
+--- a/src/3rdparty/forkfd/forkfd_linux.c
++++ b/src/3rdparty/forkfd/forkfd_linux.c
+@@ -169,7 +169,12 @@
      }
      *system = 1;
  
diff --git a/debian/patches/remove_privacy_breaches.diff b/debian/patches/remove_privacy_breaches.diff
index e911149..b61f9c7 100644
--- a/debian/patches/remove_privacy_breaches.diff
+++ b/debian/patches/remove_privacy_breaches.diff
@@ -12,7 +12,7 @@ Last-Update: 2015-02-18
 
 --- a/doc/global/template/scripts/main.js
 +++ b/doc/global/template/scripts/main.js
-@@ -94,11 +94,6 @@ $(document).ready(function($) {
+@@ -94,11 +94,6 @@
  });
  
  $( window ).load(function() {
diff --git a/debian/patches/remove_rpath_from_examples.patch b/debian/patches/remove_rpath_from_examples.patch
index 07f01d5..e15da13 100644
--- a/debian/patches/remove_rpath_from_examples.patch
+++ b/debian/patches/remove_rpath_from_examples.patch
@@ -11,12 +11,12 @@ Last-Update: 2023-07-23
 
 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-@@ -849,7 +849,7 @@ macro(qt_examples_build_begin)
+@@ -979,7 +979,7 @@
      # 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}")
-     set(QT_DISABLE_QT_ADD_PLUGIN_COMPATIBILITY TRUE)
  
      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 f9ac90c..635adb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,7 +21,7 @@ remove_privacy_breaches.diff
 build_path_embedded_qtbuildinternalsextra_cmake.patch
 cross.patch
 force_shared_libzstd.patch
-no_htmlinfo_example.patch
+#no_htmlinfo_example.patch #### no longer required
 remove_rpath_from_examples.patch
 forkfd_grow_stack_upwards_on_hppa.patch

More information about the Neon-commits mailing list