Qt 5.15.0 Beta 3

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/libqt5-qtbase?expand=0&rev=5

0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch

@@ -0,0 +1,44 @@
+From 5fbcd6b8f1635916c0a2669649d3c96312b54288 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 14 Apr 2020 11:33:23 +0200
+Subject: [PATCH] Lower required version of OpenSSL to 1.1.0
+
+SLE 15 until SP2 (so Leap < 15.2) ships 1.1.0 which won't get upgraded.
+---
+ src/network/configure.json             | 4 ++--
+ src/network/ssl/qsslsocket_openssl.cpp | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/network/configure.json b/src/network/configure.json
+index 289d84fbb4..c414e729d7 100644
+--- a/src/network/configure.json
++++ b/src/network/configure.json
+@@ -61,8 +61,8 @@
+             "export": "openssl",
+             "test": {
+                 "tail": [
+-                    "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10101000L",
+-                    "#  error OpenSSL >= 1.1.1 is required",
++                    "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L",
++                    "#  error OpenSSL >= 1.1.0 is required",
+                     "#endif",
+                     "#if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)",
+                     "#  error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it's libressl which is unsupported",
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
+index 9b28d52e21..daddea1feb 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
++++ b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -1943,8 +1943,8 @@ bool QSslSocketPrivate::ensureLibraryLoaded()
+         if (q_OPENSSL_init_ssl(0, nullptr) != 1)
+             return false;
+ 
+-        if (q_OpenSSL_version_num() < 0x10101000L) {
+-            qCWarning(lcSsl, "QSslSocket: OpenSSL >= 1.1.1 is required; %s was found instead", q_OpenSSL_version(OPENSSL_VERSION));
++        if (q_OpenSSL_version_num() < 0x10100000L) {
++            qCWarning(lcSsl, "QSslSocket: OpenSSL >= 1.1.0 is required; %s was found instead", q_OpenSSL_version(OPENSSL_VERSION));
+             return false;
+         }
+ 
+-- 
+2.25.1
+

libqt5-qtbase.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Apr 14 06:47:19 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.15.0-beta3:
+  * New bugfix release
+  * No changelog available
+- Add patch to fix build on Leap 15.1:
+  * 0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch
+
 -------------------------------------------------------------------
 Tue Mar 24 12:13:29 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
 

libqt5-qtbase.spec

@@ -36,16 +36,16 @@
 %endif
 
 Name:           libqt5-qtbase
-Version:        5.15.0~beta2
+Version:        5.15.0~beta3
 Release:        0
 Summary:        C++ Program Library, Core Components
 License:        LGPL-3.0-only or GPL-3.0-with-Qt-Company-Qt-exception-1.1
 Group:          System/Libraries
 Url:            https://www.qt.io
 %define base_name libqt5
-%define real_version 5.15.0-beta2
+%define real_version 5.15.0-beta3
 %define so_version 5.15.0
-%define tar_version qtbase-everywhere-src-5.15.0-beta2
+%define tar_version qtbase-everywhere-src-5.15.0-beta3
 Source:         https://download.qt.io/development_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
 # to get mtime of file:
 Source1:        libqt5-qtbase.changes
@@ -53,6 +53,7 @@ Source2:        macros.qt5
 Source3:        baselibs.conf
 Source99:       libqt5-qtbase-rpmlintrc
 # patches 0-1000 are openSUSE and/or non-upstream(able) patches #
+Patch1:         0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch
 # PATCH-FIX-OPENSUSE disable-rc4-ciphers-bnc865241.diff bnc#865241-- Exclude rc4 ciphers from being used by default
 Patch6:         disable-rc4-ciphers-bnc865241.diff
 Patch8:         tell-the-truth-about-private-api.patch

qtbase-everywhere-src-5.15.0-beta2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b07983d9b8ae611bbb65388beea0629990080b99813788e4e7db56cb7897677
-size 49887468

qtbase-everywhere-src-5.15.0-beta3.tar.xz

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