FreeBSD Bugzilla – Attachment 161141 Details for
Bug 202939
[MAINTAINER] games/wxlauncher: Update to 0.10.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch (since 387986 revision)
wxlauncher_0.9.6-0.10.0.diff (text/plain), 3.53 KB, created by
lightside
on 2015-09-17 09:48:37 UTC
(
hide
)
Description:
Proposed patch (since 387986 revision)
Filename:
MIME Type:
Creator:
lightside
Created:
2015-09-17 09:48:37 UTC
Size:
3.53 KB
patch
obsolete
>diff -ruN wxlauncher.orig/Makefile wxlauncher/Makefile >--- wxlauncher.orig/Makefile 2015-05-31 01:25:06.000000000 +0400 >+++ wxlauncher/Makefile 2015-09-17 10:32:02.000000000 +0400 >@@ -2,9 +2,8 @@ > # $FreeBSD: head/games/wxlauncher/Makefile 387986 2015-05-30 21:25:06Z mat $ > > PORTNAME= wxlauncher >-PORTVERSION= 0.9.6 >+PORTVERSION= 0.10.0 > DISTVERSIONPREFIX= release- >-PORTREVISION= 2 > CATEGORIES= games > > MAINTAINER= lightside@gmx.com >@@ -17,11 +16,11 @@ > ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 > > USE_GITHUB= yes >-GH_ACCOUNT= wxLauncher >+GH_ACCOUNT= scp-fs2open >+GH_PROJECT= wxLauncher > >-USES= cmake:outsource openal python:2,build >-USE_SDL= sdl >-WX_UNICODE= yes >+USES= cmake:outsource openal pkgconfig python:2,build >+USE_SDL= sdl2 > CMAKE_ARGS+= -DRESOURCES_PATH:STRING="${DATADIR}" > > PORTDATA= * >@@ -45,20 +44,13 @@ > WX3_USES= compiler:c++11-lib > WX3_USE= WX=3.0+ > WX3_USE_OFF= WX=2.8 >- >-.include <bsd.port.options.mk> >- >-# Allow to build with using concrete wxWidgets version >-.if ${PORT_OPTIONS:MWX3} >-SED_RE_WX3= wxWidgets 2\./,+1d >-.else >-SED_RE_WX3= NOT wxWidgets_FOUND/,+3d >-.endif >+WX3_CMAKE_ON= -DWXVER:STRING="3.0" >+WX3_CMAKE_OFF= -DWXVER:STRING="2.8" > > post-patch: .SILENT > # Change version_strings.cpp.in file, based on GH_TAGNAME, without using git > ${REINPLACE_CMD} -e '/find_program(GIT_EXECUTABLE/d ; \ >- /version_strings.cpp will be generated/d ; /${SED_RE_WX3}' \ >+ /version_strings.cpp will be generated/d' \ > ${WRKSRC}/CMakeLists.txt > ${REINPLACE_CMD} -e 's|123456789abc+ unknown custom tip|${GH_TAGNAME}|' \ > ${WRKSRC}/code/global/version_strings.cpp.in >diff -ruN wxlauncher.orig/distinfo wxlauncher/distinfo >--- wxlauncher.orig/distinfo 2015-05-31 01:25:06.000000000 +0400 >+++ wxlauncher/distinfo 2015-09-07 00:34:58.000000000 +0400 >@@ -1,2 +1,2 @@ >-SHA256 (wxLauncher-wxlauncher-release-0.9.6_GH0.tar.gz) = 24a90722a63ee8a711e268bd78535bbb1ec99a2b27fd7c3750517d07424b6979 >-SIZE (wxLauncher-wxlauncher-release-0.9.6_GH0.tar.gz) = 893799 >+SHA256 (scp-fs2open-wxLauncher-release-0.10.0_GH0.tar.gz) = b47c88be4d7cc6582a7b7816cf8dc9fe1502947f3bdd509bc0b4b6fcf06a8bc0 >+SIZE (scp-fs2open-wxLauncher-release-0.10.0_GH0.tar.gz) = 2434207 >diff -ruN wxlauncher.orig/files/patch-code_apis_JoystickManager.cpp wxlauncher/files/patch-code_apis_JoystickManager.cpp >--- wxlauncher.orig/files/patch-code_apis_JoystickManager.cpp 2015-05-05 04:09:51.000000000 +0400 >+++ wxlauncher/files/patch-code_apis_JoystickManager.cpp 2015-09-07 03:04:32.000000000 +0400 >@@ -1,13 +1,13 @@ >---- code/apis/JoystickManager.cpp.orig 2015-04-11 22:15:55 UTC >+--- code/apis/JoystickManager.cpp.orig 2015-08-26 04:54:06 UTC > +++ code/apis/JoystickManager.cpp >-@@ -65,8 +65,10 @@ bool JoyMan::IsInitialized() { >+@@ -84,9 +84,9 @@ bool JoyMan::IsInitialized() { >+ \sa JoyMan::WasCompiledIn() > */ >- bool JoyMan::Initialize() { >- if ( JoyMan::IsInitialized() ) { >+ bool JoyMan::Initialize(ApiType apiType) { > +#if USE_JOYSTICK >- wxLogDebug(_T("JoyMan already initialized with %d joysticks"), >- joysticks.Count()); >-+#endif >- return true; >- } >+ currentApi = apiType; > >+-#if USE_JOYSTICK >+ if ( JoyMan::IsInitialized() ) { >+ wxLogDebug(_T("JoyMan already initialized")); >+ return true; >diff -ruN wxlauncher.orig/pkg-descr wxlauncher/pkg-descr >--- wxlauncher.orig/pkg-descr 2014-12-12 03:05:50.000000000 +0400 >+++ wxlauncher/pkg-descr 2015-09-07 01:18:43.000000000 +0400 >@@ -5,4 +5,4 @@ > to those looking for an easy way to find and get updates to their Freespace 2 > MODs and TCs. > >-WWW: http://github.com/wxLauncher/wxlauncher >+WWW: http://github.com/scp-fs2open/wxLauncher
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 202939
:
160786
|
160787
| 161141 |
161142
|
161143
|
161144