Attachment 175889 Details for Bug 213581 – Patch using upstream 4768c9e99f99b581d4e32e797db91d0182391696.

[patch] Patch using upstream 4768c9e99f99b581d4e32e797db91d0182391696.

quassel-0.12.4_1.diff (text/plain), 1.39 KB, created by Christian Schwarz on 2016-10-17 23:01:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Schwarz

Created: 2016-10-17 23:01:15 UTC

Size: 1.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 424074)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	quassel
> PORTVERSION=	0.12.4
>+PORTREVISION=	1
> CATEGORIES=	irc
> MASTER_SITES=	http://www.quassel-irc.org/pub/
> 
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(nonexistent)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,13 @@
>+Apply upstream 4768c9e99f99b581d4e32e797db91d0182391696: Fix the SSL check with Qt 5.6 and GCC 5
>+--- CMakeLists.txt.orig	2016-04-24 20:36:58 UTC
>++++ CMakeLists.txt
>+@@ -428,6 +428,9 @@ 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
>
>Property changes on: files/patch-CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 213581: 175889