Accepting request 533833 from KDE:Qt5

Qt 5.9.2 OBS-URL: https://build.opensuse.org/request/show/533833 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=68
2017-10-23 14:20:42 +00:00 · 2017-10-23 14:20:42 +00:00 · 8a9085de1b
commit 8a9085de1b
parent e2a77d236b
11 changed files with 86 additions and 288 deletions
--- a/0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch
+++ b/0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch
@ -1,41 +0,0 @@
-From f7aaff01de9d5555e333cedcbbc07236cd653d0a Mon Sep 17 00:00:00 2001
-From: David Faure <david.faure@kdab.com>
-Date: Sun, 2 Jul 2017 18:10:39 +0200
-Subject: [PATCH] Fix Qt5DBusMacros.cmake for CMake 3.9
-
-CMake gained support for running AUTOMOC on generated headers,
-so we need to mark them with SKIP_AUTOMOC since we're generating
-moc files for those already. Otherwise we get duplicated symbols.
-
-Change-Id: Iabd387832cfc74809fc5e6ff4782f4fc83cc07d8
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Rolf Eike Beer <eb@emlix.com>
-Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
-Reviewed-by: Stephen Kelly <steveire@gmail.com>
---
- src/dbus/Qt5DBusMacros.cmake | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/dbus/Qt5DBusMacros.cmake b/src/dbus/Qt5DBusMacros.cmake
-index ef3eb73276..0bd7364637 100644
--- a/src/dbus/Qt5DBusMacros.cmake
-+++ b/src/dbus/Qt5DBusMacros.cmake
-@@ -62,6 +62,7 @@ function(QT5_ADD_DBUS_INTERFACE _sources _interface _basename)
-         DEPENDS ${_infile} VERBATIM)
- 
-     set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE)
-+    set_source_files_properties("${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
- 
-     qt5_generate_moc("${_header}" "${_moc}")
- 
-@@ -147,6 +148,7 @@ function(QT5_ADD_DBUS_ADAPTOR _sources _xml_file _include _parentClass) # _optio
- 
-     qt5_generate_moc("${_header}" "${_moc}")
-     set_source_files_properties("${_impl}" PROPERTIES SKIP_AUTOMOC TRUE)
-+    set_source_files_properties("${_header}" PROPERTIES SKIP_AUTOMOC TRUE)
-     macro_add_file_dependencies("${_impl}" "${_moc}")
- 
-     list(APPEND ${_sources} "${_impl}" "${_header}" "${_moc}")
-- 
-2.14.1
-
--- a/0001-Fix-at-spi2-build.patch
+++ b/0001-Fix-at-spi2-build.patch
@ -1,26 +0,0 @@
-From 54325809cc8e5e6939649f6c6f43fe13de0e0470 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sat, 1 Jul 2017 13:52:32 +0200
-Subject: [PATCH] Fix at-spi2 build
-
- Condition is wrong, always resulting in "Note: Disabling Linux Accessibility Bridge: D-Bus is missing."
---
- src/gui/configure.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 2fb03a452a..957316a51c 100644
--- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -434,7 +434,7 @@
-     "features": {
-         "accessibility-atspi-bridge": {
-             "label": "ATSPI Bridge",
-            "condition": "features.accessibility && features.xcb && features.dbus && config.atspi",
-+            "condition": "features.accessibility && features.xcb && features.dbus && libs.atspi",
-             "output": [ "privateFeature", "feature" ]
-         },
-         "angle": {
-- 
-2.13.0
-
--- a/0001-Fix-open-chmod-race-condition-in-QSaveFile.patch
+++ b/0001-Fix-open-chmod-race-condition-in-QSaveFile.patch
@ -1,30 +0,0 @@
-From e840a7ed21bc8e93e2e87fec25dd98aa0039fca1 Mon Sep 17 00:00:00 2001
-From: Antonio Larrosa <larrosa@kde.org>
-Date: Tue, 18 Apr 2017 17:56:35 +0200
-Subject: [PATCH] Fix open/chmod race condition in QSaveFile
-
-This fixes a problem introduced in a60571b3700e80f44705ebc4bab9628cf852891c
-by which a temporary file could be created with mode 0666 (0644 after
-applying umask), and then changed to 0600, but in the meantime it would
-be possible for anyone to get a working file descriptor that could be used
-to read the file. See https://bugzilla.suse.com/show_bug.cgi?id=1034005.
-
-Change-Id: I824025f54d6faf853da88e4dfcb092b577b4df04
---
- src/corelib/io/qsavefile.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: qtbase-opensource-src-5.9.1/src/corelib/io/qsavefile.cpp
-===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/corelib/io/qsavefile.cpp
-+++ qtbase-opensource-src-5.9.1/src/corelib/io/qsavefile.cpp
-@@ -232,7 +232,8 @@ bool QSaveFile::open(OpenMode mode)
-     }
- 
-     d->fileEngine = new QTemporaryFileEngine;
-    static_cast<QTemporaryFileEngine *>(d->fileEngine)->initialize(d->finalFileName, 0666);
-+    int perm = (existingFile.exists() ? 0600 : 0666);
-+    static_cast<QTemporaryFileEngine *>(d->fileEngine)->initialize(d->finalFileName, perm);
-     // Same as in QFile: QIODevice provides the buffering, so there's no need to request it from the file engine.
-     if (!d->fileEngine->open(mode | QIODevice::Unbuffered)) {
-         QFileDevice::FileError err = d->fileEngine->error();
--- a/0001-QSslSocket-OpenSSL-1.1-backend.patch
+++ b/0001-QSslSocket-OpenSSL-1.1-backend.patch
@ -73,10 +73,10 @@ Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
 create mode 100644 src/network/ssl/qsslsocket_opensslpre11.cpp
 create mode 100644 src/network/ssl/qsslsocket_opensslpre11_symbols_p.h

-Index: qtbase-opensource-src-5.9.1/config.tests/unix/openssl11/openssl.cpp
+Index: qtbase-opensource-src-5.9.2/config.tests/unix/openssl11/openssl.cpp
 ===================================================================
 --- /dev/null
-+++ qtbase-opensource-src-5.9.1/config.tests/unix/openssl11/openssl.cpp
+++ qtbase-opensource-src-5.9.2/config.tests/unix/openssl11/openssl.cpp
@@ -0,0 +1,48 @@
 +/****************************************************************************
 +**
@ -126,20 +126,20 @@ Index: qtbase-opensource-src-5.9.1/config.tests/unix/openssl11/openssl.cpp
 +int main()
 +{
 +}
-Index: qtbase-opensource-src-5.9.1/config.tests/unix/openssl11/openssl.pro
+Index: qtbase-opensource-src-5.9.2/config.tests/unix/openssl11/openssl.pro
 ===================================================================
 --- /dev/null
-+++ qtbase-opensource-src-5.9.1/config.tests/unix/openssl11/openssl.pro
+++ qtbase-opensource-src-5.9.2/config.tests/unix/openssl11/openssl.pro
@@ -0,0 +1,2 @@
 +SOURCES = openssl.cpp
 +CONFIG -= x11 qt
-Index: qtbase-opensource-src-5.9.1/src/network/configure.json
+Index: qtbase-opensource-src-5.9.2/src/network/configure.json
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/configure.json
-+++ qtbase-opensource-src-5.9.1/src/network/configure.json
-@@ -105,6 +105,12 @@
-             "type": "compile",
-             "test": "unix/sctp",
+--- qtbase-opensource-src-5.9.2.orig/src/network/configure.json
+++ qtbase-opensource-src-5.9.2/src/network/configure.json
+@@ -154,6 +154,12 @@
+                 ]
+             },
             "use": "network"
 +        },
 +        "openssl11": {
@ -150,7 +150,7 @@ Index: qtbase-opensource-src-5.9.1/src/network/configure.json
         }
     },
 
-@@ -172,6 +178,11 @@
+@@ -221,6 +227,11 @@
             "condition": "config.winrt || features.securetransport || features.openssl",
             "output": [ "publicFeature", "feature" ]
         },
@ -162,10 +162,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/configure.json
         "sctp": {
             "label": "SCTP",
             "autoDetect": false,
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslcertificate_openssl.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslcertificate_openssl.cpp
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslcertificate_openssl.cpp
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qsslcertificate_openssl.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslcertificate_openssl.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
@ -320,10 +320,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslcertificate_openssl.cpp
     certificate.d->notValidBefore = q_getTimeFromASN1(nbef);
     certificate.d->notValidAfter = q_getTimeFromASN1(naft);
     certificate.d->null = false;
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslcontext_openssl.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslcontext_openssl.cpp
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslcontext_openssl.cpp
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qsslcontext_openssl.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslcontext_openssl.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
@ -675,10 +675,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslcontext_openssl.cpp
         }
     }
 
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslcontext_openssl11.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslcontext_openssl11.cpp
 ===================================================================
 --- /dev/null
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslcontext_openssl11.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslcontext_openssl11.cpp
@@ -0,0 +1,277 @@
 +/****************************************************************************
 +**
@ -957,10 +957,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslcontext_openssl11.cpp
 +}
 +
 +QT_END_NAMESPACE
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslcontext_opensslpre11.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslcontext_opensslpre11.cpp
 ===================================================================
 --- /dev/null
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslcontext_opensslpre11.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslcontext_opensslpre11.cpp
@@ -0,0 +1,354 @@
 +/****************************************************************************
 +**
@ -1316,10 +1316,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslcontext_opensslpre11.cpp
 +}
 +
 +QT_END_NAMESPACE
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qssldiffiehellmanparameters_openssl.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
@ -1392,10 +1392,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qssldiffiehellmanparameters_o
 
     bad |= DH_CHECK_P_NOT_PRIME;
     bad |= DH_CHECK_P_NOT_SAFE_PRIME;
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslellipticcurve.h
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslellipticcurve.h
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qsslellipticcurve.h
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslellipticcurve.h
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qsslellipticcurve.h
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslellipticcurve.h
@@ -80,6 +80,7 @@ private:
     friend Q_DECL_CONSTEXPR bool operator==(QSslEllipticCurve lhs, QSslEllipticCurve rhs) Q_DECL_NOTHROW;
     friend Q_DECL_CONSTEXPR uint qHash(QSslEllipticCurve curve, uint seed) Q_DECL_NOTHROW;
@ -1404,10 +1404,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslellipticcurve.h
     friend class QSslSocketPrivate;
     friend class QSslSocketBackendPrivate;
 };
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslellipticcurve_openssl.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslellipticcurve_openssl.cpp
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qsslellipticcurve_openssl.cpp
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslellipticcurve_openssl.cpp
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qsslellipticcurve_openssl.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslellipticcurve_openssl.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
@ -1438,10 +1438,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslellipticcurve_openssl.cpp
 
     return result;
 }
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslkey_openssl.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslkey_openssl.cpp
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslkey_openssl.cpp
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qsslkey_openssl.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslkey_openssl.cpp
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
@ -1451,52 +1451,7 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslkey_openssl.cpp
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtNetwork module of the Qt Toolkit.
-@@ -84,33 +85,30 @@ void QSslKeyPrivate::clear(bool deep)
- 
- bool QSslKeyPrivate::fromEVP_PKEY(EVP_PKEY *pkey)
- {
-    if (pkey->type == EVP_PKEY_RSA) {
-+#if QT_CONFIG(opensslv11)
-+    const int keyType = q_EVP_PKEY_type(q_EVP_PKEY_base_id(pkey));
-+#else
-+    const int keyType = pkey->type;
-+#endif
-+    if (keyType == EVP_PKEY_RSA) {
-         isNull = false;
-         algorithm = QSsl::Rsa;
-         type = QSsl::PrivateKey;
-
-        rsa = q_RSA_new();
-        memcpy(rsa, q_EVP_PKEY_get1_RSA(pkey), sizeof(RSA));
-
-+        rsa = q_EVP_PKEY_get1_RSA(pkey);
-         return true;
-    }
-    else if (pkey->type == EVP_PKEY_DSA) {
-+    } else if (keyType == EVP_PKEY_DSA) {
-         isNull = false;
-         algorithm = QSsl::Dsa;
-         type = QSsl::PrivateKey;
-
-        dsa = q_DSA_new();
-        memcpy(dsa, q_EVP_PKEY_get1_DSA(pkey), sizeof(DSA));
-
-+        dsa = q_EVP_PKEY_get1_DSA(pkey);
-         return true;
-     }
- #ifndef OPENSSL_NO_EC
-    else if (pkey->type == EVP_PKEY_EC) {
-+    else if (keyType == EVP_PKEY_EC) {
-         isNull = false;
-         algorithm = QSsl::Ec;
-         type = QSsl::PrivateKey;
-        ec = q_EC_KEY_dup(q_EVP_PKEY_get1_EC_KEY(pkey));
-
-+        ec = q_EVP_PKEY_get1_EC_KEY(pkey);
-         return true;
-     }
- #endif
-@@ -178,8 +176,8 @@ int QSslKeyPrivate::length() const
+@@ -181,8 +182,8 @@ int QSslKeyPrivate::length() const
         return -1;
 
     switch (algorithm) {
@ -1507,7 +1462,7 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslkey_openssl.cpp
 #ifndef OPENSSL_NO_EC
         case QSsl::Ec: return q_EC_GROUP_get_degree(q_EC_KEY_get0_group(ec));
 #endif
-@@ -273,7 +271,13 @@ Qt::HANDLE QSslKeyPrivate::handle() cons
+@@ -276,7 +277,13 @@ Qt::HANDLE QSslKeyPrivate::handle() cons
 
 static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv, int enc)
 {
@ -1522,7 +1477,7 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslkey_openssl.cpp
     const EVP_CIPHER* type = 0;
     int i = 0, len = 0;
 
-@@ -291,21 +295,44 @@ static QByteArray doCrypt(QSslKeyPrivate
+@@ -294,21 +301,44 @@ static QByteArray doCrypt(QSslKeyPrivate
 
     QByteArray output;
     output.resize(data.size() + EVP_MAX_BLOCK_LENGTH);
@ -1575,10 +1530,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslkey_openssl.cpp
 
     return output.left(len);
 }
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl.cpp
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl.cpp
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qsslsocket_openssl.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
@ -2114,10 +2069,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl.cpp
     q_X509_free(x509);
     q_EVP_PKEY_free(pkey);
     q_PKCS12_free(p12);
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl11.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl11.cpp
 ===================================================================
 --- /dev/null
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl11.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl11.cpp
@@ -0,0 +1,285 @@
 +/****************************************************************************
 +**
@ -2404,10 +2359,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl11.cpp
 +}
 +
 +QT_END_NAMESPACE
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl11_symbols_p.h
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl11_symbols_p.h
 ===================================================================
 --- /dev/null
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl11_symbols_p.h
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl11_symbols_p.h
@@ -0,0 +1,132 @@
 +/****************************************************************************
 +**
@ -2541,10 +2496,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl11_symbols_
 +unsigned long q_SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *session);
 +
 +#endif
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl_p.h
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl_p.h
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qsslsocket_openssl_p.h
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl_p.h
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qsslsocket_openssl_p.h
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
@ -2573,10 +2528,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl_p.h
     static QList<QSslCertificate> STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509);
     static QList<QSslError> verify(const QList<QSslCertificate> &certificateChain, const QString &hostName);
     static QString getErrorsFromOpenSsl();
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl_symbols.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl_symbols.cpp
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl_symbols.cpp
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -1,7 +1,8 @@
 /****************************************************************************
 **
@ -3302,10 +3257,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl_symbols.cp
     return true;
 }
 #endif // QT_CONFIG(library)
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl_symbols_p.h
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl_symbols_p.h
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl_symbols_p.h
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
@ -3557,10 +3512,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_openssl_symbols_p.
 int q_i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
 SSL_SESSION *q_d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length);
 
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_opensslpre11.cpp
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_opensslpre11.cpp
 ===================================================================
 --- /dev/null
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_opensslpre11.cpp
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_opensslpre11.cpp
@@ -0,0 +1,424 @@
 +/****************************************************************************
 +**
@ -3986,10 +3941,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_opensslpre11.cpp
 +}
 +
 +QT_END_NAMESPACE
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
 ===================================================================
 --- /dev/null
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
+++ qtbase-opensource-src-5.9.2/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
@@ -0,0 +1,230 @@
 +/****************************************************************************
 +**
@ -4221,10 +4176,10 @@ Index: qtbase-opensource-src-5.9.1/src/network/ssl/qsslsocket_opensslpre11_symbo
 +
 +
 +#endif // QSSLSOCKET_OPENSSL_PRE11_SYMBOLS_P_H
-Index: qtbase-opensource-src-5.9.1/src/network/ssl/ssl.pri
+Index: qtbase-opensource-src-5.9.2/src/network/ssl/ssl.pri
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/network/ssl/ssl.pri
-+++ qtbase-opensource-src-5.9.1/src/network/ssl/ssl.pri
+--- qtbase-opensource-src-5.9.2.orig/src/network/ssl/ssl.pri
+++ qtbase-opensource-src-5.9.2/src/network/ssl/ssl.pri
@@ -60,13 +60,25 @@ qtConfig(ssl) {
         HEADERS += ssl/qsslcontext_openssl_p.h \
                    ssl/qsslsocket_openssl_p.h \
--- a/de63bbd2f806b0219a60775017899cedb121581f.patch
+++ b/de63bbd2f806b0219a60775017899cedb121581f.patch
@ -1,36 +0,0 @@
-From de63bbd2f806b0219a60775017899cedb121581f Mon Sep 17 00:00:00 2001
-From: Alexander Volkov <a.volkov@rusbitech.ru>
-Date: Wed, 9 Nov 2016 17:33:00 +0300
-Subject: [PATCH] Add QPlatformTheme::standardButtonShortcut()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It allows to set shortcuts for the standard buttons in
-QDialogButtonBox.
-
-Restore Qt4's behavior for the "Don't Save" button on macOS
-by setting a shortcut for it (it was Cmd-D before Lion,
-now it's Cmd-Delete).
-
-Change-Id: I6b56f68f37670962178693a8983d9fe550540856
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
- src/widgets/widgets/qdialogbuttonbox.cpp   |  7 +------
- 5 files changed, 22 insertions(+), 6 deletions(-)
-
-Index: qtbase-opensource-src-5.9.0/src/widgets/widgets/qdialogbuttonbox.cpp
-===================================================================
--- qtbase-opensource-src-5.9.0.orig/src/widgets/widgets/qdialogbuttonbox.cpp
-+++ qtbase-opensource-src-5.9.0/src/widgets/widgets/qdialogbuttonbox.cpp
-@@ -410,9 +410,7 @@ QPushButton *QDialogButtonBoxPrivate::cr
-         qWarning("QDialogButtonBox::createButton: Invalid ButtonRole, button not added");
-     else
-         addButton(button, static_cast<QDialogButtonBox::ButtonRole>(role), doLayout);
-#if QT_CONFIG(shortcut)
-    button->setShortcut(QGuiApplicationPrivate::platformTheme()->standardButtonShortcut(sbutton));
-#endif
-+
-     return button;
- }
- 
--- a/dont-abort-missing-display.patch
+++ b/dont-abort-missing-display.patch
@ -1,22 +0,0 @@
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Subject: Do not abort if no $DISPLAY available
-
-This is annoying and also generates coredumps for no reason.
-
-Index: qtbase-opensource-src-5.9.1/src/plugins/platforms/xcb/qxcbconnection.cpp
-===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/plugins/platforms/xcb/qxcbconnection.cpp
-+++ qtbase-opensource-src-5.9.1/src/plugins/platforms/xcb/qxcbconnection.cpp
-@@ -571,8 +571,10 @@ QXcbConnection::QXcbConnection(QXcbNativ
-     m_connection = xcb_connect(m_displayName.constData(), &m_primaryScreenNumber);
- #endif //XCB_USE_XLIB
- 
-    if (Q_UNLIKELY(!m_connection || xcb_connection_has_error(m_connection)))
-        qFatal("QXcbConnection: Could not connect to display %s", m_displayName.constData());
-+    if (Q_UNLIKELY(!m_connection || xcb_connection_has_error(m_connection))) {
-+        qCritical("QXcbConnection: Could not connect to display %s", m_displayName.constData());
-+        exit(1);
-+    }
- 
- 
-     m_reader = new QXcbEventReader(this);
--- a/libqt5-prioritise-gtk2-platformtheme.patch
+++ b/libqt5-prioritise-gtk2-platformtheme.patch
@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.9.1/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+Index: qtbase-opensource-src-5.9.2/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
 ===================================================================
--- qtbase-opensource-src-5.9.1.orig/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
-+++ qtbase-opensource-src-5.9.1/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
-@@ -828,7 +828,9 @@ QStringList QGenericUnixTheme::themeName
+--- qtbase-opensource-src-5.9.2.orig/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+++ qtbase-opensource-src-5.9.2/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+@@ -859,7 +859,9 @@ QStringList QGenericUnixTheme::themeName
                 result.push_back(QLatin1String(QKdeTheme::name));
 #endif
             } else if (gtkBasedEnvironments.contains(desktopName)) {
--- a/libqt5-qtbase.changes
+++ b/libqt5-qtbase.changes
@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Oct  8 13:54:30 UTC 2017 - lbeltrame@kde.org
+
+- Update to 5.9.2
+  * For more details please see:
+  https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/
+- Drop patches, now upstream:
+  * 0001-Fix-open-chmod-race-condition-in-QSaveFile.patch
+  * de63bbd2f806b0219a60775017899cedb121581f.patch
+  * 0001-Fix-at-spi2-build.patch
+  * 0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch
+  * dont-abort-missing-display.patch
+
 -------------------------------------------------------------------
 Fri Sep 29 15:16:44 UTC 2017 - jengelh@inai.de

--- a/libqt5-qtbase.spec
+++ b/libqt5-qtbase.spec
@ -26,15 +26,15 @@
 %endif

 Name:           libqt5-qtbase
-Version:        5.9.1
+Version:        5.9.2
 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.1
-%define so_version 5.9.1
+%define real_version 5.9.2
+%define so_version 5.9.2
 %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:
@ -52,23 +52,13 @@ Patch6:         disable-rc4-ciphers-bnc865241.diff
 Patch8:         tell-the-truth-about-private-api.patch
 # PATCH-FIX-OPENSUSE libqt5-prioritise-gtk2-platformtheme.patch boo#1002900 -- Give Gtk2 Platform Theme (from qtstyleplugins) a priority over Gtk3 PT which currently lacks QGtk3Style.
 Patch10:        libqt5-prioritise-gtk2-platformtheme.patch
-# PATCH-FIX-OPENSUSE de63bbd2f806b0219a60775017899cedb121581f.patch -- Revert upstream commit to workaround QTBUG-61197
-Patch11:        de63bbd2f806b0219a60775017899cedb121581f.patch
 # PATCH-FEATURE-OPENSUSE 0001-Add-remote-print-queue-support.patch fate#322052 -- Automatically recognize and allow printing to remote cups servers
-Patch12:        0001-Add-remote-print-queue-support.patch
-# PATCH-FIX-UPSTREAM 0001-Fix-open-chmod-race-condition-in-QSaveFile.patch bsc#1034005 -- Fix a open file/change permission race condition in QSaveFile
-Patch13:        0001-Fix-open-chmod-race-condition-in-QSaveFile.patch
-# PATCH-FIX-OPENSUSE (?)
-Patch14:        0001-Fix-at-spi2-build.patch
+Patch11:        0001-Add-remote-print-queue-support.patch
 # PATCH-FIX-OPENSUSE
-Patch15:        force-cmake-private-headers.patch
-# PATCH-FIX-OPENSUSE
-Patch16:       dont-abort-missing-display.patch
+Patch12:        force-cmake-private-headers.patch
 # PATCH-FIX-UPSTREAM
-Patch17:       qapplication-emit-palettechanged.patch
+Patch13:       qapplication-emit-palettechanged.patch
 # patches 1000-2000 and above from upstream 5.9 branch #
-# PATCH-FIX-UPSTREAM 0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch -- Skip automoc for generated headers
-Patch1000:      0001-Fix-Qt5DBusMacros.cmake-for-CMake-3.9.patch
 # 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/)
@ -159,11 +149,6 @@ handling.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch1000 -p1
 %patch2000 -p1
 %patch4000 -p1

@ -918,7 +903,7 @@ find %{buildroot}%{libqt5_libdir}/ -name 'lib*.a' -exec chmod -x -- {} +
 rm -fv %{buildroot}%{libqt5_libdir}/lib*.la
 rm -fv %{buildroot}%{libqt5_libdir}/*png.*

-# 
+#
 rm -fv %{buildroot}%{libqt5_libdir}/cmake/Qt5*/Q*Plugin.cmake

 mkdir -p %{buildroot}%{libqt5_plugindir}/sqldrivers
--- a/qtbase-opensource-src-5.9.1.tar.xz
+++ b/qtbase-opensource-src-5.9.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6
-size 45350452
--- a/qtbase-opensource-src-5.9.2.tar.xz
+++ b/qtbase-opensource-src-5.9.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b
+size 45148744