--- Begin Message ---
Package: qt5-qmake
Version: 5.14.2+dfsg-6
Tags: patch
User: debian-cross@lists.debian.org
Usertags: ftcbfs
Control: affects -1 + src:marble
Hi,
I found a new way to break the <triplet>-qmake cross wrapper. The
variant resides in marble's debian/rules. It actually does use the cross
wrapper, but it invokes it as "$(QMAKE) -qt=5 -query something". Since
our cross wrapper expects -query to come first, it doesn't recognize the
mode and fails.
Since our wrapper always calls into qt5, we can simply skip that flag.
Doing so should make the marble build happier. Please consider applying
the attached patch.
Helmut
diff --minimal -Nru qtbase-opensource-src-5.14.2+dfsg/debian/changelog qtbase-opensource-src-5.14.2+dfsg/debian/changelog
--- qtbase-opensource-src-5.14.2+dfsg/debian/changelog 2020-08-19 19:40:32.000000000 +0200
+++ qtbase-opensource-src-5.14.2+dfsg/debian/changelog 2020-10-21 19:28:25.000000000 +0200
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.14.2+dfsg-6.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * qmake cross wrapper: Allow passing -qt5. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Wed, 21 Oct 2020 19:28:25 +0200
+
qtbase-opensource-src (5.14.2+dfsg-6) unstable; urgency=medium
* Backport upstream patch to fix buffer overflow in XBM parser
diff --minimal -Nru qtbase-opensource-src-5.14.2+dfsg/debian/qmake-cross-wrapper.in qtbase-opensource-src-5.14.2+dfsg/debian/qmake-cross-wrapper.in
--- qtbase-opensource-src-5.14.2+dfsg/debian/qmake-cross-wrapper.in 2020-08-19 19:40:32.000000000 +0200
+++ qtbase-opensource-src-5.14.2+dfsg/debian/qmake-cross-wrapper.in 2020-10-21 19:28:21.000000000 +0200
@@ -1,5 +1,9 @@
#!/bin/sh
+if [ "x$1" = x-qt5 ] || [ "x$1" = "x-qt=5" ]; then
+ shift
+fi
+
QMAKE_MODE=
if [ "x$1" = x-query ]; then
--- End Message ---
--- Begin Message ---
Source: qtbase-opensource-src
Source-Version: 5.15.1+dfsg-2
Done: Dmitry Shachnev <mitya57@debian.org>
We believe that the bug you reported is fixed in the latest version of
qtbase-opensource-src, 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 972640@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Dmitry Shachnev <mitya57@debian.org> (supplier of updated qtbase-opensource-src 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 ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Wed, 28 Oct 2020 21:53:04 +0300
Source: qtbase-opensource-src
Architecture: source
Version: 5.15.1+dfsg-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Changed-By: Dmitry Shachnev <mitya57@debian.org>
Closes: 971604 972640
Changes:
qtbase-opensource-src (5.15.1+dfsg-2) unstable; urgency=medium
.
[ Dmitry Shachnev ]
* Backport upstream patch to fix multiscreen-related regression that
affects Plasma.
* Update debian/libqt5core5a.symbols from buildds’ logs.
* Upload to unstable.
.
[ Lisandro Damián Nicanor Pérez Meyer ]
* Apply cross_build_mysql.diff to get closer to cross building on a Debian
environment. Thanks Helmut Grohne for the patch! (Closes: #971604).
* Remove qt5-default. Nowadays it's not needed as Qt 5 is the only Qt version
in Debian and it brought more problems than solutions.
.
[ Helmut Grohne ]
* qmake cross wrapper: Allow passing -qt5. (Closes: #972640)
Checksums-Sha1:
a32adbcc6fd5c162e06b6a2bc2be5848ca2bfbef 5462 qtbase-opensource-src_5.15.1+dfsg-2.dsc
6f1a7a1d48e6966f7fe1c82a3885c75b0e1ee723 256680 qtbase-opensource-src_5.15.1+dfsg-2.debian.tar.xz
313054c7dca4cc311c5b244972275c5ef93bdec7 17749 qtbase-opensource-src_5.15.1+dfsg-2_source.buildinfo
Checksums-Sha256:
2fbd1087f0609dd07e681567c83a44662a73dd73418a1f8d02f9ce48887b4b07 5462 qtbase-opensource-src_5.15.1+dfsg-2.dsc
d7a3828cc912fe7be3d7dfc5876140d82c5b07443c84d4f6f23ef2c5b4c9df91 256680 qtbase-opensource-src_5.15.1+dfsg-2.debian.tar.xz
7ac731e855426273905e63abdd7b74b962167acc91ca04a5f3bd6386802e18f7 17749 qtbase-opensource-src_5.15.1+dfsg-2_source.buildinfo
Files:
e085e77b737bd0bb0bd6bcf4e16ae9dd 5462 libs optional qtbase-opensource-src_5.15.1+dfsg-2.dsc
4b0f9e2ed6c9b33a7c48c6bcfa931353 256680 libs optional qtbase-opensource-src_5.15.1+dfsg-2.debian.tar.xz
ffd8abff8be3ec2115b53a1582b0eb98 17749 libs optional qtbase-opensource-src_5.15.1+dfsg-2_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJHBAEBCgAxFiEE5688gqe4PSusUZcLZkYmW1hrg8sFAl+aijYTHG1pdHlhNTdA
ZGViaWFuLm9yZwAKCRBmRiZbWGuDy9HEEACPiR3k9MtLSilYBnC+iYr5fReHqVm3
3xdTGLCX8Ypnh9/sQr9dYU0frGp2wi3WvR5YeUyAjEJaVFbubmJ4YAiHMAwt/4uB
8OnePDxvyI3ux8BitPI92VsqN0IN+sGPS7ZrcRtFjUqVOufhO0dsWkv95I+gYCH7
b01pYvJXL/xe3E6wDm2bDgGDfxc1o9WUSJ/9ITosiRUHo4++7Qz9YfDOioGhjP/E
sNN++v7isdkWpSDtpGXH7iDKbN8bugMKTpe1gsRlJkCzROxC/kCXKni33ZMw/03r
aGZU2k4BlMuAqVByB/1XZ65a06g+cCLbFSgbJCLc8xaVPqfWaMiJQrRxJLTbsnof
SUtwu/KQ/U5qzEMC0SjdOsO80C+i5nEO0hZi+5GTTt0QWOkDpDRW+wl0h0AbIYCf
H4VzpMIbhjetrCRxpGhs0MQ6dy7RbNOSLzoCif79DgL6bEDa/9VdzyERpgKOdTlF
cBn0JcX2BvFNDkh5t9V+M2AcJT8LYLLL4gYXrJ8+/6GeEiMjmp1c8w6AZDqOSJEf
iFVSDIM9xTp1Vmsk3sZcgHW9oUv3jo1jNKqia1NGtRqfLxQMINqyQLlyEQB3Cl1N
LjaFMdO5aB4Sbxvv66E4rX8ZPY55WKIfw0GmoHsMoQHB9D/mez4frjcLLoB49qO1
A2hHO4euycczsA==
=PL7t
-----END PGP SIGNATURE-----
--- End Message ---