Package: qt5-qmake Version: 5.14.2+dfsg-6 Tags: patch User: debian-cr...@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 <hel...@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
