mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-19 03:52:17 +00:00
Code Issues Releases Activity

games/wxlauncher: unbreak WX3 option on DragonFly and FreeBSD 8.x/9.x

Browse Source 
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)
This commit is contained in:
Jan Beich 2015-05-05 00:10:17 +00:00
parent 17c7989e80
commit 570508c9c4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=385434
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/wxlauncher/Makefile
View File

@ -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

11
games/wxlauncher/files/patch-code_apis_ProfileManager.cpp Normal file
View File

@ -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);