Your message dated Tue, 31 Jan 2023 19:10:16 +0000 with message-id <e1pmw1i-0033r7...@fasolo.debian.org> and subject line Bug#1023054: fixed in qt6-base 6.4.2+dfsg-1 has caused the Debian Bug report #1023054, regarding qt6-base FTCBFS: multiple reasons to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 1023054: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1023054 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Source: qt6-base Version: 6.3.1+dfsg-10 Tags: patch User: debian-cr...@lists.debian.org Usertags: ftcbfs qt6-base fails to cross build from source for many different reasons. I've created a patch that makes it cross buildable and documented the individual aspects in the changelog. Does all of that make sense to you? The most contentious parts are probably in cross.patch. Do you think they're upstreamable in some way? Helmutdiff --minimal -Nru qt6-base-6.3.1+dfsg/debian/changelog qt6-base-6.3.1+dfsg/debian/changelog --- qt6-base-6.3.1+dfsg/debian/changelog 2022-10-01 18:58:47.000000000 +0200 +++ qt6-base-6.3.1+dfsg/debian/changelog 2022-10-28 19:58:00.000000000 +0200 @@ -1,3 +1,16 @@ +qt6-base (6.3.1+dfsg-10.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #-1) + + cross.patch: Honour PKG_CONFIG_EXECUTABLE + + cross.patch: Allow building android tools + + Pass QT_HOST_* variables to build. + + Depend on a native qt toolchain for the former. + + Do build tools even when cross building. + + Add excess files t debian/not-installed. + + -- Helmut Grohne <hel...@subdivi.de> Fri, 28 Oct 2022 19:58:00 +0200 + qt6-base (6.3.1+dfsg-10) unstable; urgency=medium [ Lisandro Damián Nicanor Pérez Meyer ] diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/control qt6-base-6.3.1+dfsg/debian/control --- qt6-base-6.3.1+dfsg/debian/control 2022-09-17 19:21:11.000000000 +0200 +++ qt6-base-6.3.1+dfsg/debian/control 2022-10-28 19:58:00.000000000 +0200 @@ -71,6 +71,7 @@ ninja-build, pkg-config, pkg-kde-tools (>= 0.15.17~), + qt6-base-dev:native <cross>, unixodbc-dev, zlib1g-dev, Standards-Version: 4.6.1 diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/not-installed qt6-base-6.3.1+dfsg/debian/not-installed --- qt6-base-6.3.1+dfsg/debian/not-installed 2022-09-11 13:58:51.000000000 +0200 +++ qt6-base-6.3.1+dfsg/debian/not-installed 2022-10-28 19:58:00.000000000 +0200 @@ -4,3 +4,8 @@ usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6/3rdparty/kwin/qt_attribution.json usr/lib/qt6/bin/qmake usr/lib/qt6/bin/qtpaths +# cross build specific: +usr/lib/qt6/bin/host-qmake +usr/lib/qt6/bin/host-qtpaths +usr/lib/qt6/bin/target_qt.conf +usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/qdevice.pri diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/patches/cross.patch qt6-base-6.3.1+dfsg/debian/patches/cross.patch --- qt6-base-6.3.1+dfsg/debian/patches/cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ qt6-base-6.3.1+dfsg/debian/patches/cross.patch 2022-10-28 19:58:00.000000000 +0200 @@ -0,0 +1,22 @@ +--- qt6-base-6.3.1+dfsg.orig/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake ++++ qt6-base-6.3.1+dfsg/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +@@ -146,8 +146,6 @@ + set(FEATURE_pkg_config "${pkg_config_enabled}" CACHE STRING "Using pkg-config") + if(NOT pkg_config_enabled) + qt_build_internals_disable_pkg_config() +- else() +- unset(PKG_CONFIG_EXECUTABLE CACHE) + endif() + endfunction() + +--- qt6-base-6.3.1+dfsg.orig/src/tools/configure.cmake ++++ qt6-base-6.3.1+dfsg/src/tools/configure.cmake +@@ -2,7 +2,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_FEATURE_regularexpression) + + qt_feature("macdeployqt" PRIVATE + SECTION "Deployment" diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/patches/series qt6-base-6.3.1+dfsg/debian/patches/series --- qt6-base-6.3.1+dfsg/debian/patches/series 2022-09-17 13:50:40.000000000 +0200 +++ qt6-base-6.3.1+dfsg/debian/patches/series 2022-10-28 19:58:00.000000000 +0200 @@ -11,3 +11,4 @@ # Don't use yield on CPUs that might not support it armel-noyield.patch +cross.patch diff --minimal -Nru qt6-base-6.3.1+dfsg/debian/rules qt6-base-6.3.1+dfsg/debian/rules --- qt6-base-6.3.1+dfsg/debian/rules 2022-09-17 19:21:11.000000000 +0200 +++ qt6-base-6.3.1+dfsg/debian/rules 2022-10-28 19:58:00.000000000 +0200 @@ -19,6 +19,13 @@ extra_cmake_args += -DFEATURE_sctp=OFF endif +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 +endif + %: dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
--- End Message ---
--- Begin Message ---Source: qt6-base Source-Version: 6.4.2+dfsg-1 Done: Patrick Franz <delta...@debian.org> We believe that the bug you reported is fixed in the latest version of qt6-base, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 1023...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Patrick Franz <delta...@debian.org> (supplier of updated qt6-base package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Tue, 31 Jan 2023 19:16:32 +0100 Source: qt6-base Architecture: source Version: 6.4.2+dfsg-1 Distribution: unstable Urgency: medium Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Changed-By: Patrick Franz <delta...@debian.org> Closes: 1023054 1025663 Changes: qt6-base (6.4.2+dfsg-1) unstable; urgency=medium . [ Patrick Franz ] * Switch to the official 6.4.2 tarball, the tarball is the same. . [ Helmut Grohne ] * Fix FTCBFS: Pass QT_HOST_PATH. (Closes: #1023054) + cross.patch: Honour PKG_CONFIG_EXECUTABLE + cross.patch: Allow building android tools + Pass QT_HOST_* variables to build. + Depend on a native qt toolchain for the former. + Do build tools even when cross building. + Add excess files to debian/not-installed. * Install <triplet>-qmake6 cross wrapper (Closes: #1025663). Checksums-Sha1: 7d4aa2ea291da827cea3d4ff7af99f19bdfbc088 4830 qt6-base_6.4.2+dfsg-1.dsc be3859a1f98f38ea4ebde1306b7c9cac7e4cb370 45943692 qt6-base_6.4.2+dfsg.orig.tar.xz 8641126017edd909e0e6d45fb133e2dd85d213f9 175260 qt6-base_6.4.2+dfsg-1.debian.tar.xz 6d77a51279cb74d0cb9211309eb086c8b65cf3fa 9369 qt6-base_6.4.2+dfsg-1_source.buildinfo Checksums-Sha256: 4609a121ce5d0368bc3d91cd5e390e8a34b620f867556cac3954b729ee6f2a14 4830 qt6-base_6.4.2+dfsg-1.dsc 4f14b89a9463a540fd84a6718b8519a2297119b454ef547721015a9e9019ae9e 45943692 qt6-base_6.4.2+dfsg.orig.tar.xz 42c57caa7bd7582450ea4d2fbab2369a63fdd6a580bbb8cd454eb3b7daf5017a 175260 qt6-base_6.4.2+dfsg-1.debian.tar.xz 471ea8a510775245efbd42e5a554789f6ee8f1cdb25889448fe9444cd6aa666f 9369 qt6-base_6.4.2+dfsg-1_source.buildinfo Files: 2b3760b8ef0fdaa9a0f54140b548ab76 4830 libs optional qt6-base_6.4.2+dfsg-1.dsc 99724190bd6eb53b3f4b723e09e32304 45943692 libs optional qt6-base_6.4.2+dfsg.orig.tar.xz 430b7b664c852de10598401adec7670c 175260 libs optional qt6-base_6.4.2+dfsg-1.debian.tar.xz 087360ced32d7511834663495cac7ca1 9369 libs optional qt6-base_6.4.2+dfsg-1_source.buildinfo -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEYodBXDR68cxZHu3Knp96YDB3/lYFAmPZXbMACgkQnp96YDB3 /labExAApNy+WoRVm1HhpgA1/vQ7XGz9o2zXsJQf0iuGE2l6gx8nIMc3ZaKNNGUL BcFP+yvu59br/XKaL4U/rVx8klxEUv9QqSwQpdQDTGrLFs61EGdt8RO+iy65cpM1 7i9bUETAAWk/8quupMhbWI+5tHkXVln0gII8nS26EGbKNMqumjnCJ8sJWI7m8JqF Tzk/DoyjEhdZUTtjQKttidsCRMlySPxsakAR/fT9I2w8OdUEFWAoYxjsAABZRqRk 0syQBYi9jDK15/3wADaLuAeW/tQZvYUEi8nb7cnuWwNFE86utTlxyecMFD3oFAvz OE0Si091LCO/2LPuHzahbPe9DHtlSeV1+FdC90C7F9vLrRSFsc4JEoPwA8Jcru+n Gqg8BwkjbM44wMx8komKPYn9Lg0UjmDMYqguG8iTgf8Mk7FzzaXvaHsgzb65obH+ wmaT94hExEvm6rFPHcU+AE2umdjEImKyOGZGn92fvNQX0FLFUIV2li6VqBJ3xiYX +S012NiQ3xurwk3oHPFNDLVcM8AK3b+ImvcuCQ4OWGmTbyfkFdqVnSo3kjKRLbRM uVw2pmb49oJzmTT5scfLQ/+ZL5zQbGb0CWxORV54OJWU+51+9MjSgNEwaBnl11im NfVB/j/vkQFEYRv4ButaeKit9ypKkm437putx0jbiUBe+OdJ8jc= =KCJn -----END PGP SIGNATURE-----
--- End Message ---
