Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715866723242540"
MIME-Version: 1.0
Date: Thu, 16 May 2024 13:38:43 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/fifengine
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240516133843.1A926FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715866723242540
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu May 16 13:38:43 UTC 2024

Modified Files:
	pkgsrc/devel/fifengine: Makefile distinfo
Added Files:
	pkgsrc/devel/fifengine/patches:
	    patch-engine_core_gui_fifechan_fifechanmanager.cpp
	    patch-engine_core_loaders_native_map_atlasloader.cpp
	    patch-engine_core_loaders_native_map_maploader.cpp
	    patch-engine_core_loaders_native_map_objectloader.cpp

Log Message:
fifengine: fix build with boost 1.85

From an upstream problem report - it builds, but if you use it,
please verify it works.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/fifengine/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/fifengine/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/fifengine/patches/patch-engine_core_gui_fifechan_fifechanmanager.cpp \
    pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_atlasloader.cpp \
    pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_maploader.cpp \
    pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_objectloader.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1715866723242540
Content-Disposition: inline
Content-Length: 6935
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/fifengine/Makefile
diff -u pkgsrc/devel/fifengine/Makefile:1.30 pkgsrc/devel/fifengine/Makefile:1.31
--- pkgsrc/devel/fifengine/Makefile:1.30	Sun May  5 21:33:43 2024
+++ pkgsrc/devel/fifengine/Makefile	Thu May 16 13:38:42 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2024/05/05 21:33:43 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2024/05/16 13:38:42 wiz Exp $
 
 DISTNAME=	fifengine-0.4.2
-PKGREVISION=	26
+PKGREVISION=	27
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fifengine/}
 
@@ -10,9 +10,6 @@ HOMEPAGE=	https://www.fifengine.net/
 COMMENT=	Multi-platform isometric game engine
 LICENSE=	gnu-lgpl-v2.1
 
-# https://github.com/fifengine/fifengine/issues/1085
-BROKEN=		"Doesn't support boost-1.85"
-
 TOOL_DEPENDS+=	swig3>=3.0:../../devel/swig3
 
 .include "../../lang/python/extension.mk"

Index: pkgsrc/devel/fifengine/distinfo
diff -u pkgsrc/devel/fifengine/distinfo:1.4 pkgsrc/devel/fifengine/distinfo:1.5
--- pkgsrc/devel/fifengine/distinfo:1.4	Sun Jan  9 15:30:24 2022
+++ pkgsrc/devel/fifengine/distinfo	Thu May 16 13:38:42 2024
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.4 2022/01/09 15:30:24 wiz Exp $
+$NetBSD: distinfo,v 1.5 2024/05/16 13:38:42 wiz Exp $
 
 BLAKE2s (fifengine-0.4.2.tar.gz) = 8286aae95f0a05ffb3f97559d26f66202590b74e145a023896ba762fb74e3d1b
 SHA512 (fifengine-0.4.2.tar.gz) = 2b92e936d3f900532c5dee235a217c338941c44da479dceb3e48b3e8b93a402b31dc5501a6533391a01af53d6dbd51b6793c74e8ac81301ae6f1fa18271761a4
 Size (fifengine-0.4.2.tar.gz) = 15713939 bytes
 SHA1 (patch-CMakeLists.txt) = 5cc3ade95e7011c460107d87d95f4001dc563ae2
+SHA1 (patch-engine_core_gui_fifechan_fifechanmanager.cpp) = c7abc87a89e617d28d027d4080a263ed0f364f8a
+SHA1 (patch-engine_core_loaders_native_map_atlasloader.cpp) = 74bda50720bcf018bf3fd624bd8c4d1ccadedd85
+SHA1 (patch-engine_core_loaders_native_map_maploader.cpp) = 8255e16bcc0b727c222917a165a257cae521203f
+SHA1 (patch-engine_core_loaders_native_map_objectloader.cpp) = 4ea4dc2fb62dec6c0ca053d7e719d6fd835a56a0
 SHA1 (patch-engine_core_vfs_zip_zipnode.cpp) = da9ac52079b7808efac8b8ba3acd22b3cc76e94a

Added files:

Index: pkgsrc/devel/fifengine/patches/patch-engine_core_gui_fifechan_fifechanmanager.cpp
diff -u /dev/null pkgsrc/devel/fifengine/patches/patch-engine_core_gui_fifechan_fifechanmanager.cpp:1.1
--- /dev/null	Thu May 16 13:38:43 2024
+++ pkgsrc/devel/fifengine/patches/patch-engine_core_gui_fifechan_fifechanmanager.cpp	Thu May 16 13:38:42 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-engine_core_gui_fifechan_fifechanmanager.cpp,v 1.1 2024/05/16 13:38:42 wiz Exp $
+
+boost 1.85 support.
+https://github.com/fifengine/fifengine/issues/1085#issuecomment-2115210942
+
+--- engine/core/gui/fifechan/fifechanmanager.cpp.orig	2019-01-11 17:24:38.000000000 +0000
++++ engine/core/gui/fifechan/fifechanmanager.cpp
+@@ -249,7 +249,9 @@ namespace FIFE {
+ 
+ 		IFont* font = NULL;
+ 		GuiFont* guifont = NULL;
+-		if( bfs::extension(fontpath) == ".ttf" || bfs::extension(fontpath) == ".ttc" ) {
++                bfs::path p = fontpath;
++                std::string s = p.extension().string();
++                if( s == ".ttf" || s == ".ttc" ) {
+ 			font = new TrueTypeFont(fontpath, fontsize);
+ 		} else {
+ 			font = new SubImageFont(fontpath, fontglyphs);
Index: pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_atlasloader.cpp
diff -u /dev/null pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_atlasloader.cpp:1.1
--- /dev/null	Thu May 16 13:38:43 2024
+++ pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_atlasloader.cpp	Thu May 16 13:38:42 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-engine_core_loaders_native_map_atlasloader.cpp,v 1.1 2024/05/16 13:38:42 wiz Exp $
+
+boost 1.85 support.
+https://github.com/fifengine/fifengine/issues/1085#issuecomment-2115210942
+
+--- engine/core/loaders/native/map/atlasloader.cpp.orig	2019-01-11 17:24:38.000000000 +0000
++++ engine/core/loaders/native/map/atlasloader.cpp
+@@ -312,7 +312,8 @@ namespace FIFE {
+ 				atlasElem->QueryValueAttribute("subimage_width", &subimageWidth);
+ 				atlasElem->QueryValueAttribute("subimage_height", &subimageHeight);
+ 				// file extension of the atlas is also used as subimage extension
+-				std::string extension = bfs::extension(*atlasSource);
++                                    bfs::path p = *atlasSource;
++                                    std::string extension = p.extension().string();
+ 				// we need an atlas id
+ 				if (!atlasId) {
+ 					atlasId = atlasSource;
Index: pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_maploader.cpp
diff -u /dev/null pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_maploader.cpp:1.1
--- /dev/null	Thu May 16 13:38:43 2024
+++ pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_maploader.cpp	Thu May 16 13:38:42 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-engine_core_loaders_native_map_maploader.cpp,v 1.1 2024/05/16 13:38:42 wiz Exp $
+
+boost 1.85 support.
+https://github.com/fifengine/fifengine/issues/1085#issuecomment-2115210942
+
+--- engine/core/loaders/native/map/maploader.cpp.orig	2019-01-11 17:24:38.000000000 +0000
++++ engine/core/loaders/native/map/maploader.cpp
+@@ -838,7 +838,9 @@ namespace FIFE {
+ 			for (iter = files.begin(); iter != files.end(); ++iter) {
+ 				// TODO - vtchill - may need a way to allow clients to load things other
+ 				// than .xml and .zip files
+-				std::string ext = bfs::extension(*iter);
++				    bfs::path p = *iter;
++                                    std::string ext = p.extension().string();
++
+ 				if (ext == ".xml" || ext == ".zip") {
+ 					loadImportFile(*iter, importDirectoryString);
+ 				}
Index: pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_objectloader.cpp
diff -u /dev/null pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_objectloader.cpp:1.1
--- /dev/null	Thu May 16 13:38:43 2024
+++ pkgsrc/devel/fifengine/patches/patch-engine_core_loaders_native_map_objectloader.cpp	Thu May 16 13:38:42 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-engine_core_loaders_native_map_objectloader.cpp,v 1.1 2024/05/16 13:38:42 wiz Exp $
+
+boost 1.85 support.
+https://github.com/fifengine/fifengine/issues/1085#issuecomment-2115210942
+
+--- engine/core/loaders/native/map/objectloader.cpp.orig	2019-01-11 17:24:38.000000000 +0000
++++ engine/core/loaders/native/map/objectloader.cpp
+@@ -702,7 +702,9 @@ namespace FIFE {
+ 			for (iter = files.begin(); iter != files.end(); ++iter) {
+ 				// TODO - vtchill - may need a way to allow clients to load things other
+ 				// than .xml and .zip files
+-				std::string ext = bfs::extension(*iter);
++                                    bfs::path p = *iter;
++                                    std::string ext = p.extension().string();
++				
+ 				if (ext == ".xml" || ext == ".zip") {
+ 					loadImportFile(*iter, importDirectoryString);
+ 				}


--_----------=_1715866723242540--