[SCM] quassel packaging branch, master, updated. debian/1%0.12.4-2-3-geeabafd

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/quassel.git;a=commitdiff;h=eeabafd

The following commit has been merged in the master branch:
commit eeabafd26b27aa1e6c58fd01c468a9d0079e7549
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon Dec 18 23:03:17 2017 +0100

    Fix the OpenSSL detection.
    
    * Fix the OpenSSL detection.
      - Add Fix_the_ssl_check_with_Qt_5.6_and_gcc_5.patch,
        cherry picked from upstream.
---
 debian/changelog                                        |  3 +++
 .../Fix_the_ssl_check_with_Qt_5.6_and_gcc_5.patch       | 17 +++++++++++++++++
 debian/patches/series                                   |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eafbaae..08fbdff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ quassel (1:0.12.4-3) UNRELEASED; urgency=medium
     (Closes: #836142)
   * Provide support for --listen option in the init script and systemd service.
     (Closes: #590645)
+  * Fix the OpenSSL detection.
+    - Add Fix_the_ssl_check_with_Qt_5.6_and_gcc_5.patch,
+      cherry picked from upstream.
 
  -- Felix Geyer <fgeyer at debian.org>  Thu, 20 Oct 2016 20:42:43 +0200
 
diff --git a/debian/patches/Fix_the_ssl_check_with_Qt_5.6_and_gcc_5.patch b/debian/patches/Fix_the_ssl_check_with_Qt_5.6_and_gcc_5.patch
new file mode 100644
index 0000000..4613dd6
--- /dev/null
+++ b/debian/patches/Fix_the_ssl_check_with_Qt_5.6_and_gcc_5.patch
@@ -0,0 +1,17 @@
+Description: Fix the SSL check with Qt 5.6 and GCC 5
+Origin: upstream, https://github.com/quassel/quassel/commit/4768c9e99f99b581d4e32e797db91d0182391696
+
+--- quassel-0.12.4.orig/CMakeLists.txt
++++ quassel-0.12.4/CMakeLists.txt
+@@ -428,6 +428,11 @@ endif()
+ cmake_push_check_state(RESET)
+ set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
++
++if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE)
++    set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING")
++endif()
++
+ check_cxx_source_compiles("
+     #include \"qglobal.h\"
+     #if defined QT_NO_SSL
diff --git a/debian/patches/series b/debian/patches/series
index 019a9dc..71de8a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_default_network_channel.patch
 03_force_icon_theme.patch
+Fix_the_ssl_check_with_Qt_5.6_and_gcc_5.patch

-- 
quassel packaging