From 9fc74f140e9968231808ec45d3aaddbc596bf0e6 Mon Sep 17 00:00:00 2001 From: jbeich Date: Tue, 5 May 2015 00:10:17 +0000 Subject: games/wxlauncher: unbreak WX3 option on DragonFly and FreeBSD 8.x/9.x After r383466 building against wxgtk30 only worked with clang/libc++ because libstdc++ 4.2 in base lacks C++11 support while newer libstdc++ (from lang/gcc* or in base on DragonFly) requires explicit -std=c++11. Also, -std=c++11 on FreeBSD turns NULL into nullptr which sometimes breaks build. PR: 199916 Approved by: lightside (maintainer) --- games/wxlauncher/Makefile | 2 ++ games/wxlauncher/files/patch-code_apis_ProfileManager.cpp | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 games/wxlauncher/files/patch-code_apis_ProfileManager.cpp (limited to 'games') diff --git a/games/wxlauncher/Makefile b/games/wxlauncher/Makefile index ec6b3194f111..6892846ccb53 100644 --- a/games/wxlauncher/Makefile +++ b/games/wxlauncher/Makefile @@ -40,6 +40,8 @@ JOYSTICK_DESC= Build with joystick support JOYSTICK_CMAKE_ON= -DUSE_JOYSTICK:BOOL=ON JOYSTICK_CMAKE_OFF= -DUSE_JOYSTICK:BOOL=OFF WX3_DESC= Build with using wxWidgets 3.0+ version (2.8 otherwise) +WX3_CXXFLAGS= -std=c++11 +WX3_USES= compiler:c++11-lib WX3_USE= WX=3.0+ WX3_USE_OFF= WX=2.8 diff --git a/games/wxlauncher/files/patch-code_apis_ProfileManager.cpp b/games/wxlauncher/files/patch-code_apis_ProfileManager.cpp new file mode 100644 index 000000000000..34fe86b738b8 --- /dev/null +++ b/games/wxlauncher/files/patch-code_apis_ProfileManager.cpp @@ -0,0 +1,11 @@ +--- code/apis/ProfileManager.cpp.orig 2015-01-28 04:29:37 UTC ++++ code/apis/ProfileManager.cpp +@@ -307,7 +307,7 @@ void ProMan::LoadNewsMapFromGlobalProfil + if (globalProfile->Read(GBL_CFG_NET_THE_NEWS, &theNews) && + (globalProfile->Read(GBL_CFG_NET_NEWS_LAST_TIME, &lastDownloadNewsStr))) { + if ((!theNews.IsEmpty()) && +- (NULL != lastDownloadNews.ParseFormat( ++ (0 != lastDownloadNews.ParseFormat( + lastDownloadNewsStr, NEWS_LAST_TIME_FORMAT))) { + newsMap[groupName] = NewsData(theNews, lastDownloadNews); + -- cgit