Attachment 203514 Details for Bug 237136 – patch

[patch] patch

nxengine.patch (text/plain), 8.66 KB, created by Piotr Kubaj on 2019-04-09 07:12:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-04-09 07:12:08 UTC

Size: 8.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 498040)
>+++ Makefile	(working copy)
>@@ -1,9 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	nxengine
>-PORTVERSION=	2.6.3
>+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
>@@ -25,12 +24,10 @@
> 
> LIB_DEPENDS=	libpng.so:graphics/png
> 
>-USES=		cmake compiler:c++11-lang
>+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
>Index: distinfo
>===================================================================
>--- distinfo	(revision 498040)
>+++ distinfo	(working copy)
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1523557594
>+TIMESTAMP = 1554788162
> SHA256 (nxengine.png) = d6d8866939c10342bd3feebef311648586bed38f0390acbe16fd42f5240ff4e7
> SIZE (nxengine.png) = 536
> SHA256 (cavestoryen.zip) = aa87fa30bee9b4980640c7e104791354e0f1f6411ee0d45a70af70046aa0685f
> SIZE (cavestoryen.zip) = 1136575
>-SHA256 (nxengine-nxengine-evo-v2.6.3_GH0.tar.gz) = 839edc5c15d1f00ba8b6ffd1c1ce08913b713724c5f192a169658668ee32bce0
>-SIZE (nxengine-nxengine-evo-v2.6.3_GH0.tar.gz) = 3228984
>+SHA256 (nxengine-nxengine-evo-v2.6.4_GH0.tar.gz) = 482bb96ae0a778e17856a041237a5c53b581c0ed0e3b7da8bff9e70d283939f6
>+SIZE (nxengine-nxengine-evo-v2.6.4_GH0.tar.gz) = 3329255
>Index: files/patch-libc++7
>===================================================================
>--- files/patch-libc++7	(revision 498040)
>+++ files/patch-libc++7	(working copy)
>@@ -1,9 +1,7 @@
>-https://github.com/nlohmann/json/commit/8165707990e4
>-
>---- src/common/json.hpp.orig	2018-04-09 20:44:59 UTC
>+--- src/common/json.hpp.orig	2019-04-08 14:37:06 UTC
> +++ src/common/json.hpp
>-@@ -840,6 +840,16 @@ struct is_compatible_object_type_impl<true, RealType, 
>-         std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
>+@@ -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>
>@@ -16,11 +14,11 @@
> +        std::is_same<typename RealType::value_type, typename CompatibleStringType::value_type>::value;
> +};
> +
>- template<class BasicJsonType, class CompatibleObjectType>
>- struct is_compatible_object_type
>+ template <class BasicJsonType, class CompatibleObjectType> struct is_compatible_object_type
>  {
>-@@ -850,6 +860,15 @@ struct is_compatible_object_type
>-                                   typename BasicJsonType::object_t, CompatibleObjectType >::value;
>+   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>
>@@ -32,13 +30,13 @@
> +                                  typename BasicJsonType::string_t, CompatibleStringType >::value;
> +};
> +
>- template<typename BasicJsonType, typename T>
>- struct is_basic_json_nested_type
>+ template <typename BasicJsonType, typename T> struct is_basic_json_nested_type
>  {
>-@@ -1132,6 +1151,25 @@ void from_json(const BasicJsonType& j, typename BasicJ
>-     {
>-         JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
>-     }
>+   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*>();
> +}
> +
>@@ -58,6 +56,6 @@
> +        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*>();
>+   s = *j.template get_ptr<const typename BasicJsonType::string_t *>();
>  }
>  
>Index: files/patch-src_graphics_screenshot.cpp
>===================================================================
>--- files/patch-src_graphics_screenshot.cpp	(revision 498040)
>+++ files/patch-src_graphics_screenshot.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/graphics/screenshot.cpp.orig	2018-03-24 09:37:42 UTC
>-+++ src/graphics/screenshot.cpp
>-@@ -1,7 +1,7 @@
>- #include "pngfuncs.h"
>- #include "graphics.h"
>- #include "../common/stat.h"
>--#if defined(__MACH__)
>-+#if defined(__MACH__) || defined (__FreeBSD__)
>- #include <cstdlib>
>- #else
>- #include <malloc.h>
>
>Property changes on: files/patch-src_graphics_screenshot.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 498040)
>+++ pkg-plist	(working copy)
>@@ -44,6 +44,9 @@
> %%DATADIR%%/data/Caret.pbm
> %%DATADIR%%/data/Credit.tsc
> %%DATADIR%%/data/Face.pbm
>+%%DATADIR%%/data/Face_0.pbm
>+%%DATADIR%%/data/Face_1.pbm
>+%%DATADIR%%/data/Face_2.pbm
> %%DATADIR%%/data/Fade.pbm
> %%DATADIR%%/data/Head.tsc
> %%DATADIR%%/data/ItemImage.pbm
>@@ -419,6 +422,59 @@
> %%DATADIR%%/data/Stage/e_Sky.pxm
> %%DATADIR%%/data/Stage/e_Sky.tsc
> %%DATADIR%%/data/StageImage.pbm
>+%%DATADIR%%/data/StageMeta/Ballo2.json
>+%%DATADIR%%/data/StageMeta/CentW.json
>+%%DATADIR%%/data/StageMeta/Chako.json
>+%%DATADIR%%/data/StageMeta/Clock.json
>+%%DATADIR%%/data/StageMeta/Comu.json
>+%%DATADIR%%/data/StageMeta/Cthu.json
>+%%DATADIR%%/data/StageMeta/Cthu2.json
>+%%DATADIR%%/data/StageMeta/Curly.json
>+%%DATADIR%%/data/StageMeta/CurlyS.json
>+%%DATADIR%%/data/StageMeta/Dark.json
>+%%DATADIR%%/data/StageMeta/Drain.json
>+%%DATADIR%%/data/StageMeta/EgEnd1.json
>+%%DATADIR%%/data/StageMeta/EgEnd2.json
>+%%DATADIR%%/data/StageMeta/EggR.json
>+%%DATADIR%%/data/StageMeta/EggR2.json
>+%%DATADIR%%/data/StageMeta/EggX.json
>+%%DATADIR%%/data/StageMeta/EggX2.json
>+%%DATADIR%%/data/StageMeta/Frog.json
>+%%DATADIR%%/data/StageMeta/Gard.json
>+%%DATADIR%%/data/StageMeta/Hell1.json
>+%%DATADIR%%/data/StageMeta/Hell4.json
>+%%DATADIR%%/data/StageMeta/Hell42.json
>+%%DATADIR%%/data/StageMeta/Itoh.json
>+%%DATADIR%%/data/StageMeta/Jail1.json
>+%%DATADIR%%/data/StageMeta/Jail2.json
>+%%DATADIR%%/data/StageMeta/Jenka1.json
>+%%DATADIR%%/data/StageMeta/Jenka2.json
>+%%DATADIR%%/data/StageMeta/Little.json
>+%%DATADIR%%/data/StageMeta/Lounge.json
>+%%DATADIR%%/data/StageMeta/Malco.json
>+%%DATADIR%%/data/StageMeta/Mapi.json
>+%%DATADIR%%/data/StageMeta/MazeA.json
>+%%DATADIR%%/data/StageMeta/MazeB.json
>+%%DATADIR%%/data/StageMeta/MazeD.json
>+%%DATADIR%%/data/StageMeta/MazeH.json
>+%%DATADIR%%/data/StageMeta/MazeI.json
>+%%DATADIR%%/data/StageMeta/MazeO.json
>+%%DATADIR%%/data/StageMeta/MazeS.json
>+%%DATADIR%%/data/StageMeta/Momo.json
>+%%DATADIR%%/data/StageMeta/Pens1.json
>+%%DATADIR%%/data/StageMeta/Pens2.json
>+%%DATADIR%%/data/StageMeta/Pixel.json
>+%%DATADIR%%/data/StageMeta/Plant.json
>+%%DATADIR%%/data/StageMeta/Pole.json
>+%%DATADIR%%/data/StageMeta/Prefa1.json
>+%%DATADIR%%/data/StageMeta/Prefa2.json
>+%%DATADIR%%/data/StageMeta/Shelt.json
>+%%DATADIR%%/data/StageMeta/Start.json
>+%%DATADIR%%/data/StageMeta/Statue.json
>+%%DATADIR%%/data/StageMeta/WeedD.json
>+%%DATADIR%%/data/StageMeta/WeedS.json
>+%%DATADIR%%/data/StageMeta/e_Malc.json
>+%%DATADIR%%/data/StageMeta/e_Maze.json
> %%DATADIR%%/data/StageSelect.tsc
> %%DATADIR%%/data/TextBox.pbm
> %%DATADIR%%/data/Title.pbm
>@@ -431,10 +487,16 @@
> %%DATADIR%%/data/bkGard.pbm
> %%DATADIR%%/data/bkGray.pbm
> %%DATADIR%%/data/bkGreen.pbm
>+%%DATADIR%%/data/bkHellish.pbm
>+%%DATADIR%%/data/bkHellish480fix.pbm
>+%%DATADIR%%/data/bkLight.pbm
>+%%DATADIR%%/data/bkLight480fix.pbm
> %%DATADIR%%/data/bkMaze.pbm
> %%DATADIR%%/data/bkMoon.pbm
> %%DATADIR%%/data/bkMoon480fix.pbm
> %%DATADIR%%/data/bkRed.pbm
>+%%DATADIR%%/data/bkSunset.pbm
>+%%DATADIR%%/data/bkSunset480fix.pbm
> %%DATADIR%%/data/bkWater.pbm
> %%DATADIR%%/data/casts.pbm
> %%DATADIR%%/data/endpic/credit01.bmp
>@@ -464,10 +526,13 @@
> %%DATADIR%%/data/font_2_0.png
> %%DATADIR%%/data/font_3.fnt
> %%DATADIR%%/data/font_3_0.png
>+%%DATADIR%%/data/font_3_1.png
> %%DATADIR%%/data/font_4.fnt
> %%DATADIR%%/data/font_4_0.png
> %%DATADIR%%/data/font_5.fnt
> %%DATADIR%%/data/font_5_0.png
>+%%DATADIR%%/data/music.json
>+%%DATADIR%%/data/music_dirs.json
> %%DATADIR%%/data/npc.tbl
> %%DATADIR%%/data/org/access.org
> %%DATADIR%%/data/org/anzen.org

Actions: View | Diff

Attachments on bug 237136: 203514