[SCM] quassel packaging branch, master, updated. debian/1%0.10.0-2.4-20-gfa6dbfa

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit fa6dbfa0a39ab5a7d1ca0af2844af1e0bcdf52ae
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Sep 6 20:39:08 2015 +0200

    Fix detection of OpenSSL when building against Qt5.
    
    * Fix detection of OpenSSL when building against Qt5.
      - Add 02_set-required-libs-and-flags.patch from openSUSE.
---
 debian/changelog                                    |  2 ++
 debian/patches/02_set-required-libs-and-flags.patch | 14 ++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9d20af7..5ee9727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ quassel (1:0.12.2-1) UNRELEASED; urgency=medium
   * Stop hardcoding the path to deluser / delgroup in postrm.
   * Enable all hardening build flags.
   * Build with -Wl,--as-needed.
+  * Fix detection of OpenSSL when building against Qt5.
+    - Add 02_set-required-libs-and-flags.patch from openSUSE.
 
   [ Scott Kitterman ]
   * Add systemd service file and associated changes for quasselcore.
diff --git a/debian/patches/02_set-required-libs-and-flags.patch b/debian/patches/02_set-required-libs-and-flags.patch
new file mode 100644
index 0000000..19dcb9f
--- /dev/null
+++ b/debian/patches/02_set-required-libs-and-flags.patch
@@ -0,0 +1,14 @@
+Description: Fix detection of OpenSSL when building against Qt5.
+Origin: https://build.opensuse.org/package/view_file/openSUSE:Factory/quassel/quassel-set-required-libs-and-flags.patch?expand=1
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -484,6 +484,8 @@ endif()
+ # a small test program checking the defines. This works for both Qt4 and Qt5.
+ cmake_push_check_state(RESET)
+ set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
++set(CMAKE_REQUIRED_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
++set(CMAKE_REQUIRED_LIBRARIES ${Qt5Core_LIBRARIES})
+ check_cxx_source_compiles("
+     #include \"qglobal.h\"
+     #if defined QT_NO_OPENSSL || defined QT_NO_SSL
diff --git a/debian/patches/series b/debian/patches/series
index 1bcf693..6c62b02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_default_network_channel.patch
+02_set-required-libs-and-flags.patch

-- 
quassel packaging