diff --git a/debian/changelog b/debian/changelog index 4b6a2b5..7a2adb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ qt6-base (6.6.0+dfsg-1) UNRELEASED; urgency=medium * Update ABI to 6.6.0. * Remove references to htmlinfo examples. * Remove patches that have been applied upstream. + * Readjust patches for 6.6.0. -- Debian Qt/KDE Maintainers Tue, 10 Oct 2023 17:54:32 +0200 diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch index e84f821..1b8b2e5 100644 --- a/debian/patches/cross.patch +++ b/debian/patches/cross.patch @@ -16,13 +16,13 @@ --- a/src/tools/configure.cmake +++ b/src/tools/configure.cmake -@@ -2,7 +2,7 @@ qt_feature("androiddeployqt" PRIVATE +@@ -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) +- 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) - + qt_feature("macdeployqt" PRIVATE SECTION "Deployment" --- a/examples/sql/CMakeLists.txt diff --git a/debian/patches/force_shared_libzstd.patch b/debian/patches/force_shared_libzstd.patch deleted file mode 100644 index 7c1ac1f..0000000 --- a/debian/patches/force_shared_libzstd.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: force the usage of the shared libzstd library. - The library provides both versions, and the original code prefers the static - version over the shared, while on Debian it should always use the shared - version. -Author: Lisandro Damián Nicanor Pérez Meyer -Bug: https://bugreports.qt.io/browse/QTBUG-110978 -Forwarded: not-needed - ---- - cmake/FindWrapZSTD.cmake | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - ---- a/cmake/FindWrapZSTD.cmake -+++ b/cmake/FindWrapZSTD.cmake -@@ -25,11 +25,8 @@ include(FindPackageHandleStandardArgs) - 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() -- set(zstdtargetsuffix "_shared") -- endif() -+ set(zstdtargetsuffix "_shared") -+ - if(NOT TARGET WrapZSTD::WrapZSTD) - add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED) - set_target_properties(WrapZSTD::WrapZSTD PROPERTIES diff --git a/debian/patches/remove_rpath_from_examples.patch b/debian/patches/remove_rpath_from_examples.patch index 07f01d5..5f55d4c 100644 --- a/debian/patches/remove_rpath_from_examples.patch +++ b/debian/patches/remove_rpath_from_examples.patch @@ -3,7 +3,7 @@ Description: remove RPATH/RUNPATH from examples' binaries. need to set RPATH/RUNPATH. Author: Lisandro Damián Nicanor Pérez Meyer Forwarded: not-needed -Last-Update: 2023-07-23 +Last-Update: 2023-10-10 --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 +- @@ -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) +@@ -981,7 +981,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}") - 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 d469211..f85d075 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,6 @@ Add-SH-detection.patch remove_privacy_breaches.diff build_path_embedded_qtbuildinternalsextra_cmake.patch cross.patch -force_shared_libzstd.patch remove_rpath_from_examples.patch forkfd_grow_stack_upwards_on_hppa.patch