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

Accepting request 315100 from KDE:Extra

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/315100
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quassel?expand=0&rev=28
This commit is contained in:
Stephan Kulow 2015-07-08 04:59:26 +00:00 committed by Git OBS Bridge
commit 959821b0fb
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

14
quassel.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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
- 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

3
quassel.spec
View File

@ -29,6 +29,8 @@ Source2: sysconfig.%{name}core
Source3: logrotate.%{name}core
Source4: %{name}.SuSEfirewall2
Source5: quassel-rpmlintrc
# 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
@ -154,6 +156,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')