[SCM] qtbase packaging branch, experimental, updated. debian/5.9.2+dfsg-4-3-g274369b
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Mon Nov 27 08:52:05 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=274369b
The following commit has been merged in the experimental branch:
commit 274369b95b657a2a70e896db04bd6903a63d90b5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon Nov 27 11:51:56 2017 +0300
Drop qglxconvenience_nullptr.diff, included upstream.
---
debian/changelog | 1 +
debian/patches/qglxconvenience_nullptr.diff | 25 -------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4b7a305..c8013a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtbase-opensource-src (5.10.0~rc1+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release candidate.
* Update debian/watch to track 5.10 development releases.
+ * Drop qglxconvenience_nullptr.diff, included upstream.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 03 Nov 2017 14:12:28 +0300
diff --git a/debian/patches/qglxconvenience_nullptr.diff b/debian/patches/qglxconvenience_nullptr.diff
deleted file mode 100644
index 9e4588f..0000000
--- a/debian/patches/qglxconvenience_nullptr.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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 4475651..ed90b49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
# Backported from upstream.
-qglxconvenience_nullptr.diff
# Debian specific.
gnukfreebsd.diff
--
qtbase packaging
More information about the pkg-kde-commits
mailing list