From nobody Mon Mar 14 15:07:20 2022 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 099E01A0E2FC; Mon, 14 Mar 2022 15:07:21 +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 4KHKdh4ncQz3nnv; Mon, 14 Mar 2022 15:07:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647270440; 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=cPVQy6loi+VfZpT/AXI18dz3qhBkzKXrrX2CyLVT+Mw=; b=Z0PoZxvjtm/grx7YOoAbZYWQXfvHX/Jr929j2bWA8mCmlHTeZui7DyyihfRo1BI+2m7aJ2 IJg7Py2W+XIn145r8GD+pYXXmU4weyhGWLIZRdrmUZLtI21dB3B5GtYNcQzghimQB3IODs zkpJqH+MZ2ZPDFkc/knx7pglVYxUnBkS2/s7D4lKMNd2g1r2nJ/sDPRrnqMW+MvdoflRyi zKgExCSI8BI8/kVllnGL5PK1En7+DjtBZVhoOjfTHuq4kSV/ChjcspvBu/9nAjfpIoX2q8 KySd2/zCAbxQI9NWg4B5eiglWp2n12Wqogrnm5pGOmQKjJRFviXgp6BpGAgBlg== 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 803F275CF; Mon, 14 Mar 2022 15:07:20 +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 22EF7KQn079860; Mon, 14 Mar 2022 15:07:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22EF7KrR079859; Mon, 14 Mar 2022 15:07:20 GMT (envelope-from git) Date: Mon, 14 Mar 2022 15:07:20 GMT Message-Id: <202203141507.22EF7KrR079859@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 10513cca9b4a - main - =?utf-8?Q?games/wyrmgus: update 5.3.4 =E2=86=92 5.3.5?= 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10513cca9b4a45a9a18654235f44fa1648a9ecb4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647270440; 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=cPVQy6loi+VfZpT/AXI18dz3qhBkzKXrrX2CyLVT+Mw=; b=GkfsVR3hbHA/DSG/MB2KneGbdjMF9b2dDfL4qSW0YrHfFc6khIImmyZ0ryIj48VZgktOQD esoix4qHNNA+vBzVAsKuA3K3TcYItMG4x9/DzjQJWEUjStitZ3awboGuNYcc5DeVoAxKdP eV1mJNv0gHdWW+namQOyZ5kgi4xMjQD6zuS3i2D6HHMprvWezovV8ZpIFYAa9urRlFeB5X bcJ8NXIjY1rOwWrkB8nVRQUENvSyiHRCS0R2vNIJh4CbAPC0VI8X7B4BZ3f8kt9vbavB1d 6LBex70ewXv0zJHzdNjN0URRQ6n4l8x5tnjKMZ1itcV4L+uDF4NDP9wUpkV3cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647270440; a=rsa-sha256; cv=none; b=tUr+ivEhIoNU7lTWw6WJwIaS+QgcOvLABPNiVJVF0mO8tzXpOfrPonUHbeTkKV3cKUVO2Z eA1GrCP65lg0xHApTGjo3Q2fEWTNKVLfWJNZ3mvJbjKhzXbInJ+Z6P6QaIuQIcwQAyu8ji hWteA3dX7XZBAl4ohlZ4aHfQjDhGqQhdlyHR+rlnuj98LPQnQhaZp0r36It17/1hcjahSB wbTXvHpt/L8AhkkfYmk5Uwx14dGV1OjT2mOGEd2wnsvGjjkf4hPbfr22e+BweO+86US2ip coU5u0gjK0ouohpf39vRLug/i8ET1Ln3daqcdk0ZK8ZEsSEc0t+uOv6cv6Xd7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=10513cca9b4a45a9a18654235f44fa1648a9ecb4 commit 10513cca9b4a45a9a18654235f44fa1648a9ecb4 Author: Dmitry Marakasov AuthorDate: 2022-03-14 11:13:32 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-14 15:06:41 +0000 games/wyrmgus: update 5.3.4 → 5.3.5 --- games/wyrmgus/Makefile | 2 +- games/wyrmgus/distinfo | 6 +++--- games/wyrmgus/files/patch-src_map_world.cpp | 13 +++++++++++++ .../files/patch-src_util_container__random_util.h | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile index f0a0c35413ac..fc670615a21c 100644 --- a/games/wyrmgus/Makefile +++ b/games/wyrmgus/Makefile @@ -1,7 +1,7 @@ # Created by: Travis Poppe PORTNAME= wyrmgus -PORTVERSION= 5.3.4 +PORTVERSION= 5.3.5 DISTVERSIONPREFIX= v CATEGORIES= games devel diff --git a/games/wyrmgus/distinfo b/games/wyrmgus/distinfo index cd8c750707e8..290f5ba61d17 100644 --- a/games/wyrmgus/distinfo +++ b/games/wyrmgus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644230937 -SHA256 (Andrettin-Wyrmgus-v5.3.4_GH0.tar.gz) = ebcfb54f166146d91a262ba808bf80e4a9777096fdc527759607ccac6fe4cfd7 -SIZE (Andrettin-Wyrmgus-v5.3.4_GH0.tar.gz) = 1609796 +TIMESTAMP = 1647210067 +SHA256 (Andrettin-Wyrmgus-v5.3.5_GH0.tar.gz) = 5728dc65910052cf41ba7421d5b75dfa0f2744fc301083405646b9ccaa259a64 +SIZE (Andrettin-Wyrmgus-v5.3.5_GH0.tar.gz) = 1632599 diff --git a/games/wyrmgus/files/patch-src_map_world.cpp b/games/wyrmgus/files/patch-src_map_world.cpp new file mode 100644 index 000000000000..b6ba8229f1f5 --- /dev/null +++ b/games/wyrmgus/files/patch-src_map_world.cpp @@ -0,0 +1,13 @@ +--- src/map/world.cpp.orig 2022-03-13 19:52:08 UTC ++++ src/map/world.cpp +@@ -147,7 +147,9 @@ std::string world::get_encyclopedia_text() const + ++supertaxon_counts[rank_supertaxon]; + } + +- for (const auto &[supertaxon, count] : supertaxon_counts) { ++ for (const auto &supertaxon_count : supertaxon_counts) { ++ const auto& supertaxon = supertaxon_count.first; ++ const auto& count = supertaxon_count.second; + if (count <= 1) { + continue; + } diff --git a/games/wyrmgus/files/patch-src_util_container__random_util.h b/games/wyrmgus/files/patch-src_util_container__random_util.h new file mode 100644 index 000000000000..7f823767777b --- /dev/null +++ b/games/wyrmgus/files/patch-src_util_container__random_util.h @@ -0,0 +1,18 @@ +--- src/util/container_random_util.h.orig 2022-03-13 19:52:08 UTC ++++ src/util/container_random_util.h +@@ -31,13 +31,13 @@ + namespace wyrmgus::container { + + template +-inline const T::value_type &get_random(const T &container) ++inline const typename T::value_type &get_random(const T &container) + { + return container[random::get()->generate(container.size())]; + } + + template +-inline const T::value_type &get_random_async(const T &container) ++inline const typename T::value_type &get_random_async(const T &container) + { + return container[random::get()->generate_async(container.size())]; + }