diff options
| author | jbeich <jbeich@FreeBSD.org> | 2015-05-05 08:10:17 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2015-05-05 08:10:17 +0800 |
| commit | 9fc74f140e9968231808ec45d3aaddbc596bf0e6 (patch) | |
| tree | d9423a35a52d54a4e68a43057d79d06cac42bb8a /games | |
| parent | 1e5f4badb97aae6ad445298526e5d54978e14b12 (diff) | |
| download | freebsd-ports-gnome-9fc74f140e9968231808ec45d3aaddbc596bf0e6.tar.gz freebsd-ports-gnome-9fc74f140e9968231808ec45d3aaddbc596bf0e6.tar.zst freebsd-ports-gnome-9fc74f140e9968231808ec45d3aaddbc596bf0e6.zip | |
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 <lightside@gmx.com> (maintainer)
Diffstat (limited to 'games')
| -rw-r--r-- | games/wxlauncher/Makefile | 2 | ||||
| -rw-r--r-- | games/wxlauncher/files/patch-code_apis_ProfileManager.cpp | 11 |
2 files changed, 13 insertions, 0 deletions
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); + |