From nobody Wed Jan 18 17:32:50 2023 X-Original-To: dev-commits-ports-all@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 4NxtBV2jhKz2sX1w; Wed, 18 Jan 2023 17:32:50 +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 4NxtBV262cz3lkc; Wed, 18 Jan 2023 17:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674063170; 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=i6vp7mQEMprPcI8G2jzdu/YbcDi7hCPyCCrYsCCc/x0=; b=LkGq5g9hfNi1mdwFuyvRVdUwGVReIlzuFCJSNPuMmqWvBLM2c/CntPkKv2jxEzfvEUDmC6 y2+G9W4TOusuqeQrFTe9pkY3GtS6AYbYUit6XgqkTq8D5T2Z2kEU8EklIJA06r+lk3Vjgk Hw0YLEw1F5Kklcwp6RQ248JXL+ytMImvu/h+IWlpgcCK4PanHj/u+h/ez9LBJ587gfmevf L6EQ+7MkGIh+m6hyAV+X4OoCIX7s8X4nCvbusSRKZbso3yv4kc+BvEQKZt30aQ+738bHkT mREU/1AyYtsK0qhHJCcdCxXLeOiTNFIlk6N0KGHDC/WhQ9n+LRWgoFK3IwA3+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674063170; 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=i6vp7mQEMprPcI8G2jzdu/YbcDi7hCPyCCrYsCCc/x0=; b=LC3d5hJ9UGqkWNt/QcDOfFDbqxiQWpRpPicH8v8VSoCvV3xtHB9DFr3PlcxHTn4j9B34d4 pQUpcMY4xCx8G8MHvQvtLV8zHo2vLAAJEApsLZXSY9XwTJDzDzP3iOxTlJQtXxu0Ts61dK 1lkM6pjBRFpNeHJfW4/Zwq8sPun04QrQJjxeaUP+ZVMDUQ+tdpNlVw2ZcBFZIdngZxYItu IAtIlPIr2VNBvRpJ6TBTdspt1OdZl8ZYvx4Fb3m5dOWQ8cPjO+tXGtBLynmpA+C8dyav5y oCm7JRGG95olFP8OWXZ9klt0B4xYSwl402PzIub4IM2AlMr37fvJhWWxeA/ovQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674063170; a=rsa-sha256; cv=none; b=IgBZxOME/u9JpgkWvJmjr2ZMonyXrdr0hm5jyBgLdZGScjDfxpo3DKL0B8iOPOHXjet4es dMXiqCmY/eXeGsplRF6rtF6MVk+qzWJuf8/bIyUD6jtt2wkdE2wBZipSVUmohCmZ9tOO09 xyWSpMJvvUbr2t4Ow5e6g4f+D+TbQE9pUPqStDwHjJmdWOuvi0ifCM0OcAdQh5BDAnLoNL CtxYbJ5l8PvUsDfyMl8EgTVs8PBIdm59LnjpVlBpcLl8YC6xTwNkOjf9KjBDTUriz5B9V4 2c0GVhdnqeDwTslLIk/i7dXaTZVi6oHq9OwDtUqpyQ/9sTKOmO55OgvuDWtByg== 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 4NxtBV174WzKYj; Wed, 18 Jan 2023 17:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30IHWoS6038725; Wed, 18 Jan 2023 17:32:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IHWoRT038724; Wed, 18 Jan 2023 17:32:50 GMT (envelope-from git) Date: Wed, 18 Jan 2023 17:32:50 GMT Message-Id: <202301181732.30IHWoRT038724@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 1500b166eb6a - main - games/wesnoth: update to 1.16.7 release (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1500b166eb6a59a7b2c9b27f8cf59c5b22d45a5c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=1500b166eb6a59a7b2c9b27f8cf59c5b22d45a5c commit 1500b166eb6a59a7b2c9b27f8cf59c5b22d45a5c Author: Dima Panov AuthorDate: 2023-01-18 17:31:29 +0000 Commit: Dima Panov CommitDate: 2023-01-18 17:31:29 +0000 games/wesnoth: update to 1.16.7 release (+) Changelog: https://github.com/wesnoth/wesnoth/blob/1.16/changelog.md --- games/wesnoth/Makefile | 3 +- games/wesnoth/distinfo | 6 ++-- games/wesnoth/files/patch-src_gettext.cpp | 49 ------------------------------- 3 files changed, 4 insertions(+), 54 deletions(-) diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 7ac3ac9bfe83..b384793af4f7 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,6 +1,5 @@ PORTNAME= wesnoth -PORTVERSION= 1.16.6 -PORTREVISION= 2 +PORTVERSION= 1.16.7 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index 3a9ce67a5365..b5800569035e 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662731937 -SHA256 (wesnoth-1.16.6.tar.bz2) = 1fce2c625da53adee4ec62b4e0a810bae1a01c9b893027b10beafaa3a0648501 -SIZE (wesnoth-1.16.6.tar.bz2) = 475677376 +TIMESTAMP = 1674061945 +SHA256 (wesnoth-1.16.7.tar.bz2) = f88b134b2c6ade58f4e5fb4fe459f33870fe336c17edc5772baccb8d60d0ec73 +SIZE (wesnoth-1.16.7.tar.bz2) = 476140035 diff --git a/games/wesnoth/files/patch-src_gettext.cpp b/games/wesnoth/files/patch-src_gettext.cpp deleted file mode 100644 index 1a53f897bad8..000000000000 --- a/games/wesnoth/files/patch-src_gettext.cpp +++ /dev/null @@ -1,49 +0,0 @@ -https://bugs.gentoo.org/886575 -https://github.com/wesnoth/wesnoth/issues/7215 - -From d71e90ee50a89673cf9b6748bcb2975071d15445 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Mon, 28 Nov 2022 23:21:38 +0700 -Subject: [PATCH] gettext: fix build with Boost.Locale 1.81 - -See https://github.com/boostorg/locale/pull/128/ - -(cherry picked from commit fd96415bdf0a2e3a05e1a587a1c3853847e2c2bc) ---- src/gettext.cpp -+++ src/gettext.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #if defined(__GNUC__) - #pragma GCC diagnostic push -@@ -224,8 +225,13 @@ namespace - } - - generator_.use_ansi_encoding(false); -+#if BOOST_VERSION < 108100 - generator_.categories(bl::message_facet | bl::information_facet | bl::collation_facet | bl::formatting_facet | bl::convert_facet); - generator_.characters(bl::char_facet); -+#else -+ generator_.categories(bl::category_t::message | bl::category_t::information | bl::category_t::collation | bl::category_t::formatting | bl::category_t::convert); -+ generator_.characters(bl::char_facet_t::char_f); -+#endif - // We cannot have current_locale_ be a non boost-generated locale since it might not supply - // the bl::info facet. As soon as we add message paths, update_locale_internal might fail, - // for example because of invalid .mo files. So make sure we call it at least once before adding paths/domains -@@ -368,7 +374,12 @@ namespace - if(std::has_facet>(current_locale_)) { - res << "has bl::collator facet, "; - } -+#if BOOST_VERSION < 108100 - res << "generator categories='" << generator_.categories() << "'"; -+#else -+ res << "generator categories='" << -+ static_cast::type>(generator_.categories()) << "'"; -+#endif - return res.str(); - } -