Readjust patches for 6.6.0.

ci/unstable
Patrick Franz 1 year ago
parent e57a7fa7df
commit f729031e91
No known key found for this signature in database
GPG Key ID: 9E9F7A603077FE56

1
debian/changelog vendored

@ -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 <debian-qt-kde@lists.debian.org> Tue, 10 Oct 2023 17:54:32 +0200

@ -16,11 +16,11 @@
--- 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

@ -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 <lisandro@debian.org>
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

@ -3,7 +3,7 @@ Description: remove RPATH/RUNPATH from examples' binaries.
need to set RPATH/RUNPATH.
Author: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>
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

@ -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

Loading…
Cancel
Save