Attachment 155567 Details for Bug 199429 – Proposed patch (since 379636 revision)

[patch] Proposed patch (since 379636 revision)

wxlauncher_0.9.5-0.9.6.diff (text/plain), 2.70 KB, created by lightside on 2015-04-13 21:00:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2015-04-13 21:00:25 UTC

Size: 2.70 KB

patch

obsolete

>diff -ruN wxlauncher.orig/Makefile wxlauncher/Makefile
>--- wxlauncher.orig/Makefile	2015-02-23 04:28:43.000000000 +0400
>+++ wxlauncher/Makefile	2015-04-13 22:51:16.000000000 +0400
>@@ -2,8 +2,9 @@
> # $FreeBSD: head/games/wxlauncher/Makefile 379636 2015-02-23 00:28:43Z rm $
> 
> PORTNAME=	wxlauncher
>-PORTVERSION=	0.9.5
>+PORTVERSION=	0.9.6
> CATEGORIES=	games
>+DISTNAME=	${PORTNAME}-${DISTVERSIONFULL}
> 
> MAINTAINER=	lightside@gmx.com
> COMMENT=	Multi-platform launcher for the Freespace 2 Source Code Project
>@@ -16,8 +17,7 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	wxLauncher
>-GH_COMMIT=	7ee46df
>-GH_TAGNAME=	${GH_COMMIT}
>+GH_TAGNAME=	release-${PORTVERSION}
> 
> USES=		cmake:outsource openal python:2,build
> USE_SDL=	sdl
>@@ -25,7 +25,7 @@
> CMAKE_ARGS+=	-DRESOURCES_PATH:STRING="${DATADIR}"
> 
> PORTDATA=	*
>-PORTDOCS=	Authors.txt License.txt ReadMe*.txt Thanks.txt
>+PORTDOCS=	Authors.md License.txt ReadMe*.md Thanks.txt
> 
> PLIST_FILES=	bin/${PORTNAME} \
> 		share/pixmaps/${PORTNAME}.png
>@@ -35,7 +35,7 @@
> 		"Game;" false
> 
> OPTIONS_DEFINE=	DOCS JOYSTICK WX3
>-OPTIONS_DEFAULT=	JOYSTICK
>+OPTIONS_DEFAULT=	JOYSTICK WX3
> JOYSTICK_DESC=	Build with joystick support
> JOYSTICK_CMAKE_ON=	-DUSE_JOYSTICK:BOOL=ON
> JOYSTICK_CMAKE_OFF=	-DUSE_JOYSTICK:BOOL=OFF
>@@ -53,24 +53,12 @@
> .endif
> 
> post-patch: .SILENT
>-# The GetPlatformDefaultConfigFilePath function used as extern inside of
>-# ${WRKSRC}/code/apis/PlatformProfileManagerShared.cpp file
>-	${REINPLACE_CMD} -e 's|^inline wxFileName|extern wxFileName|' \
>-		${WRKSRC}/code/apis/FileProfileManager.cpp
>-# Fix relative path to OpenAL includes
>-	${REINPLACE_CMD} -e '/^#include <al/s|al/||' \
>-		${WRKSRC}/code/apis/OpenALManager.cpp
> # 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}' \
> 		${WRKSRC}/CMakeLists.txt
> 	${REINPLACE_CMD} -e 's|123456789abc+ unknown custom tip|${GH_TAGNAME}|' \
> 		${WRKSRC}/code/global/version_strings.cpp.in
>-.if ${PORT_OPTIONS:MWX3}
>-# Fix ambiguity between wxCStrData and wxString
>-	${REINPLACE_CMD} -e 's|item->forum\.c_str|(wxString)&|' \
>-		${WRKSRC}/code/controls/ModList.cpp
>-.endif
> 
> pre-install:
> 	${INSTALL_DATA} ${WRKSRC}/onlinehelp/images/header.png \
>diff -ruN wxlauncher.orig/distinfo wxlauncher/distinfo
>--- wxlauncher.orig/distinfo	2015-02-23 04:28:43.000000000 +0400
>+++ wxlauncher/distinfo	2015-04-13 22:38:10.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (wxlauncher-0.9.5.tar.gz) = bc4a14cff2a012b95fd72610ffad1ad74df06665c4c19fbde55df949e9e41aea
>-SIZE (wxlauncher-0.9.5.tar.gz) = 893508
>+SHA256 (wxlauncher-0.9.6_GH0.tar.gz) = 24a90722a63ee8a711e268bd78535bbb1ec99a2b27fd7c3750517d07424b6979
>+SIZE (wxlauncher-0.9.6_GH0.tar.gz) = 893799

Actions: View | Diff

Attachments on bug 199429: 155567 | 155568 | 155569