Bug#886542: marked as done (<triplet>-qmake -query something is broken)
Your message dated Fri, 19 Jan 2018 15:11:16 +0000
with message-id <E1ecYK4-000IvS-9A@fasolo.debian.org>
and subject line Bug#886542: fixed in qtbase-opensource-src 5.9.2+dfsg-7
has caused the Debian Bug report #886542,
regarding <triplet>-qmake -query something is broken
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 owner@bugs.debian.org
immediately.)
--
886542: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886542
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: qt5-qmake
Version: 5.9.2+dfsg-6
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap
Control: affects -1 + src:qsynth
Running "<triplet>-qmake -query foo" gives an unpleasant error
"***Unknown option -query". It seems that qmake's argument parsing is
position dependent and the insertion of -qtconf breaks the handling.
This issue has been spotted elsewhere already:
https://stackoverflow.com/questions/6592931/building-for-windows-under-linux-using-qt-creator
The easy fix is to special case the -query handling and insert it early.
I checked that doing so still considers the -qtconf and gives query
results for that qt.conf. So this should work.
qsynth still needs to switch to AC_PATH_TOOL to see the issue.
Helmut
diff --minimal -Nru qtbase-opensource-src-5.9.2+dfsg/debian/changelog qtbase-opensource-src-5.9.2+dfsg/debian/changelog
--- qtbase-opensource-src-5.9.2+dfsg/debian/changelog 2017-12-04 13:31:27.000000000 +0100
+++ qtbase-opensource-src-5.9.2+dfsg/debian/changelog 2018-01-07 14:44:24.000000000 +0100
@@ -1,3 +1,10 @@
+qtbase-opensource-src (5.9.2+dfsg-6.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Support <triplet>-qmake -query something. (closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sun, 07 Jan 2018 14:44:24 +0100
+
qtbase-opensource-src (5.9.2+dfsg-6) unstable; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
diff --minimal -Nru qtbase-opensource-src-5.9.2+dfsg/debian/qmake-cross-wrapper qtbase-opensource-src-5.9.2+dfsg/debian/qmake-cross-wrapper
--- qtbase-opensource-src-5.9.2+dfsg/debian/qmake-cross-wrapper 1970-01-01 01:00:00.000000000 +0100
+++ qtbase-opensource-src-5.9.2+dfsg/debian/qmake-cross-wrapper 2018-01-07 14:42:39.000000000 +0100
@@ -0,0 +1,5 @@
+#!/bin/sh
+if test "$#" = 2 -a "x$1" = x-query; then
+ exec /usr/lib/qt5/bin/qmake "$@" -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt5/qt.conf "QMAKE_CC=${CC:-@DEB_HOST_GNU_TYPE@-gcc}" "QMAKCE_CXX=${CXX:-@DEB_HOST_GNU_TYPE@-g++}" "QMAKE_LINK=${CXX:-@DEB_HOST_GNU_TYPE@-g++}" "PKG_CONFIG=@DEB_HOST_GNU_TYPE@-pkg-config"
+fi
+exec /usr/lib/qt5/bin/qmake -qtconf /usr/lib/@DEB_HOST_MULTIARCH@/qt5/qt.conf "QMAKE_CC=${CC:-@DEB_HOST_GNU_TYPE@-gcc}" "QMAKCE_CXX=${CXX:-@DEB_HOST_GNU_TYPE@-g++}" "QMAKE_LINK=${CXX:-@DEB_HOST_GNU_TYPE@-g++}" "PKG_CONFIG=@DEB_HOST_GNU_TYPE@-pkg-config" "$@"
diff --minimal -Nru qtbase-opensource-src-5.9.2+dfsg/debian/rules qtbase-opensource-src-5.9.2+dfsg/debian/rules
--- qtbase-opensource-src-5.9.2+dfsg/debian/rules 2017-12-04 13:31:13.000000000 +0100
+++ qtbase-opensource-src-5.9.2+dfsg/debian/rules 2018-01-07 14:44:18.000000000 +0100
@@ -261,15 +261,9 @@
> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf
mkdir -p debian/tmp/usr/bin
- echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
- echo "exec /usr/lib/qt5/bin/qmake" \
- "-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \
- 'QMAKE_CC=$${CC:-$(DEB_HOST_GNU_TYPE)-gcc}' \
- 'QMAKE_CXX=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
- 'QMAKE_LINK=$${CXX:-$(DEB_HOST_GNU_TYPE)-g++}' \
- "PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config" \
- '"$$@"' \
- >> debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
+ sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+ -e 's/@DEB_HOST_GNU_TYPE@/$(DEB_HOST_GNU_TYPE)/g' \
+ < debian/qmake-cross-wrapper > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
chmod +x debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake
override_dh_auto_install-indep:
--- End Message ---
--- Begin Message ---
Source: qtbase-opensource-src
Source-Version: 5.9.2+dfsg-7
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 886542@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: Fri, 19 Jan 2018 15:19:19 +0300
Source: qtbase-opensource-src
Binary: libqt5core5a libqt5gui5 qt5-gtk-platformtheme libqt5network5 libqt5opengl5 libqt5sql5 libqt5sql5-mysql libqt5sql5-odbc libqt5sql5-psql libqt5sql5-sqlite libqt5sql5-tds libqt5sql5-ibase libqt5xml5 libqt5dbus5 libqt5test5 libqt5concurrent5 libqt5widgets5 libqt5printsupport5 qtbase5-dev qtbase5-private-dev libqt5opengl5-dev qtbase5-dev-tools qt5-qmake-bin qt5-qmake qtbase5-examples qt5-default qtbase5-doc qtbase5-doc-html
Architecture: source
Version: 5.9.2+dfsg-7
Distribution: unstable
Urgency: medium
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Changed-By: Dmitry Shachnev <mitya57@debian.org>
Description:
libqt5concurrent5 - Qt 5 concurrent module
libqt5core5a - Qt 5 core module
libqt5dbus5 - Qt 5 D-Bus module
libqt5gui5 - Qt 5 GUI module
libqt5network5 - Qt 5 network module
libqt5opengl5 - Qt 5 OpenGL module
libqt5opengl5-dev - Qt 5 OpenGL library development files
libqt5printsupport5 - Qt 5 print support module
libqt5sql5 - Qt 5 SQL module
libqt5sql5-ibase - Qt 5 Firebird database driver
libqt5sql5-mysql - Qt 5 MySQL database driver
libqt5sql5-odbc - Qt 5 ODBC database driver
libqt5sql5-psql - Qt 5 PostgreSQL database driver
libqt5sql5-sqlite - Qt 5 SQLite 3 database driver
libqt5sql5-tds - Qt 5 FreeTDS database driver
libqt5test5 - Qt 5 test module
libqt5widgets5 - Qt 5 widgets module
libqt5xml5 - Qt 5 XML module
qt5-default - Qt 5 development defaults package
qt5-gtk-platformtheme - Qt 5 GTK+ 3 platform theme
qt5-qmake - Qt 5 qmake Makefile generator tool
qt5-qmake-bin - Qt 5 qmake Makefile generator tool — binary file
qtbase5-dev - Qt 5 base development files
qtbase5-dev-tools - Qt 5 base development programs
qtbase5-doc - Qt 5 base documentation
qtbase5-doc-html - Qt 5 base HTML documentation
qtbase5-examples - Qt 5 base examples
qtbase5-private-dev - Qt 5 base private development files
Closes: 799824 886437 886542
Changes:
qtbase-opensource-src (5.9.2+dfsg-7) unstable; urgency=medium
.
* Remove qtlogging.ini file, the underlying issue has been fixed, and
it causes too many problems (closes: #886437, LP: #1744260).
* Backport upstream patch to add missing dead key symbols (closes: #799824).
* Make ${DEB_HOST_GNU_TYPE}-qmake script set QMAKE_QMAKE to itself.
This is needed for properly building configuration tests.
* Pass toolchain-related variable assignments as early flags to qmake.
Switch to default mode after passing them.
* Support <triplet>-qmake -query something (closes: #886542). Thanks to
Helmut Grohne.
* Mark qtbase5-examples and qt5-default packages as Multi-Arch: same.
* Bump Standards-Version to 4.1.3, no changes needed.
Checksums-Sha1:
4488b4afabd9ad66b4075f25879fbdd5382cffaa 5037 qtbase-opensource-src_5.9.2+dfsg-7.dsc
08eb0b9e750d54935835a922e4cfd63450311dfe 222200 qtbase-opensource-src_5.9.2+dfsg-7.debian.tar.xz
74ee7603b71bbdff731b66d8cc37d3a2c6eb58f3 9249 qtbase-opensource-src_5.9.2+dfsg-7_source.buildinfo
Checksums-Sha256:
fd19fb56693e91d7c1c26542c53a17cd55e613caba9309d69cad8afe7b5e8b4a 5037 qtbase-opensource-src_5.9.2+dfsg-7.dsc
50cfec8fb60d92e37836f91f3dfb572f128e2bc1d13c5d86690cffbca7a44eb9 222200 qtbase-opensource-src_5.9.2+dfsg-7.debian.tar.xz
9659cbb891b1210515db9b0ac2207c36c25148963c1471f024d91c766b53cc75 9249 qtbase-opensource-src_5.9.2+dfsg-7_source.buildinfo
Files:
4fc8d8f792d90faaed1e02656b01888d 5037 libs optional qtbase-opensource-src_5.9.2+dfsg-7.dsc
7a29316f2274d967e08795da1b849103 222200 libs optional qtbase-opensource-src_5.9.2+dfsg-7.debian.tar.xz
5d0b5384af988235f73e981a6f9d81e0 9249 libs optional qtbase-opensource-src_5.9.2+dfsg-7_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEbEPcK+5mZmLK5jNU1v5xA2P4XdMFAlph4x0ACgkQ1v5xA2P4
XdM+Vg//dXmp5LtHNtFmbExgE1f9NXm00UzSZ59gYDEEzY8q7O6YUTATKulkaHsU
pDR/zdZsNiDINxQa/bRbnFXXTOYq2gFntiNSlAB3wdegEUjXYB52zeTcP12v+nzX
bhbyzz7l7RiHgI5K2buCIpu+9UDUoId/UkG+ySxHiqZkRaUxqDTFfX/m23L2ZzsT
HO6QS37P7Fcr1SG6CvZSjzxvCQUr3FwOHdnOXeaVcTdz3rbntwKzv3gAFBSDIr7C
d0VpHqoayRnx0NwRCOuq6megm9mKOEhcocjY52kM9EQHn5mR1n9guc/U5zNyEz2S
r2zwbosMcoDFxfa8MKBFy9z4qD9KuGriOFGUG6VOYAc5nzz8kf7QVCr7U2pbEV23
jpwCuvQxAbomM3MoUkcB1YiyvjV8YfpEm0ZT4irINVG/S+9kIFlfNQLiWJqNEuh6
gxH5ZMQZHF8ax27YfZno9FK1S4iY1n4CLzSpZWLG+0+R8VNfbOnbj73U6TbEODUy
p2QoPCFj/esTkYmmkMdmhb0IHnHgKCibw+0CJUl/hB+BCXJu7LxOufwHoewUyrQy
0aKc3b0K9WJtrhMJPEx/ExTNCzBbroCHkvLb5wEV1uhWHaptnQiyfryNtswKaQOL
xX4r59kKMZqT+neSWXbPArTifVvJS+o31QXAl6xX3wl8I1yACFI=
=P09/
-----END PGP SIGNATURE-----
--- End Message ---
Reply to: