Attachment 176892 Details for Bug 214420 – Proposed patch (since 425132 revision)

[patch] Proposed patch (since 425132 revision)

pioneer.diff (text/plain), 2.73 KB, created by lightside on 2016-11-11 11:52:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-11-11 11:52:00 UTC

Size: 2.73 KB

patch

obsolete

>--- pioneer.orig/Makefile	2016-11-02 10:24:07 UTC
>+++ pioneer/Makefile
>@@ -36,12 +36,14 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	pioneerspacesim
>-GH_TAGNAME=	20161028
>+GH_TAGNAME=	20161110
> 
>-USES=		autoreconf gmake pkgconfig
>+USES=		autoreconf compiler:c++11-lib gmake pkgconfig
> USE_GL=		gl
> USE_SDL=	image2 sdl2
> 
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	PIONEER_DATA_DIR="${DATADIR}/data"
> CONFIGURE_ARGS=	--with-version="${GH_TAGNAME}"
>@@ -72,21 +74,18 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
>-USE_GCC=	yes
>-.else
>-USES+=		compiler:c++11-lang
>-CPPFLAGS+=	-I${LOCALBASE}/include
>+.if ${COMPILER_TYPE} == gcc
>+# Unhide std::to_string() for GCC (ports/193528)
>+CXXFLAGS+=	-D_GLIBCXX_USE_C99
> .endif
> 
> post-patch: .SILENT
> 	${REINPLACE_CMD} -e '/^OPTIMISE=/d' \
> 		${WRKSRC}/configure.ac
>-	${REINPLACE_CMD} -e 's/std:://g' \
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
>+	${REINPLACE_CMD} -e 's/std::acosh/acosh/g ; s/std::copysign/copysign/g' \
> 		${WRKSRC}/src/Orbit.cpp
>-	${REINPLACE_CMD} -e 's/std::to_string/to_string/g' \
>-		${WRKSRC}/src/graphics/opengl/GenGasGiantColourMaterial.cpp \
>-		${WRKSRC}/src/graphics/opengl/RendererGL.cpp
>+.endif
> 
> post-patch-MODELCOMPILER-off: .SILENT
> 	${REINPLACE_CMD} -e 's/pioneer modelcompiler/pioneer/' \
>--- pioneer.orig/distinfo	2016-11-02 10:24:07 UTC
>+++ pioneer/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1477647657
>-SHA256 (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = d8ceefc7ec22ecdbaf2408a13c80d0368675feebff558457bef2ffc7258f4b77
>-SIZE (pioneerspacesim-pioneer-0.0.20161028-20161028_GH0.tar.gz) = 194439211
>+TIMESTAMP = 1478769845
>+SHA256 (pioneerspacesim-pioneer-0.0.20161110-20161110_GH0.tar.gz) = 24d86095e2080fdbc6ae849dc543dcbdf214d09d34208697d915167c80775b50
>+SIZE (pioneerspacesim-pioneer-0.0.20161110-20161110_GH0.tar.gz) = 194432857
>--- pioneer.orig/files/patch-contrib_PicoDDS_PicoDDS.cpp	2015-06-15 23:54:21 UTC
>+++ pioneer/files/patch-contrib_PicoDDS_PicoDDS.cpp
>@@ -1,10 +0,0 @@
>---- contrib/PicoDDS/PicoDDS.cpp.orig	2015-06-07 21:44:10 UTC
>-+++ contrib/PicoDDS/PicoDDS.cpp
>-@@ -48,6 +48,7 @@
>- */
>- 
>- #include "PicoDDS.h"
>-+#include <stdlib.h>
>- #include <cstdio>
>- #include <cstring>
>- #include <cassert>
>--- pioneer.orig/files/patch-src_GameConfig.h	2015-06-15 23:54:21 UTC
>+++ pioneer/files/patch-src_GameConfig.h
>@@ -1,12 +0,0 @@
>---- src/GameConfig.h.orig	2015-06-07 21:44:10 UTC
>-+++ src/GameConfig.h
>-@@ -8,7 +8,8 @@
>- 
>- class GameConfig : public IniConfig {
>- public:
>--	GameConfig(const std::map<std::string,std::string> &override_ = std::map<std::string,std::string>());
>-+	typedef std::map<std::string, std::string> map_string;
>-+	GameConfig(const map_string &override_ = map_string());
>- 
>- 	void Load();
>- 	bool Save();

Flags:

lightside: maintainer-approval+

Actions: View | Diff

Attachments on bug 214420: 176892