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

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 9bd092d5dd90b9c2a8754da860caf3974d46e434
Author: Adam Majer <adamm at zombino.com>
Date:   Sat Nov 19 19:45:20 2016 +0100

    Revert "Only look for OpenSSL 1.0.x libraries"
    
    Since OpenSSL defines SHLIB_VERSION_NUMBER during build,
    this is actually not needed, so reverting.
    
    This reverts commit 91f11268bd8215bcdfedd58810ae619d9f59273e.
---
 debian/changelog                  |  3 ---
 debian/patches/openssl_1_0_2.diff | 26 --------------------------
 debian/patches/series             |  1 -
 3 files changed, 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c253c5..146b084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,6 @@ 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
deleted file mode 100644
index 11c69e1..0000000
--- a/debian/patches/openssl_1_0_2.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-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 9c3a65a..22dc365 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@ remove_privacy_breachs.diff
 link_fbclient.diff
 gnukfreebsd_cloexec.diff
 armv4.diff
-openssl_1_0_2.diff

-- 
qtbase packaging