From 4515ed5f7c6c5278af059c8dfc13be97b90095a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Tue, 1 Aug 2023 19:48:00 -0300 Subject: [PATCH] Fix cross build again. Thanks Helmut for the patch! --- debian/changelog | 9 +++++++++ debian/patches/cross.patch | 12 +++++++++++- debian/rules | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 46b1d5f..bcc089c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +qt6-base (6.4.2+dfsg-18) UNRELEASED; urgency=medium + + [ Helmut Grohne ] + * Fix FTCBFS: Do build sqlbrowser. (Closes: #1042709) + * Move from deprecated QT_BUILD_TOOLS_WHEN_CROSSCOMPILING to + QT_FORCE_BUILD_TOOLS. + + -- Debian Qt/KDE Maintainers Tue, 01 Aug 2023 19:47:16 -0300 + qt6-base (6.4.2+dfsg-17) unstable; urgency=medium * Team upload. diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch index 239c803..e84f821 100644 --- a/debian/patches/cross.patch +++ b/debian/patches/cross.patch @@ -21,7 +21,17 @@ 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_FEATURE_regularexpression) ++ 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 +@@ -12,6 +12,6 @@ if(TARGET Qt::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) + endif() diff --git a/debian/rules b/debian/rules index 728f90e..03b46ec 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,7 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) extra_cmake_args += \ -DQT_HOST_PATH=/usr \ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/${DEB_BUILD_MULTIARCH}/cmake \ - -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON + -DQT_FORCE_BUILD_TOOLS=ON endif %: