Date: Thu, 27 Oct 2016 22:58:56 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r424795 - in branches/2016Q4/irc/quassel: . files Message-ID: <201610272258.u9RMwujA013691@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Thu Oct 27 22:58:56 2016 New Revision: 424795 URL: https://svnweb.freebsd.org/changeset/ports/424795 Log: MFH: r424771 irc/quasssel: Patch CMakeLists.txt to fix build against SSL with Qt 5.6 PR: 213581 Submitted by: Christian Schwarz (me@cschwarz.com) Submitted by: tcberner Reviewed by: mat Approved by: adamw (mentor, implicit) Obtained from: https://github.com/quassel/quassel/commit/4768c9e99f99b581d4e32e797db91d0182391696 Differential Revision: https://reviews.freebsd.org/D8294 Approved by: ports-secteam (feld) Approved by: adamw (mentor, implicit) Added: branches/2016Q4/irc/quassel/files/patch-CMakeLists.txt - copied unchanged from r424771, head/irc/quassel/files/patch-CMakeLists.txt Modified: branches/2016Q4/irc/quassel/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/irc/quassel/Makefile ============================================================================== --- branches/2016Q4/irc/quassel/Makefile Thu Oct 27 21:21:12 2016 (r424794) +++ branches/2016Q4/irc/quassel/Makefile Thu Oct 27 22:58:56 2016 (r424795) @@ -3,6 +3,7 @@ PORTNAME= quassel PORTVERSION= 0.12.4 +PORTREVISION= 1 CATEGORIES= irc MASTER_SITES= http://www.quassel-irc.org/pub/ Copied: branches/2016Q4/irc/quassel/files/patch-CMakeLists.txt (from r424771, head/irc/quassel/files/patch-CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/irc/quassel/files/patch-CMakeLists.txt Thu Oct 27 22:58:56 2016 (r424795, copy of r424771, head/irc/quassel/files/patch-CMakeLists.txt) @@ -0,0 +1,19 @@ +From 4768c9e99f99b581d4e32e797db91d0182391696 Mon Sep 17 00:00:00 2001 +From: martin <martin.sandsmark@kde.org> +Date: Tue, 7 Jun 2016 00:37:22 +0200 +Subject: [PATCH] Fix the SSL check with Qt 5.6 and GCC 5 (#199) + +--- CMakeLists.txt.orig 2016-04-24 20:36:58 UTC ++++ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610272258.u9RMwujA013691>