SHA256
1
0
forked from pool/quassel

- Add patch to fix/disable SSL check in cmakelists.txt:

* quassel-disable-ssl-check.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=32
This commit is contained in:
Tomáš Chvátal 2015-07-03 06:25:51 +00:00 committed by Git OBS Bridge
parent 2b5df4e7cb
commit ccb7453873
3 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,26 @@
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()

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 3 06:25:25 UTC 2015 - tchvatal@suse.com
- Add patch to fix/disable SSL check in cmakelists.txt:
* quassel-disable-ssl-check.patch
-------------------------------------------------------------------
Wed May 6 13:00:35 UTC 2015 - tittiatcoke@gmail.com

View File

@ -29,6 +29,9 @@ 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
BuildRequires: cmake >= 2.8.10
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
@ -154,6 +157,7 @@ This contains common parts shared by %{name} and %{name}-client
%prep
%setup -q
%patch0 -p1
%build
FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')