diff options
| author | shurd <shurd@FreeBSD.org> | 2015-11-30 12:55:14 +0800 |
|---|---|---|
| committer | shurd <shurd@FreeBSD.org> | 2015-11-30 12:55:14 +0800 |
| commit | 382a830407f2ea4a255a56e5ad7f7202a4cefdce (patch) | |
| tree | 749e8c181a909bbcc8e373447e356e3e4bcb5ec4 /comms | |
| parent | 8f779a66c41366f931f173eb669f1dd59266506b (diff) | |
| download | freebsd-ports-gnome-382a830407f2ea4a255a56e5ad7f7202a4cefdce.tar.gz freebsd-ports-gnome-382a830407f2ea4a255a56e5ad7f7202a4cefdce.tar.zst freebsd-ports-gnome-382a830407f2ea4a255a56e5ad7f7202a4cefdce.zip | |
Fix build for 9.x
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/trustedqsl/Makefile | 3 | ||||
| -rw-r--r-- | comms/trustedqsl/files/patch-CMakeLists.txt | 2 | ||||
| -rw-r--r-- | comms/trustedqsl/files/patch-apps_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | comms/trustedqsl/files/patch-src_xml.h | 16 |
4 files changed, 15 insertions, 8 deletions
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile index 2e4404fbedc8..cfec82ffa196 100644 --- a/comms/trustedqsl/Makefile +++ b/comms/trustedqsl/Makefile @@ -21,10 +21,9 @@ USE_BDB= 5+ PKGMESSAGE= ${WRKDIR}/pkg-message -USES= cmake compiler:features pkgconfig tar:tgz +USES= cmake compiler:c++11-lib pkgconfig tar:tgz CMAKE_ARGS= -DBDB_PREFIX=${LOCALBASE} USE_WX= 2.8+ -WX_UNICODE= yes USE_LDCONFIG= yes USE_OPENSSL= yes diff --git a/comms/trustedqsl/files/patch-CMakeLists.txt b/comms/trustedqsl/files/patch-CMakeLists.txt index a2ecacf68efa..75149782fbe1 100644 --- a/comms/trustedqsl/files/patch-CMakeLists.txt +++ b/comms/trustedqsl/files/patch-CMakeLists.txt @@ -5,7 +5,7 @@ option(USE_STATIC_MSVCRT "Use a static Visual C++ Runtime when building with MSVC") +if(UNIX) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +endif() if(MSVC AND USE_STATIC_MSVCRT) foreach(flag_var diff --git a/comms/trustedqsl/files/patch-apps_CMakeLists.txt b/comms/trustedqsl/files/patch-apps_CMakeLists.txt index 80cd35358011..a59a7bede2c5 100644 --- a/comms/trustedqsl/files/patch-apps_CMakeLists.txt +++ b/comms/trustedqsl/files/patch-apps_CMakeLists.txt @@ -1,4 +1,4 @@ ---- apps/CMakeLists.txt.orig 2015-11-29 00:14:00 UTC +--- apps/CMakeLists.txt.orig 2015-10-21 17:26:38 UTC +++ apps/CMakeLists.txt @@ -148,7 +148,11 @@ if(NOT APPLE AND NOT WIN32) add_definitions("-DCONFDIR=\"${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/\"") diff --git a/comms/trustedqsl/files/patch-src_xml.h b/comms/trustedqsl/files/patch-src_xml.h index e3d6e5ef4027..c68cff0257b6 100644 --- a/comms/trustedqsl/files/patch-src_xml.h +++ b/comms/trustedqsl/files/patch-src_xml.h @@ -1,6 +1,14 @@ --- src/xml.h.orig 2015-10-21 17:26:38 UTC +++ src/xml.h -@@ -28,7 +28,7 @@ namespace tqsllib { +@@ -13,6 +13,7 @@ + + #include <string> + #include <map> ++#include <memory> + #include <vector> + #include <utility> + #include <expat.h> +@@ -28,7 +29,7 @@ namespace tqsllib { class XMLElement; @@ -9,7 +17,7 @@ typedef map<string, string> XMLElementAttributeList; /** Encapsulates an XML element -@@ -62,7 +62,7 @@ class XMLElement { +@@ -62,7 +63,7 @@ class XMLElement { */ pair<string, bool> getAttribute(const string& key); /// Add an element to the list of contained subelements @@ -18,7 +26,7 @@ XMLElementAttributeList& getAttributeList() { return _attributes; } XMLElementList& getElementList() { return _elements; } /// Parse an XML file and add its element tree to this element -@@ -134,8 +134,8 @@ XMLElement::setAttribute(const string& k +@@ -134,8 +135,8 @@ XMLElement::setAttribute(const string& k } inline XMLElementList::iterator @@ -29,7 +37,7 @@ return it; } -@@ -158,9 +158,9 @@ inline bool +@@ -158,9 +159,9 @@ inline bool XMLElement::getNextElement(XMLElement& element) { if (_iter == _elements.end()) return false; |