Accepting request 546006 from KDE:Qt5

- Update to 5.9.3
  * New bugfix release
  * For more details, see:
    http://code.qt.io/cgit/qt/qtbase.git/tree/dist/changes-5.9.3/?h=v5.9.3
- Drop patches, now upstream:
  * qglxconvenience-avoid-null-pointer-deref.patch

OBS-URL: https://build.opensuse.org/request/show/546006
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=70

libqt5-qtbase.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Nov 25 12:46:32 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 5.9.3
+  * New bugfix release
+  * For more details, see:
+    http://code.qt.io/cgit/qt/qtbase.git/tree/dist/changes-5.9.3/?h=v5.9.3
+- Drop patches, now upstream:
+  * qglxconvenience-avoid-null-pointer-deref.patch
+
 -------------------------------------------------------------------
 Fri Oct 27 18:52:40 UTC 2017 - fabian@ritter-vogt.de
 

libqt5-qtbase.spec

@@ -26,15 +26,15 @@
 %endif
 
 Name:           libqt5-qtbase
-Version:        5.9.2
+Version:        5.9.3
 Release:        0
 Summary:        C++ Program Library, Core Components
 License:        GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
 Group:          System/Libraries
 Url:            https://www.qt.io
 %define base_name libqt5
-%define real_version 5.9.2
-%define so_version 5.9.2
+%define real_version 5.9.3
+%define so_version 5.9.3
 %define tar_version qtbase-opensource-src-%{real_version}
 Source:         https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz
 # to get mtime of file:
@@ -61,8 +61,6 @@ Patch13:       qapplication-emit-palettechanged.patch
 # patches 1000-2000 and above from upstream 5.9 branch #
 # patches 2000-3000 and above from upstream 5.10/dev branch #
 Patch2000:      0001-QSslSocket-OpenSSL-1.1-backend.patch
-# PATCH-FIX-UPSTREAM (https://codereview.qt-project.org/#/c/205268/)
-Patch4000:      qglxconvenience-avoid-null-pointer-deref.patch
 BuildRequires:  alsa-devel
 BuildRequires:  cups-devel
 BuildRequires:  double-conversion-devel
@@ -150,7 +148,6 @@ handling.
 %patch12 -p1
 %patch13 -p1
 %patch2000 -p1
-%patch4000 -p1
 
 # be sure not to use them
 rm -rf src/3rdparty/{libjpeg,freetype,zlib}

qglxconvenience-avoid-null-pointer-deref.patch

@@ -1,33 +0,0 @@
-From 37b279dda0387ad917da586c19c0605c0be10afc Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Tue, 12 Sep 2017 16:18:58 +0200
-Subject: [PATCH] qglxconvenience: Avoid null pointer dereference
-References: boo#1057971, kde#384540
-
-glXGetVisualFromFBConfig according to documentation can return NULL [1].
-This may result in a crash when running Qt applications using ARGB windows
-with XLIB_SKIP_ARGB_VISUALS defined.
-
-[1] https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/glXGetVisualFromFBConfig.xml
-
-Change-Id: Ie076a1e906ed632543bdab03ef365f699533a61a
----
- src/platformsupport/glxconvenience/qglxconvenience.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp
-index 8c26550..46bd579 100644
---- a/src/platformsupport/glxconvenience/qglxconvenience.cpp
-+++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp
-@@ -202,6 +202,8 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format
-             GLXFBConfig candidate = configs[i];
- 
-             QXlibPointer<XVisualInfo> visual(glXGetVisualFromFBConfig(display, candidate));
-+            if (!visual)
-+                continue;
- 
-             const int actualRed = qPopulationCount(visual->red_mask);
-             const int actualGreen = qPopulationCount(visual->green_mask);
--- 
-2.7.4
-

qtbase-opensource-src-5.9.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b
-size 45148744

qtbase-opensource-src-5.9.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e7c44005e7691dc7c85165bd4510282c47f0163521f4973eab71dbdb39a9982
+size 45160080