Attachment #203514 for bug #237136

View | Details | Raw Unified | Return to bug 237136
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	nxengine
PORTVERSION=	2.6.4
DISTVERSIONPREFIX=	v
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES+=	https://www.cavestory.org/downloads/:data \
		SF/lifanov-ports-distfiles/games/${PORTNAME}/:icons


LIB_DEPENDS=	libpng.so:graphics/png

USES=		cmake compiler:c++11-lang sdl

USE_SDL=	mixer2 sdl2
SUB_FILES=	${PORTNAME}
CXXFLAGS+=	${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
CXXFLAGS_clang=	-Wno-error-narrowing

USE_GITHUB=	yes
GH_PROJECT=	${PORTNAME}-evo

Lines 1-7 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1523557594	1	TIMESTAMP = 1554788162
2	SHA256 (nxengine.png) = d6d8866939c10342bd3feebef311648586bed38f0390acbe16fd42f5240ff4e7	2	SHA256 (nxengine.png) = d6d8866939c10342bd3feebef311648586bed38f0390acbe16fd42f5240ff4e7
3	SIZE (nxengine.png) = 536	3	SIZE (nxengine.png) = 536
4	SHA256 (cavestoryen.zip) = aa87fa30bee9b4980640c7e104791354e0f1f6411ee0d45a70af70046aa0685f	4	SHA256 (cavestoryen.zip) = aa87fa30bee9b4980640c7e104791354e0f1f6411ee0d45a70af70046aa0685f
5	SIZE (cavestoryen.zip) = 1136575	5	SIZE (cavestoryen.zip) = 1136575
6	SHA256 (nxengine-nxengine-evo-v2.6.3_GH0.tar.gz) = 839edc5c15d1f00ba8b6ffd1c1ce08913b713724c5f192a169658668ee32bce0	6	SHA256 (nxengine-nxengine-evo-v2.6.4_GH0.tar.gz) = 482bb96ae0a778e17856a041237a5c53b581c0ed0e3b7da8bff9e70d283939f6
7	SIZE (nxengine-nxengine-evo-v2.6.3_GH0.tar.gz) = 3228984	7	SIZE (nxengine-nxengine-evo-v2.6.4_GH0.tar.gz) = 3329255




--- src/common/json.hpp.orig	2019-04-08 14:37:06 UTC

--- src/common/json.hpp.orig	2018-04-09 20:44:59 UTC
+++ src/common/json.hpp
@@ -878,6 +878,16 @@ struct is_compatible_object_type_impl<true, RealType, 
         and std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
 };
 
+template<bool B, class RealType, class CompatibleStringType>

+        std::is_same<typename RealType::value_type, typename CompatibleStringType::value_type>::value;
+};
+
 template <class BasicJsonType, class CompatibleObjectType> struct is_compatible_object_type
 struct is_compatible_object_type
 {
   static auto constexpr value = is_compatible_object_type_impl<
@@ -886,6 +896,15 @@ template <class BasicJsonType, class CompatibleObjectT
       typename BasicJsonType::object_t, CompatibleObjectType>::value;
 };
 
+template<class BasicJsonType, class CompatibleStringType>

+                                  typename BasicJsonType::string_t, CompatibleStringType >::value;
+};
+
 template <typename BasicJsonType, typename T> struct is_basic_json_nested_type
 struct is_basic_json_nested_type
 {
   static auto constexpr value = std::is_same<T, typename BasicJsonType::iterator>::value
@@ -1137,6 +1156,25 @@ template <typename BasicJsonType> void from_json(const
   {
     JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
   }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+

+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
+
   s = *j.template get_ptr<const typename BasicJsonType::string_t *>();
 }
 

Lines 1-11 Link Here

(-)files/patch-src_graphics_screenshot.cpp (-11 lines)
1	--- src/graphics/screenshot.cpp.orig 2018-03-24 09:37:42 UTC
2	+++ src/graphics/screenshot.cpp
3	@@ -1,7 +1,7 @@
4	#include "pngfuncs.h"
5	#include "graphics.h"
6	#include "../common/stat.h"
7	-#if defined(__MACH__)
8	+#if defined(__MACH__) \|\| defined (__FreeBSD__)
9	#include <cstdlib>
10	#else
11	#include <malloc.h>

Lines 44-49 Link Here

(-)pkg-plist (+65 lines)
44	%%DATADIR%%/data/Caret.pbm	44	%%DATADIR%%/data/Caret.pbm
45	%%DATADIR%%/data/Credit.tsc	45	%%DATADIR%%/data/Credit.tsc
46	%%DATADIR%%/data/Face.pbm	46	%%DATADIR%%/data/Face.pbm
		47	%%DATADIR%%/data/Face_0.pbm
		48	%%DATADIR%%/data/Face_1.pbm
		49	%%DATADIR%%/data/Face_2.pbm
47	%%DATADIR%%/data/Fade.pbm	50	%%DATADIR%%/data/Fade.pbm
48	%%DATADIR%%/data/Head.tsc	51	%%DATADIR%%/data/Head.tsc
49	%%DATADIR%%/data/ItemImage.pbm	52	%%DATADIR%%/data/ItemImage.pbm
Lines 419-424 Link Here
419	%%DATADIR%%/data/Stage/e_Sky.pxm	422	%%DATADIR%%/data/Stage/e_Sky.pxm
420	%%DATADIR%%/data/Stage/e_Sky.tsc	423	%%DATADIR%%/data/Stage/e_Sky.tsc
421	%%DATADIR%%/data/StageImage.pbm	424	%%DATADIR%%/data/StageImage.pbm
		425	%%DATADIR%%/data/StageMeta/Ballo2.json
		426	%%DATADIR%%/data/StageMeta/CentW.json
		427	%%DATADIR%%/data/StageMeta/Chako.json
		428	%%DATADIR%%/data/StageMeta/Clock.json
		429	%%DATADIR%%/data/StageMeta/Comu.json
		430	%%DATADIR%%/data/StageMeta/Cthu.json
		431	%%DATADIR%%/data/StageMeta/Cthu2.json
		432	%%DATADIR%%/data/StageMeta/Curly.json
		433	%%DATADIR%%/data/StageMeta/CurlyS.json
		434	%%DATADIR%%/data/StageMeta/Dark.json
		435	%%DATADIR%%/data/StageMeta/Drain.json
		436	%%DATADIR%%/data/StageMeta/EgEnd1.json
		437	%%DATADIR%%/data/StageMeta/EgEnd2.json
		438	%%DATADIR%%/data/StageMeta/EggR.json
		439	%%DATADIR%%/data/StageMeta/EggR2.json
		440	%%DATADIR%%/data/StageMeta/EggX.json
		441	%%DATADIR%%/data/StageMeta/EggX2.json
		442	%%DATADIR%%/data/StageMeta/Frog.json
		443	%%DATADIR%%/data/StageMeta/Gard.json
		444	%%DATADIR%%/data/StageMeta/Hell1.json
		445	%%DATADIR%%/data/StageMeta/Hell4.json
		446	%%DATADIR%%/data/StageMeta/Hell42.json
		447	%%DATADIR%%/data/StageMeta/Itoh.json
		448	%%DATADIR%%/data/StageMeta/Jail1.json
		449	%%DATADIR%%/data/StageMeta/Jail2.json
		450	%%DATADIR%%/data/StageMeta/Jenka1.json
		451	%%DATADIR%%/data/StageMeta/Jenka2.json
		452	%%DATADIR%%/data/StageMeta/Little.json
		453	%%DATADIR%%/data/StageMeta/Lounge.json
		454	%%DATADIR%%/data/StageMeta/Malco.json
		455	%%DATADIR%%/data/StageMeta/Mapi.json
		456	%%DATADIR%%/data/StageMeta/MazeA.json
		457	%%DATADIR%%/data/StageMeta/MazeB.json
		458	%%DATADIR%%/data/StageMeta/MazeD.json
		459	%%DATADIR%%/data/StageMeta/MazeH.json
		460	%%DATADIR%%/data/StageMeta/MazeI.json
		461	%%DATADIR%%/data/StageMeta/MazeO.json
		462	%%DATADIR%%/data/StageMeta/MazeS.json
		463	%%DATADIR%%/data/StageMeta/Momo.json
		464	%%DATADIR%%/data/StageMeta/Pens1.json
		465	%%DATADIR%%/data/StageMeta/Pens2.json
		466	%%DATADIR%%/data/StageMeta/Pixel.json
		467	%%DATADIR%%/data/StageMeta/Plant.json
		468	%%DATADIR%%/data/StageMeta/Pole.json
		469	%%DATADIR%%/data/StageMeta/Prefa1.json
		470	%%DATADIR%%/data/StageMeta/Prefa2.json
		471	%%DATADIR%%/data/StageMeta/Shelt.json
		472	%%DATADIR%%/data/StageMeta/Start.json
		473	%%DATADIR%%/data/StageMeta/Statue.json
		474	%%DATADIR%%/data/StageMeta/WeedD.json
		475	%%DATADIR%%/data/StageMeta/WeedS.json
		476	%%DATADIR%%/data/StageMeta/e_Malc.json
		477	%%DATADIR%%/data/StageMeta/e_Maze.json
422	%%DATADIR%%/data/StageSelect.tsc	478	%%DATADIR%%/data/StageSelect.tsc
423	%%DATADIR%%/data/TextBox.pbm	479	%%DATADIR%%/data/TextBox.pbm
424	%%DATADIR%%/data/Title.pbm	480	%%DATADIR%%/data/Title.pbm
Lines 431-440 Link Here
431	%%DATADIR%%/data/bkGard.pbm	487	%%DATADIR%%/data/bkGard.pbm
432	%%DATADIR%%/data/bkGray.pbm	488	%%DATADIR%%/data/bkGray.pbm
433	%%DATADIR%%/data/bkGreen.pbm	489	%%DATADIR%%/data/bkGreen.pbm
		490	%%DATADIR%%/data/bkHellish.pbm
		491	%%DATADIR%%/data/bkHellish480fix.pbm
		492	%%DATADIR%%/data/bkLight.pbm
		493	%%DATADIR%%/data/bkLight480fix.pbm
434	%%DATADIR%%/data/bkMaze.pbm	494	%%DATADIR%%/data/bkMaze.pbm
435	%%DATADIR%%/data/bkMoon.pbm	495	%%DATADIR%%/data/bkMoon.pbm
436	%%DATADIR%%/data/bkMoon480fix.pbm	496	%%DATADIR%%/data/bkMoon480fix.pbm
437	%%DATADIR%%/data/bkRed.pbm	497	%%DATADIR%%/data/bkRed.pbm
		498	%%DATADIR%%/data/bkSunset.pbm
		499	%%DATADIR%%/data/bkSunset480fix.pbm
438	%%DATADIR%%/data/bkWater.pbm	500	%%DATADIR%%/data/bkWater.pbm
439	%%DATADIR%%/data/casts.pbm	501	%%DATADIR%%/data/casts.pbm
440	%%DATADIR%%/data/endpic/credit01.bmp	502	%%DATADIR%%/data/endpic/credit01.bmp
Lines 464-473 Link Here
464	%%DATADIR%%/data/font_2_0.png	526	%%DATADIR%%/data/font_2_0.png
465	%%DATADIR%%/data/font_3.fnt	527	%%DATADIR%%/data/font_3.fnt
466	%%DATADIR%%/data/font_3_0.png	528	%%DATADIR%%/data/font_3_0.png
		529	%%DATADIR%%/data/font_3_1.png
467	%%DATADIR%%/data/font_4.fnt	530	%%DATADIR%%/data/font_4.fnt
468	%%DATADIR%%/data/font_4_0.png	531	%%DATADIR%%/data/font_4_0.png
469	%%DATADIR%%/data/font_5.fnt	532	%%DATADIR%%/data/font_5.fnt
470	%%DATADIR%%/data/font_5_0.png	533	%%DATADIR%%/data/font_5_0.png
		534	%%DATADIR%%/data/music.json
		535	%%DATADIR%%/data/music_dirs.json
471	%%DATADIR%%/data/npc.tbl	536	%%DATADIR%%/data/npc.tbl
472	%%DATADIR%%/data/org/access.org	537	%%DATADIR%%/data/org/access.org
473	%%DATADIR%%/data/org/anzen.org	538	%%DATADIR%%/data/org/anzen.org

Return to bug 237136

Lines 1-9 Link Here

(-)Makefile (-5 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= nxengine	3	PORTNAME= nxengine
4	PORTVERSION= 2.6.3	4	PORTVERSION= 2.6.4
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	PORTREVISION= 2
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES+= https://www.cavestory.org/downloads/:data \	7	MASTER_SITES+= https://www.cavestory.org/downloads/:data \
9	SF/lifanov-ports-distfiles/games/${PORTNAME}/:icons	8	SF/lifanov-ports-distfiles/games/${PORTNAME}/:icons
Lines 25-36 Link Here
25		24
26	LIB_DEPENDS= libpng.so:graphics/png	25	LIB_DEPENDS= libpng.so:graphics/png
27		26
28	USES= cmake compiler:c++11-lang	27	USES= cmake compiler:c++11-lang sdl
29		28
30	USE_SDL= mixer2 sdl2	29	USE_SDL= mixer2 sdl2
31	SUB_FILES= ${PORTNAME}	30	SUB_FILES= ${PORTNAME}
32	CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}}
33	CXXFLAGS_clang= -Wno-error-narrowing
34		31
35	USE_GITHUB= yes	32	USE_GITHUB= yes
36	GH_PROJECT= ${PORTNAME}-evo	33	GH_PROJECT= ${PORTNAME}-evo

Lines 1-9 Link Here

(-)files/patch-libc++7 (-16 / +14 lines)
1	https://github.com/nlohmann/json/commit/8165707990e4	1	--- src/common/json.hpp.orig 2019-04-08 14:37:06 UTC
2
3	--- src/common/json.hpp.orig 2018-04-09 20:44:59 UTC
4	+++ src/common/json.hpp	2	+++ src/common/json.hpp
5	@@ -840,6 +840,16 @@ struct is_compatible_object_type_impl<true, RealType,	3	@@ -878,6 +878,16 @@ struct is_compatible_object_type_impl<true, RealType,
6	std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;	4	and std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
7	};	5	};
8		6
9	+template<bool B, class RealType, class CompatibleStringType>	7	+template<bool B, class RealType, class CompatibleStringType>
Lines 16-26 Link Here
16	+ std::is_same<typename RealType::value_type, typename CompatibleStringType::value_type>::value;	14	+ std::is_same<typename RealType::value_type, typename CompatibleStringType::value_type>::value;
17	+};	15	+};
18	+	16	+
19	template<class BasicJsonType, class CompatibleObjectType>	17	template <class BasicJsonType, class CompatibleObjectType> struct is_compatible_object_type
20	struct is_compatible_object_type
21	{	18	{
22	@@ -850,6 +860,15 @@ struct is_compatible_object_type	19	static auto constexpr value = is_compatible_object_type_impl<
23	typename BasicJsonType::object_t, CompatibleObjectType >::value;	20	@@ -886,6 +896,15 @@ template <class BasicJsonType, class CompatibleObjectT
		21	typename BasicJsonType::object_t, CompatibleObjectType>::value;
24	};	22	};
25		23
26	+template<class BasicJsonType, class CompatibleStringType>	24	+template<class BasicJsonType, class CompatibleStringType>
Lines 32-44 Link Here
32	+ typename BasicJsonType::string_t, CompatibleStringType >::value;	30	+ typename BasicJsonType::string_t, CompatibleStringType >::value;
33	+};	31	+};
34	+	32	+
35	template<typename BasicJsonType, typename T>	33	template <typename BasicJsonType, typename T> struct is_basic_json_nested_type
36	struct is_basic_json_nested_type
37	{	34	{
38	@@ -1132,6 +1151,25 @@ void from_json(const BasicJsonType& j, typename BasicJ	35	static auto constexpr value = std::is_same<T, typename BasicJsonType::iterator>::value
39	{	36	@@ -1137,6 +1156,25 @@ template <typename BasicJsonType> void from_json(const
40	JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));	37	{
41	}	38	JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
		39	}
42	+ s = j.template get_ptr<const typename BasicJsonType::string_t>();	40	+ s = j.template get_ptr<const typename BasicJsonType::string_t>();
43	+}	41	+}
44	+	42	+
Lines 58-63 Link Here
58	+ JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));	56	+ JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
59	+ }	57	+ }
60	+	58	+
61	s = j.template get_ptr<const typename BasicJsonType::string_t>();	59	s = j.template get_ptr<const typename BasicJsonType::string_t >();
62	}	60	}
63		61