pool/quassel
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 315088 from home:sumski:branches:KDE:Extra

Browse Source 
- 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
This commit is contained in:
Tomáš Chvátal 2015-07-05 06:31:23 +00:00 committed by Git OBS Bridge
parent e9fde4ef6b
commit e8e3fbb993
4 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
quassel-disable-ssl-check.patch
View File

@ -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()

13
quassel-set-required-libs-and-flags.patch Normal file
View File

@ -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

8
quassel.changes
View File

@ -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 Fri Jul 3 06:25:25 UTC 2015 - tchvatal@suse.com

5
quassel.spec
View File

@ -29,9 +29,8 @@ Source2: sysconfig.%{name}core
Source3: logrotate.%{name}core Source3: logrotate.%{name}core
Source4: %{name}.SuSEfirewall2 Source4: %{name}.SuSEfirewall2
Source5: quassel-rpmlintrc Source5: quassel-rpmlintrc
# PATCH-FIX-SUSE: Workaround -fPIC requirement in configure check by # PATCH-FIX-SUSE: Set the correct libraries and compiler flags in order to use qglobal.h in check_cxx_source_compiles function
# disabling it as we have it always on our distro anyway Patch0: quassel-set-required-libs-and-flags.patch
Patch0: quassel-disable-ssl-check.patch
BuildRequires: cmake >= 2.8.10 BuildRequires: cmake >= 2.8.10
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules
BuildRequires: fdupes BuildRequires: fdupes