Bug#1042709: qt6-base FTCBFS: doesn't build sqlbrowser

[Lisandro Damián Nicanor Pérez Meyer]

tag 1042709 pending
thanks

On Sun, 30 Jul 2023 at 16:43, Helmut Grohne  wrote:
>
> Source: qt6-base
> Version: 6.4.2+dfsg-17
> Tags: patch
> User: debian-cr...@lists.debian.org
> Usertags: ftcbfs
>
> Hi,
>
> qt6-base fails to cross build again. This time, it misses building
> sqlbrowser. While fixing it, I noticed that the variable we are passing
> is deprecated and also update it. I'm attaching a patch for your
> convenience.

Thanks a lot for it! I just applied it to our master branch. I plan to
push this as soon as the current version in unstable migrates to
testing.

> Should we also
> s/QT_BUILD_TOOLS_WHEN_CROSSCOMPILING/QT_FORCE_BUILD_TOOLS/ across the
> rest of the qt6 packaging?

We should, although I think there are a handful of packages out of the
whole 30 something submodules.


-- 
Lisandro Damián Nicanor Pérez Meyer
https://perezmeyer.com.ar/

Bug#1042709: qt6-base FTCBFS: doesn't build sqlbrowser

[Helmut Grohne]

Source: qt6-base
Version: 6.4.2+dfsg-17
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

Hi,

qt6-base fails to cross build again. This time, it misses building
sqlbrowser. While fixing it, I noticed that the variable we are passing
is deprecated and also update it. I'm attaching a patch for your
convenience.

Should we also
s/QT_BUILD_TOOLS_WHEN_CROSSCOMPILING/QT_FORCE_BUILD_TOOLS/ across the
rest of the qt6 packaging?

Helmut
--- qt6-base-6.4.2+dfsg/debian/changelog
+++ qt6-base-6.4.2+dfsg/debian/changelog
@@ -1,3 +1,12 @@
+qt6-base (6.4.2+dfsg-17.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Do build sqlbrowser. (Closes: #-1)
+  * Move from deprecated QT_BUILD_TOOLS_WHEN_CROSSCOMPILING to
+QT_FORCE_BUILD_TOOLS.
+
+ -- Helmut Grohne   Sun, 30 Jul 2023 12:26:03 +0200
+
 qt6-base (6.4.2+dfsg-17) unstable; urgency=medium
 
   * Team upload.
--- qt6-base-6.4.2+dfsg/debian/patches/cross.patch
+++ qt6-base-6.4.2+dfsg/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()
--- qt6-base-6.4.2+dfsg/debian/rules
+++ qt6-base-6.4.2+dfsg/debian/rules
@@ -24,7 +24,7 @@
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
 
 %: