From nobody Thu Dec 14 06:09:10 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SrMPM0rCcz53TkG; Thu, 14 Dec 2023 06:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SrMPL6RY0z3Qtq; Thu, 14 Dec 2023 06:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702534150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JIvx29NV0ND7Ps12selgNMLreZjzfK9lQohvLz5ckd8=; b=btdOXTS1nFet4AXHcxHbTpQLwGyiXtPas8sYeFEhVqg6FbyV7bgyIhoWIhFD16xqngR+jh DCP+Grw1LSv9pi7Rf6ac0CMLcxCPZI+JfUOTY3A0Q6cfTFBXJ6xbLKLPKhmXz74ciOi0Jw FczLIsM7qYGvcuHx2nVzS2xGBTzwteISZylDWGBiMBsGPWofWYHfZz5St0QSVBiAk8GCuw yVxzIoMdhe/u8a65r3ab+voyBHSrmkJeZLp9SVOEP1emRYD0Vjxm2eupAf/6YdGVkSGSd+ RH5ct2nW+TkXFKH9AKjzLxq+HlJXBREo3YJHfMa/sWVFV5ZvFntOaDbw1T9lXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702534151; a=rsa-sha256; cv=none; b=EUZVZNSoYSSdlWbN8Xa9kxhZzzrxn5WGafbvgKK4GM2c0s7a+ui95Ag6EpznsQiThwZmjI bT9nP4kwrohvO/7CX79baHbzzDYN5K77/fXG2U7Lm3RGCTqjjgqTr5iGNfJCMezw/AYRks aNTzTUzfx/GQxCU6ShjCTCjcne83uKoLCB7ZZabJBOiD7RwWEoJBm/VnXhbg4ybYtqbV3m sClhgFN/p/oDRA2xEHJ0U8qsb0FLdCl+Tsk3P+4uwE/i7oidrZxo0sNeuID7T6GauqmkOw bDHxOHWjaUi8VrxA3w9ghZeeCBgPE+EjObmEGX+Ze/27Jobqh6k9G6bljyXtOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702534151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JIvx29NV0ND7Ps12selgNMLreZjzfK9lQohvLz5ckd8=; b=o7W2yRpS/EXJSgY8o0rcIN3/g/DpR6pkMt87CvJoe43BdCbGfYqGoziyoedvjLUYQ2LL2p 5hkktdGgXyoc/NbZ8Gkb5/aFdpPiTnnWpROaYgbAlHBzxy4JlldXNaA/+fcaiYfT/oFcHk dRyBvnZw5KriCriPPfaFsCy3pm7tqPigNFC05ULrA05XfOJeavDBxjwPKvhhbwbqeteFrX hSTKgztmNlMcuyTi812/uxm2zC4Ovdy+UM+XKcw6WI1aPVOe7BLL94mOEzo4HrXPbmGIcN 1+EjTJdYNfkrqR7PRDDd1pPQhG7ENwfeei4Cih7RYYzhZvJKKHAR5S+6f3/j6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SrMPL27GlzcG; Thu, 14 Dec 2023 06:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BE69A7c006954; Thu, 14 Dec 2023 06:09:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BE69AGm006951; Thu, 14 Dec 2023 06:09:10 GMT (envelope-from git) Date: Thu, 14 Dec 2023 06:09:10 GMT Message-Id: <202312140609.3BE69AGm006951@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 419a1eb49424 - main - games/rlvm: Fix build with utf8cpp 4.0.3+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 419a1eb49424c25ff3e081206ed345a36ebc4d9f Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=419a1eb49424c25ff3e081206ed345a36ebc4d9f commit 419a1eb49424c25ff3e081206ed345a36ebc4d9f Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 05:41:31 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 05:49:04 +0000 games/rlvm: Fix build with utf8cpp 4.0.3+ - Update version requirement of BUILD_DEPENDS to avoid using utf8cpp 4.0.2 utf8cpp 3.* installs to ${PREFIX}/include/utf8cpp/. utf8cpp 4.0.{0,1,2} changes to ${PREFIX}/include/. utf8cpp 4.0.3 changes back to ${PREFIX}/include/utf8cpp/. --- games/rlvm/Makefile | 2 +- games/rlvm/files/patch-utf8cpp | 99 ------------------------------------------ 2 files changed, 1 insertion(+), 100 deletions(-) diff --git a/games/rlvm/Makefile b/games/rlvm/Makefile index da5f9fe51577..f6c4ec555214 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>=4.0.0:devel/utf8cpp + utf8cpp>=4.0.3: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 deleted file mode 100644 index 0d12cd2e93d1..000000000000 --- a/games/rlvm/files/patch-utf8cpp +++ /dev/null @@ -1,99 +0,0 @@ ---- 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) {}