From nobody Tue Nov 14 17:23:42 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 4SVCnV4yg5z51bFR; Tue, 14 Nov 2023 17:23:42 +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 4SVCnV2v1Rz3HNn; Tue, 14 Nov 2023 17:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982622; 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=va+WRCk6eaMGpWDJ2nP+oE6fJU00kr2aZGd6+jPoDjM=; b=Cl302jPgdfypQViJy5xNC3cwxOeqqCThkyQNEOAlV1hBJKF+VtXwkURGGxS0AF4Fo+2OOc UKZUDNbc1goKUhNhMM1ABsxmYB4ZQ/1H0i8loqP3Utj855IPAUxCpISj9F/HuAKFt9+GNJ kk5xkDAVk5b+lXhJFqvXRG0m51ckezxEW3micI6LPbDArYuE6meaL3ylHP69BpK9Wn2/th pG9Pbm1bExp5Vfmc04+7llZFRoWQczQ4XxLSSzffrFFmK227KdYJ6SHG4IdO3D5zCxgdiW wmNY1nHpikZhaL9z419UBBnnnn+KT66LNxJMhMuw4lt9cYYd/qy0QtsaMkI2eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982622; 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=va+WRCk6eaMGpWDJ2nP+oE6fJU00kr2aZGd6+jPoDjM=; b=gm2Gx6WRcdtSiuVc+3PV0aj7l/K02cU0N/d6Ldfa9qH6NnuxDJHttIWumed8RRiJ2R9H02 AL0SU1Psn3MQBWJ/eEyueffMcOtPPMclxvKXQr+nWMg8EO7J5AcphUgO1p4+JHwYIkPWfN Fm2h990domA1C8DKUBmcaZQRMZWtwE63q20k89lObslQpVfP6zWT2sngaryriNazEAEX7f GqzyNu6D1hxS5bYc9YKVfN2QbddDVnoCPMQlrYQ+XCDy8T7yr8R+7+5qTUVT2EO+XXZtqA Mw8aVlHDtLoAsjVxfSv/HsfgLagGg+VwaHhQYHHg7QXk1ft1Yj3/GqCk1HB2QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699982622; a=rsa-sha256; cv=none; b=hoTeX73RDegm5J1aC1vPVUkl0RGxMqGPVnu3CmznH3pvSzt0u+il+WPJxsLp5utU7XjRgz 0/chxjkQTD/2L0y8equeA/sRx4YlNwqUeZH0t9tFIF4MeCT60zLq9pVuB9wUWGsMWGuNNe 2qvusIOgLJXc1C0eIa5I5mXrf1GhGfQ2k/lHRgHYzRN5wBMG7BRD6NDUMjAh7e/qCo9IvI Bt88zys4ke25rxRuhqBL05c1Usk21+q1BgcTl1hC8GNhbkRJY/lZdN7mkd6PHNWg+OKo8J Ug3Tf7BiAmYmCddnvbduPg0ulR0qvvhRuACpWJb4s7HX5U/UmM3WdA9XrzDWDA== 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 4SVCnV20LLzxnN; Tue, 14 Nov 2023 17:23:42 +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 3AEHNgjT084900; Tue, 14 Nov 2023 17:23:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEHNgLj084897; Tue, 14 Nov 2023 17:23:42 GMT (envelope-from git) Date: Tue, 14 Nov 2023 17:23:42 GMT Message-Id: <202311141723.3AEHNgLj084897@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: ac839566c450 - main - games/rlvm: Fix build with utf8cpp 4.0.0+ 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: ac839566c450dbec17cf06867fd323ebe1086092 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac839566c450dbec17cf06867fd323ebe1086092 commit ac839566c450dbec17cf06867fd323ebe1086092 Author: Po-Chuan Hsieh AuthorDate: 2023-11-14 16:53:48 +0000 Commit: Po-Chuan Hsieh 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) {}