unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob f825cb77e8cc61a98009f7f0eda6a8e563506045 656 bytes (raw)
name: gnu/packages/patches/quassel-fix-ssl-check.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
 
The check in qglobal.h requires -fPIC (not -fPIE as it
is now). When this check fails SSL is disabled.

This patch comes from upstream master and can be removed when
the next version is packaged.

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


debug log:

solving f825cb77e ...
found f825cb77e in https://yhetil.org/guix-patches/20170721201201.17846-1-ryan.moe@gmail.com/

applying [1/1] https://yhetil.org/guix-patches/20170721201201.17846-1-ryan.moe@gmail.com/
diff --git a/gnu/packages/patches/quassel-fix-ssl-check.patch b/gnu/packages/patches/quassel-fix-ssl-check.patch
new file mode 100644
index 000000000..f825cb77e

Checking patch gnu/packages/patches/quassel-fix-ssl-check.patch...
1:27: new blank line at EOF.
+
Applied patch gnu/packages/patches/quassel-fix-ssl-check.patch cleanly.
warning: 1 line adds whitespace errors.

index at:
100644 f825cb77e8cc61a98009f7f0eda6a8e563506045	gnu/packages/patches/quassel-fix-ssl-check.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).