Date: Tue, 14 Nov 2023 17:23:42 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ac839566c450 - main - games/rlvm: Fix build with utf8cpp 4.0.0+ Message-ID: <202311141723.3AEHNgLj084897@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac839566c450dbec17cf06867fd323ebe1086092 commit ac839566c450dbec17cf06867fd323ebe1086092 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-11-14 16:53:48 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-11-14 17:16:49 +0000 games/rlvm: Fix build with utf8cpp 4.0.0+ --- games/rlvm/Makefile | 2 +- games/rlvm/files/patch-utf8cpp | 99 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/games/rlvm/Makefile b/games/rlvm/Makefile index 425e271a1621..da5f9fe51577 100644 --- a/games/rlvm/Makefile +++ b/games/rlvm/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi BROKEN_FreeBSD_12_powerpc64= fails to link on powerpc64 elfv1: gcn_platform.cc: undefined reference to gcn::Exception::Exception BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ - utf8cpp>0:devel/utf8cpp + utf8cpp>=4.0.0:devel/utf8cpp LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libvorbisfile.so:audio/libvorbis \ libguichan.so:devel/guichan diff --git a/games/rlvm/files/patch-utf8cpp b/games/rlvm/files/patch-utf8cpp new file mode 100644 index 000000000000..0d12cd2e93d1 --- /dev/null +++ b/games/rlvm/files/patch-utf8cpp @@ -0,0 +1,99 @@ +--- src/long_operations/textout_long_operation.cc.orig 2021-05-27 12:59:29 UTC ++++ src/long_operations/textout_long_operation.cc +@@ -39,7 +39,7 @@ + #include "systems/base/text_page.h" + #include "systems/base/text_system.h" + #include "utilities/exception.h" +-#include "utf8cpp/utf8.h" ++#include "utf8.h" + + // Timing information must stay the same between individual + // TextoutLongOperations. rlBabel compiled games will always display one +--- src/machine/rlvm_instance.cc.orig 2021-05-27 12:59:29 UTC ++++ src/machine/rlvm_instance.cc +@@ -43,7 +43,7 @@ + #include "systems/base/graphics_system.h" + #include "systems/base/system_error.h" + #include "systems/sdl/sdl_system.h" +-#include "utf8cpp/utf8.h" ++#include "utf8.h" + #include "utilities/exception.h" + #include "utilities/file.h" + #include "utilities/find_font_file.h" +--- src/modules/module_sys_save.cc.orig 2021-05-27 12:59:29 UTC ++++ src/modules/module_sys_save.cc +@@ -54,7 +54,7 @@ + #include "systems/base/surface.h" + #include "systems/base/system.h" + #include "libreallive/intmemref.h" +-#include "utf8cpp/utf8.h" ++#include "utf8.h" + + using boost::starts_with; + using boost::ends_with; +--- src/systems/base/text_page.cc.orig 2021-05-27 12:59:29 UTC ++++ src/systems/base/text_page.cc +@@ -35,7 +35,7 @@ + #include "systems/base/system.h" + #include "systems/base/text_system.h" + #include "systems/base/text_window.h" +-#include "utf8cpp/utf8.h" ++#include "utf8.h" + #include "utilities/exception.h" + #include "utilities/string_utilities.h" + +--- src/systems/base/text_system.cc.orig 2021-05-27 12:59:29 UTC ++++ src/systems/base/text_system.cc +@@ -49,7 +49,7 @@ + #include "systems/base/text_key_cursor.h" + #include "systems/base/text_page.h" + #include "systems/base/text_window.h" +-#include "utf8cpp/utf8.h" ++#include "utf8.h" + #include "utilities/exception.h" + #include "utilities/string_utilities.h" + +--- src/systems/base/text_window.cc.orig 2021-05-27 12:59:29 UTC ++++ src/systems/base/text_window.cc +@@ -45,7 +45,7 @@ + #include "systems/base/system_error.h" + #include "systems/base/text_system.h" + #include "systems/base/text_waku.h" +-#include "utf8cpp/utf8.h" ++#include "utf8.h" + #include "utilities/exception.h" + #include "utilities/graphics.h" + #include "utilities/string_utilities.h" +--- src/systems/sdl/sdl_text_window.cc.orig 2021-05-27 12:59:29 UTC ++++ src/systems/sdl/sdl_text_window.cc +@@ -43,7 +43,7 @@ + #include "systems/sdl/sdl_system.h" + #include "systems/sdl/sdl_text_system.h" + #include "systems/sdl/sdl_utils.h" +-#include "utf8cpp/utf8.h" ++#include "utf8.h" + #include "utilities/exception.h" + #include "utilities/string_utilities.h" + +--- src/utilities/string_utilities.cc.orig 2021-05-27 12:59:29 UTC ++++ src/utilities/string_utilities.cc +@@ -31,7 +31,7 @@ + + #include "encodings/codepage.h" + #include "utilities/exception.h" +-#include "utf8cpp/utf8.h" ++#include "utf8.h" + + using std::string; + using std::wstring; +--- test/test_system/test_text_system.cc.orig 2021-05-27 12:59:29 UTC ++++ test/test_system/test_text_system.cc +@@ -33,7 +33,7 @@ + #include "test_system/mock_surface.h" + #include "test_system/mock_text_window.h" + #include "test_system/test_text_window.h" +-#include "utf8cpp/utf8.h" ++#include "utf8.h" + + TestTextSystem::TestTextSystem(System& system, Gameexe& gexe) + : TextSystem(system, gexe) {}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311141723.3AEHNgLj084897>