[SCM] qtbase packaging branch, master, updated. debian/5.7.1-20161021+dfsg-5-6-g91f1126

[Adam Majer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=91f1126

The following commit has been merged in the master branch:
commit 91f11268bd8215bcdfedd58810ae619d9f59273e
Author: Adam Majer <adamm at zombino.com>
Date:   Sat Nov 19 16:25:51 2016 +0100

    Only look for OpenSSL 1.0.x libraries
    
    Since this version of Qt is not yet compatible with OpenSSL 1.1.0+
    we add an ugly hack to only look for 1.0.* sonames.
---
 debian/changelog                  |  3 +++
 debian/patches/openssl_1_0_2.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 146b084..9c253c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ qtbase-opensource-src (5.7.1~20161021+dfsg-6) UNRELEASED; urgency=medium
   * Backport upstream patch to fix build on x32 (fix_build_on_x32.diff).
   * Merge some more entries in the update-copyright script.
 
+  [ Adam Majer ]
+  * Only look for OpenSSL 1.0.x libraries (openssl_1_0_2.diff)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 04 Nov 2016 20:29:15 +0300
 
 qtbase-opensource-src (5.7.1~20161021+dfsg-5) unstable; urgency=medium
diff --git a/debian/patches/openssl_1_0_2.diff b/debian/patches/openssl_1_0_2.diff
new file mode 100644
index 0000000..11c69e1
--- /dev/null
+++ b/debian/patches/openssl_1_0_2.diff
@@ -0,0 +1,26 @@
+Author: Adam Majer <adamm at zombino.com>
+Date: Sat Nov 19 16:24:29 CET 2016
+Summary: Qt5 is not yet compatible with OpenSSL 1.1.0+
+ Add an ugly hack to only find OpenSSL 1.0.* libraries
+
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -565,16 +565,16 @@ static QStringList findAllLibs(QLatin1St
+     return found;
+ }
+ 
+ static QStringList findAllLibSsl()
+ {
+-    return findAllLibs(QLatin1String("libssl.*"));
++    return findAllLibs(QLatin1String("libssl.*1.0.*"));
+ }
+ 
+ static QStringList findAllLibCrypto()
+ {
+-    return findAllLibs(QLatin1String("libcrypto.*"));
++    return findAllLibs(QLatin1String("libcrypto.*1.0.*"));
+ }
+ # endif
+ 
+ #ifdef Q_OS_WIN
+ static bool tryToLoadOpenSslWin32Library(QLatin1String ssleay32LibName, QLatin1String libeay32LibName, QPair<QSystemLibrary*, QSystemLibrary*> &pair)
diff --git a/debian/patches/series b/debian/patches/series
index 22dc365..9c3a65a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ remove_privacy_breachs.diff
 link_fbclient.diff
 gnukfreebsd_cloexec.diff
 armv4.diff
+openssl_1_0_2.diff

-- 
qtbase packaging