Merge branch 'master' into experimental.

8 files changed, 66 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index f57c025..b00a316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,26 @@ qtbase-opensource-src (5.9.2+dfsg-1) experimental; urgency=medium
 
  -- Dmitry Shachnev <mitya57@debian.org>  Fri, 06 Oct 2017 23:10:25 +0700
 
+qtbase-opensource-src (5.9.1+dfsg-12) unstable; urgency=medium
+
+  * Use the linux-g++ mkspec on all Linux architectures. We do not need
+    the -m64 compiler flag which linux-g++-64 adds.
+  * Split qmake binary into a new binary package, qt5-qmake-bin.
+    Make the new package Multi-Arch: foreign, to make sure that a proper
+    version of qmake gets installed for cross builds (closes: #876861).
+  * Bump Standards-Version to 4.1.1, no changes needed.
+
+ -- Dmitry Shachnev <mitya57@debian.org>  Wed, 04 Oct 2017 11:41:29 +0700
+
+qtbase-opensource-src (5.9.1+dfsg-11) unstable; urgency=medium
+
+  * Backport upstream patch to fix crash in qglx_findConfig() function
+    (qglxconvenience_nullptr.diff, closes: #841951).
+  * Backport upstream patch to call mysql_library_end() only once when
+    using MariaDB (mariadb_library_end.diff).
+
+ -- Dmitry Shachnev <mitya57@debian.org>  Thu, 28 Sep 2017 00:03:45 +0300
+
 qtbase-opensource-src (5.9.1+dfsg-10) unstable; urgency=medium
 
   [ Dmitry Shachnev ]
diff --git a/debian/control b/debian/control
index 718af69..9f411bc 100644
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,7 @@ Build-Depends: debhelper (>= 9.20160114~),
                zlib1g-dev
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.8.0+dfsg~) <!nodoc>,
                      qttools5-dev-tools (>= 5.8.0~) <!nodoc>
-Standards-Version: 4.1.0
+Standards-Version: 4.1.1
 Homepage: http://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtbase.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtbase.git
@@ -388,11 +388,28 @@ Description: Qt 5 base development programs
  applications, such as moc, qdbuscpp2xml, qdbusxml2cpp, rcc,
  syncqt and uic.
 
+Package: qt5-qmake-bin
+Architecture: any
+Multi-Arch: foreign
+Section: devel
+Depends: ${misc:Depends}
+Breaks: qt5-qmake (<< 5.9.1+dfsg-12~)
+Replaces: qt5-qmake (<< 5.9.1+dfsg-12~)
+Description: Qt 5 qmake Makefile generator tool — binary file
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the binary file for qmake buildsystem. Do not
+ install this package directly, use qt5-qmake instead.
+
 Package: qt5-qmake
 Architecture: any
 Multi-Arch: same
 Section: devel
-Depends: qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}, ${shlibs:Depends}
+Depends: qt5-qmake-bin (= ${binary:Version}),
+         qtchooser (>= 55-gc9562a1-1~),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Qt 5 qmake Makefile generator tool
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/patches/qglxconvenience_nullptr.diff b/debian/patches/qglxconvenience_nullptr.diff
new file mode 100644
index 0000000..9e4588f
--- /dev/null
+++ b/debian/patches/qglxconvenience_nullptr.diff
@@ -0,0 +1,25 @@
+Description: qglxconvenience: avoid null pointer dereference
+Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=3c59065d5cb5f82f
+Last-Update: 2017-09-27
+
+--- a/src/platformsupport/glxconvenience/qglxconvenience.cpp
++++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp
+@@ -164,7 +164,8 @@
+ template <class T>
+ struct QXlibScopedPointerDeleter {
+     static inline void cleanup(T *pointer) {
+-        XFree(pointer);
++        if (pointer)
++            XFree(pointer);
+     }
+ };
+ 
+@@ -202,6 +203,8 @@
+             GLXFBConfig candidate = configs[i];
+ 
+             QXlibPointer<XVisualInfo> visual(glXGetVisualFromFBConfig(display, candidate));
++            if (visual.isNull())
++                continue;
+ 
+             const int actualRed = qPopulationCount(visual->red_mask);
+             const int actualGreen = qPopulationCount(visual->green_mask);
diff --git a/debian/patches/series b/debian/patches/series
index ed90b49..4475651 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 # Backported from upstream.
+qglxconvenience_nullptr.diff
 
 # Debian specific.
 gnukfreebsd.diff
diff --git a/debian/qt5-qmake-bin.install b/debian/qt5-qmake-bin.install
new file mode 100644
index 0000000..9e292b0
--- /dev/null
+++ b/debian/qt5-qmake-bin.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/bin/qmake
diff --git a/debian/qt5-qmake.manpages b/debian/qt5-qmake-bin.manpages
index f1ee8a6..f1ee8a6 100644
--- a/debian/qt5-qmake.manpages
+++ b/debian/qt5-qmake-bin.manpages
diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake.install
index d771d6f..7e73083 100644
--- a/debian/qt5-qmake.install
+++ b/debian/qt5-qmake.install
@@ -1,2 +1 @@
-usr/lib/*/qt5/bin/qmake
 usr/lib/*/qt5/mkspecs/
diff --git a/debian/rules b/debian/rules
index 5bc3797..ae7495b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,13 +44,7 @@ ifeq ($(DEB_HOST_ARCH_CPU),i386)
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64 mips64 mips64el arm64))
 	platform_arg = linux-g++
-  else ifeq ($(DEB_HOST_ARCH_BITS),64)
-	platform_arg = linux-g++-64
-  else
-	platform_arg = linux-g++
-  endif
 else ifeq ($(DEB_HOST_ARCH_OS),hurd)
 	platform_arg = hurd-g++
 else ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)