Attachment 156345 Details for Bug 199916 – Proposed patch (since 385396 revision)

[patch] Proposed patch (since 385396 revision)

wxlauncher.diff (text/plain), 1.29 KB, created by lightside on 2015-05-04 18:15:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-05-04 18:15:02 UTC

Size: 1.29 KB

patch

obsolete

>diff -ruN wxlauncher.orig/Makefile wxlauncher/Makefile
>--- wxlauncher.orig/Makefile	2015-05-04 15:18:03.000000000 +0400
>+++ wxlauncher/Makefile	2015-05-04 20:19:24.000000000 +0400
>@@ -40,6 +40,8 @@
> 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 -ruN wxlauncher.orig/files/patch-code_apis_ProfileManager.cpp wxlauncher/files/patch-code_apis_ProfileManager.cpp
>--- wxlauncher.orig/files/patch-code_apis_ProfileManager.cpp	1970-01-01 03:00:00.000000000 +0300
>+++ wxlauncher/files/patch-code_apis_ProfileManager.cpp	2015-05-04 20:14:13.000000000 +0400
>@@ -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);
>+

Flags:

lightside: maintainer-approval+

Actions: View | Diff

Attachments on bug 199916: 156323 | 156330 | 156345