svn commit: r385434 - in head/games/wxlauncher: . files

Jan Beich jbeich at FreeBSD.org
Tue May 5 00:10:19 UTC 2015


Author: jbeich
Date: Tue May  5 00:10:17 2015
New Revision: 385434
URL: https://svnweb.freebsd.org/changeset/ports/385434

Log:
  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 at gmx.com> (maintainer)

Added:
  head/games/wxlauncher/files/patch-code_apis_ProfileManager.cpp   (contents, props changed)
Modified:
  head/games/wxlauncher/Makefile   (contents, props changed)

Modified: head/games/wxlauncher/Makefile
==============================================================================
--- head/games/wxlauncher/Makefile	Tue May  5 00:09:51 2015	(r385433)
+++ head/games/wxlauncher/Makefile	Tue May  5 00:10:17 2015	(r385434)
@@ -40,6 +40,8 @@ JOYSTICK_DESC=	Build with joystick suppo
 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
 

Added: head/games/wxlauncher/files/patch-code_apis_ProfileManager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/wxlauncher/files/patch-code_apis_ProfileManager.cpp	Tue May  5 00:10:17 2015	(r385434)
@@ -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);
+ 				


More information about the svn-ports-all mailing list