5.9.2

.gitignore

@@ -1,2 +1,3 @@
 /qtbase-opensource-src-5.9.1.tar.xz
 /0086-Fix-detection-of-AT-SPI.patch
+/qtbase-opensource-src-5.9.2.tar.xz

0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch

@@ -1,32 +0,0 @@
-diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.0502 qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
---- qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.0502	2017-06-28 04:54:29.000000000 -0500
-+++ qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/mysql/qsql_mysql.cpp	2017-09-27 09:40:49.397425236 -0500
-@@ -1158,16 +1158,22 @@ static void qLibraryInit()
-     }
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
-+
-+#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
-+    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) && !defined(MARIADB_VERSION_ID)
-+# 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

qt5-qtbase-5.9.1-firebird.patch

@@ -1,20 +1,9 @@
-diff -up qtbase-opensource-src-5.9.1/config.tests/unix/ibase/ibase.cpp.firebird qtbase-opensource-src-5.9.1/config.tests/unix/ibase/ibase.cpp
+diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
---- qtbase-opensource-src-5.9.1/config.tests/unix/ibase/ibase.cpp.firebird	2017-06-28 04:54:29.000000000 -0500
+index 234f880..d53f035 100644
-+++ qtbase-opensource-src-5.9.1/config.tests/unix/ibase/ibase.cpp	2017-07-16 08:28:47.833992502 -0500
+--- a/src/plugins/sqldrivers/configure.json
-@@ -37,7 +37,7 @@
++++ b/src/plugins/sqldrivers/configure.json
- **
+@@ -54,7 +54,8 @@
- ****************************************************************************/
+             },
- 
--#include <ibase.h>
-+#include <firebird/ibase.h>
- 
- int main(int, char **)
- {
-diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json.firebird qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json
---- qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json.firebird	2017-06-28 04:54:29.000000000 -0500
-+++ qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json	2017-07-16 12:38:43.730108724 -0500
-@@ -50,7 +50,8 @@
-             "test": "unix/ibase",
              "sources": [
                  { "libs": "-lgds32_ms", "condition": "config.win32" },
 -                { "libs": "-lgds", "condition": "!config.win32" }
@@ -23,15 +12,16 @@ diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/configure.json.fireb
              ]
          },
          "mysql": {
-diff -up qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
+diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
---- qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird	2017-06-28 04:54:29.000000000 -0500
+index c7cee41..6a9c56c 100644
-+++ qtbase-opensource-src-5.9.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h	2017-07-16 08:28:47.833992502 -0500
+--- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
++++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
 @@ -52,7 +52,7 @@
  //
- 
+
  #include <QtSql/qsqldriver.h>
 -#include <ibase.h>
 +#include <firebird/ibase.h>
- 
+
  #ifdef QT_PLUGIN
  #define Q_EXPORT_SQLDRIVER_IBASE

qt5-qtbase.spec

@@ -54,8 +54,8 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
-Version: 5.9.1
+Version: 5.9.2
-Release: 9%{?dist}
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -110,9 +110,6 @@ Patch64: qt5-qtbase-5.9.1-firebird.patch
 Patch65: qtbase-opensource-src-5.9.0-mysql.patch
 
 ## upstream patches (5.9 branch)
-Patch486: 0086-Fix-detection-of-AT-SPI.patch
-# refreshed/updated with https://codereview.qt-project.org/#/c/206850/
-Patch902: 0502-Only-call-mysql_library_end-once-when-using-MariaDB.patch
 
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
@@ -353,9 +350,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 %patch65 -p1 -b .mysql
 %endif
 
-%patch486 -p1 -b .0086
-%patch902 -p1 -b .0502
-
 %if 0%{?inject_optflags}
 ## adjust $RPM_OPT_FLAGS
 
@@ -969,6 +963,9 @@ fi
 
 
 %changelog
+* Mon Oct 09 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.2-1
+- 5.9.2
+
 * Wed Sep 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.1-9
 - refresh mariadb patch to actually match cr#206850 logic (#1491316)
 

sources

@@ -1,2 +1 @@
-SHA512 (qtbase-opensource-src-5.9.1.tar.xz) = b384e91b3fd88b2f32e826e3dd1c930213683a0fdbfd284a319204fa8d27c796b54324cf4a715f6bebd92fca6426e37cf0be5866fc1f6053b8758570ddb2fa45
+SHA512 (qtbase-opensource-src-5.9.2.tar.xz) = a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7
-SHA512 (0086-Fix-detection-of-AT-SPI.patch) = f78f481369e4b68400ae122a7cf4d20030ee8ea89ea211f98f5ffa895d449acd9a7207d3b010e927a7a33d644eab90e1d5bb951d71e1a5b1a11f4ac1a0241bce