diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-04-27 01:14:48 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-04-27 02:56:44 +0200 |
commit | 72dae07296fd6e3db6a77f48a014a80520d6e6d1 (patch) | |
tree | cfa571ba5806b107ff48b847f17730ccd56c1bc0 /gnu/packages/patches | |
parent | 1c51b7b4bc1f5c71b5cbe4ea94f4ea1f96bd9478 (diff) | |
download | guix-72dae07296fd6e3db6a77f48a014a80520d6e6d1.tar.gz |
gnu: quassel: Update to 0.12.5.
* gnu/packages/irc.scm (quassel): Update to 0.12.5. [source]: Remove patch. * gnu/packages/patches/quassel-fix-tls-check.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/quassel-fix-tls-check.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gnu/packages/patches/quassel-fix-tls-check.patch b/gnu/packages/patches/quassel-fix-tls-check.patch deleted file mode 100644 index 057bc02a14..0000000000 --- a/gnu/packages/patches/quassel-fix-tls-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -This allows quasselclient to connect to SSL-enabled quasselcore instances. - -The check in qglobal.h requires -fPIC (not -fPIE as it is now). When this check -fails SSL / TLS is disabled. - -This patch comes from the upstream source repository [0] and can be -removed when the next version is packaged. - -[0] https://github.com/quassel/quassel/commit/4768c9e99f99b581d4e32e797db91d0182391696 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -428,6 +428,11 @@ endif() - cmake_push_check_state(RESET) - set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") -+ -+if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE) -+ set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING") -+endif() -+ - check_cxx_source_compiles(" - #include \"qglobal.h\" - #if defined QT_NO_SSL - |