From e8e3fbb993bb02b54309e6abbb3f44cbfec872a518ab461beffc8eef9bdc9281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 5 Jul 2015 06:31:23 +0000
Subject: [PATCH] Accepting request 315088 from home:sumski:branches:KDE:Extra

- Add quassel-set-required-libs-and-flags.patch: Set the correct
  libraries and compiler flags in order to use qglobal.h in
  check_cxx_source_compiles function
- Drop quassel-disable-ssl-check.patch

OBS-URL: https://build.opensuse.org/request/show/315088
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=33
---
 quassel-disable-ssl-check.patch           | 26 -----------------------
 quassel-set-required-libs-and-flags.patch | 13 ++++++++++++
 quassel.changes                           |  8 +++++++
 quassel.spec                              |  5 ++---
 4 files changed, 23 insertions(+), 29 deletions(-)
 delete mode 100644 quassel-disable-ssl-check.patch
 create mode 100644 quassel-set-required-libs-and-flags.patch

diff --git a/quassel-disable-ssl-check.patch b/quassel-disable-ssl-check.patch
deleted file mode 100644
index 6dd1f2d..0000000
--- a/quassel-disable-ssl-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: quassel-0.12.2/CMakeLists.txt
-===================================================================
---- quassel-0.12.2.orig/CMakeLists.txt
-+++ quassel-0.12.2/CMakeLists.txt
-@@ -479,20 +479,7 @@ if (NOT ZLIB_FOUND)
-     endif()
- endif()
- 
--# Check for SSL support in Qt
--# As there's no easy way to get Qt's configuration in particular for Qt5, let's just compile
--# 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})
--check_cxx_source_compiles("
--    #include \"qglobal.h\"
--    #if defined QT_NO_OPENSSL || defined QT_NO_SSL
--    #  error \"No SSL support\"
--    #endif
--    int main() {}"
--    HAVE_SSL)
--cmake_pop_check_state()
--
-+SET(HAVE_SSL TRUE)
- if (HAVE_SSL)
-     add_definitions(-DHAVE_SSL)
- endif()
diff --git a/quassel-set-required-libs-and-flags.patch b/quassel-set-required-libs-and-flags.patch
new file mode 100644
index 0000000..961eaa3
--- /dev/null
+++ b/quassel-set-required-libs-and-flags.patch
@@ -0,0 +1,13 @@
+Index: quassel-0.12.2/CMakeLists.txt
+===================================================================
+--- quassel-0.12.2.orig/CMakeLists.txt
++++ quassel-0.12.2/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/quassel.changes b/quassel.changes
index b9239b3..fab5680 100644
--- a/quassel.changes
+++ b/quassel.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Jul  4 21:46:31 UTC 2015 - hrvoje.senjan@gmail.com
+
+- Add quassel-set-required-libs-and-flags.patch: Set the correct
+  libraries and compiler flags in order to use qglobal.h in
+  check_cxx_source_compiles function
+- Drop quassel-disable-ssl-check.patch
+
 -------------------------------------------------------------------
 Fri Jul  3 06:25:25 UTC 2015 - tchvatal@suse.com
 
diff --git a/quassel.spec b/quassel.spec
index 9bf0c54..05573ab 100644
--- a/quassel.spec
+++ b/quassel.spec
@@ -29,9 +29,8 @@ Source2:        sysconfig.%{name}core
 Source3:        logrotate.%{name}core
 Source4:        %{name}.SuSEfirewall2
 Source5:        quassel-rpmlintrc
-# PATCH-FIX-SUSE: Workaround -fPIC requirement in configure check by
-#                 disabling it as we have it always on our distro anyway
-Patch0:         quassel-disable-ssl-check.patch
+# PATCH-FIX-SUSE: Set the correct libraries and compiler flags in order to use qglobal.h in check_cxx_source_compiles function
+Patch0:         quassel-set-required-libs-and-flags.patch
 BuildRequires:  cmake >= 2.8.10
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes