From 6949971feffe5d919cbb3d138e3186c7921ba6b1 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 27 Sep 2017 23:45:25 +0300 Subject: Start a new changelog entry. --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index c50758c..d9f3365 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +qtbase-opensource-src (5.9.1+dfsg-11) UNRELEASED; urgency=medium + + + -- Debian Qt/KDE Maintainers Wed, 27 Sep 2017 23:45:09 +0300 + qtbase-opensource-src (5.9.1+dfsg-10) unstable; urgency=medium [ Dmitry Shachnev ] -- cgit v1.2.3 From 9a8fe28c22580da8f59a67c962ea4c1dea98dbab Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 27 Sep 2017 23:47:55 +0300 Subject: Backport upstream patch to fix crash in qglx_findConfig() function. Closes: #841951. --- debian/changelog | 3 +++ debian/patches/qglxconvenience_nullptr.diff | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/qglxconvenience_nullptr.diff diff --git a/debian/changelog b/debian/changelog index d9f3365..798d6fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ qtbase-opensource-src (5.9.1+dfsg-11) UNRELEASED; urgency=medium + [ Dmitry Shachnev ] + * Backport upstream patch to fix crash in qglx_findConfig() function + (qglxconvenience_nullptr.diff, closes: #841951). -- Debian Qt/KDE Maintainers Wed, 27 Sep 2017 23:45:09 +0300 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 + struct QXlibScopedPointerDeleter { + static inline void cleanup(T *pointer) { +- XFree(pointer); ++ if (pointer) ++ XFree(pointer); + } + }; + +@@ -202,6 +203,8 @@ + GLXFBConfig candidate = configs[i]; + + QXlibPointer 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 3a414d6..b24bc33 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ # Backported from upstream. fix_atspi_condition.diff +qglxconvenience_nullptr.diff # Debian specific. gnukfreebsd.diff -- cgit v1.2.3 From ceec90b616ab234c78d699dd9f8d369139f3e42a Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 27 Sep 2017 23:55:26 +0300 Subject: Backport upstream patch to call mysql_library_end() only once. --- debian/changelog | 2 ++ debian/patches/mariadb_library_end.diff | 35 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 38 insertions(+) create mode 100644 debian/patches/mariadb_library_end.diff diff --git a/debian/changelog b/debian/changelog index 798d6fa..21ad050 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ qtbase-opensource-src (5.9.1+dfsg-11) UNRELEASED; urgency=medium [ Dmitry Shachnev ] * 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). -- Debian Qt/KDE Maintainers Wed, 27 Sep 2017 23:45:09 +0300 diff --git a/debian/patches/mariadb_library_end.diff b/debian/patches/mariadb_library_end.diff new file mode 100644 index 0000000..2c77d69 --- /dev/null +++ b/debian/patches/mariadb_library_end.diff @@ -0,0 +1,35 @@ +Description: call mysql_library_end() only once when using MariaDB +Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=d25346417238b7dc +Last-Update: 2017-09-27 + +--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp ++++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +@@ -1158,16 +1158,22 @@ + } + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED ++ ++#ifdef MARIADB_BASE_VERSION ++ qAddPostRoutine(mysql_server_end); ++#endif + } + + static void qLibraryEnd() + { +-#ifndef Q_NO_MYSQL_EMBEDDED +-# if MYSQL_VERSION_ID > 40000 +-# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 +- mysql_library_end(); +-# else +- mysql_server_end(); ++#if !defined(MARIADB_BASE_VERSION) ++# if !defined(Q_NO_MYSQL_EMBEDDED) ++# if MYSQL_VERSION_ID > 40000 ++# if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 ++ mysql_library_end(); ++# else ++ mysql_server_end(); ++# endif + # endif + # endif + #endif diff --git a/debian/patches/series b/debian/patches/series index b24bc33..10c00e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ # Backported from upstream. fix_atspi_condition.diff qglxconvenience_nullptr.diff +mariadb_library_end.diff # Debian specific. gnukfreebsd.diff -- cgit v1.2.3 From a4f23c705d14b5818ca2d1bbe91387662076603b Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Thu, 28 Sep 2017 00:04:20 +0300 Subject: Release to unstable. --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21ad050..79fb410 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,11 @@ -qtbase-opensource-src (5.9.1+dfsg-11) UNRELEASED; urgency=medium +qtbase-opensource-src (5.9.1+dfsg-11) unstable; urgency=medium - [ Dmitry Shachnev ] * 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). - -- Debian Qt/KDE Maintainers Wed, 27 Sep 2017 23:45:09 +0300 + -- Dmitry Shachnev Thu, 28 Sep 2017 00:03:45 +0300 qtbase-opensource-src (5.9.1+dfsg-10) unstable; urgency=medium -- cgit v1.2.3 From 27804edaa484d89c1f649a43625ac315de544ce5 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sun, 1 Oct 2017 18:06:10 +0300 Subject: Start a new changelog entry. --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 79fb410..692c01f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +qtbase-opensource-src (5.9.1+dfsg-12) UNRELEASED; urgency=medium + + + -- Debian Qt/KDE Maintainers Sun, 01 Oct 2017 18:05:54 +0300 + qtbase-opensource-src (5.9.1+dfsg-11) unstable; urgency=medium * Backport upstream patch to fix crash in qglx_findConfig() function -- cgit v1.2.3 From 1f0b1d8551bd1dcf6ff315aa34dd33b527493cd3 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sun, 1 Oct 2017 18:13:49 +0300 Subject: Use the linux-g++ mkspec on all Linux architectures. We do not need the -m64 compiler flag which linux-g++-64 adds. --- debian/changelog | 3 +++ debian/rules | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 692c01f..07bb8c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ qtbase-opensource-src (5.9.1+dfsg-12) UNRELEASED; urgency=medium + [ Dmitry Shachnev ] + * Use the linux-g++ mkspec on all Linux architectures. We do not need + the -m64 compiler flag which linux-g++-64 adds. -- Debian Qt/KDE Maintainers Sun, 01 Oct 2017 18:05:54 +0300 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) -- cgit v1.2.3 From 97f8c6ec1373e9abcb21c69d905781a05f433174 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sun, 1 Oct 2017 20:28:43 +0300 Subject: 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. --- debian/changelog | 3 +++ debian/control | 19 ++++++++++++++++++- debian/qt5-qmake-bin.install | 1 + debian/qt5-qmake-bin.manpages | 1 + debian/qt5-qmake.install | 1 - debian/qt5-qmake.manpages | 1 - 6 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 debian/qt5-qmake-bin.install create mode 100644 debian/qt5-qmake-bin.manpages delete mode 100644 debian/qt5-qmake.manpages diff --git a/debian/changelog b/debian/changelog index 07bb8c7..787be17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ qtbase-opensource-src (5.9.1+dfsg-12) UNRELEASED; urgency=medium [ Dmitry Shachnev ] * 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). -- Debian Qt/KDE Maintainers Sun, 01 Oct 2017 18:05:54 +0300 diff --git a/debian/control b/debian/control index fb23d5d..7f90af9 100644 --- a/debian/control +++ b/debian/control @@ -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/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-bin.manpages b/debian/qt5-qmake-bin.manpages new file mode 100644 index 0000000..f1ee8a6 --- /dev/null +++ b/debian/qt5-qmake-bin.manpages @@ -0,0 +1 @@ +debian/manpages/qmake-qt5.1 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/qt5-qmake.manpages b/debian/qt5-qmake.manpages deleted file mode 100644 index f1ee8a6..0000000 --- a/debian/qt5-qmake.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/manpages/qmake-qt5.1 -- cgit v1.2.3 From 78982d39aab3afa67a750d239048dcc4027e22e3 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 4 Oct 2017 11:41:20 +0700 Subject: Bump Standards-Version to 4.1.1, no changes needed. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 787be17..126cd68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ qtbase-opensource-src (5.9.1+dfsg-12) UNRELEASED; urgency=medium * 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. -- Debian Qt/KDE Maintainers Sun, 01 Oct 2017 18:05:54 +0300 diff --git a/debian/control b/debian/control index 7f90af9..4b97471 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~) , qttools5-dev-tools (>= 5.8.0~) -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 -- cgit v1.2.3 From 51c95f043edd3925a61862e7f87d7fd6d4907db4 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 4 Oct 2017 11:41:45 +0700 Subject: Release to unstable. --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 126cd68..ca8404f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -qtbase-opensource-src (5.9.1+dfsg-12) UNRELEASED; urgency=medium +qtbase-opensource-src (5.9.1+dfsg-12) unstable; urgency=medium - [ Dmitry Shachnev ] * 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. @@ -8,7 +7,7 @@ qtbase-opensource-src (5.9.1+dfsg-12) UNRELEASED; urgency=medium version of qmake gets installed for cross builds (closes: #876861). * Bump Standards-Version to 4.1.1, no changes needed. - -- Debian Qt/KDE Maintainers Sun, 01 Oct 2017 18:05:54 +0300 + -- Dmitry Shachnev Wed, 04 Oct 2017 11:41:29 +0700 qtbase-opensource-src (5.9.1+dfsg-11) unstable; urgency=medium -- cgit v1.2.3