From nobody Tue Aug 30 18:56:12 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 4MHGjp0xgjz4b6Lf; Tue, 30 Aug 2022 18:56:14 +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 4MHGjn0Pfgz3NgK; Tue, 30 Aug 2022 18:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661885773; 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=MT0m/CFIE/sqPOdCtY9mU2sGYp3CGpD8XEJAlhh1Igw=; b=NGQaCh/7L0cglA9byp6WfpuDoFAWHEkwdw4BWYXxFAP0iVFVbKIMzuJZ4dOQWiGdNUQbKJ vhL0DdRPRgUmVTBhIEtSWFiQRwqSvT42ynZBjxCYsB9pj/JzSUFnx137cxs7dUQPHGoWAz GZcnYCiPJKuPvsHau/B6R0mL3UNG5uGX8aBoaozoXXj4JpHksOoue8wY7HiVJIOwP1G+1h Fuo0i1uBE47rySRrETwQv35Ntsv3aG29O5eEkDIYFO6ECb3KYSlI6vlcFWgVtlEMoxZ/GF Glc8sxySTqWob5Y1+rbV2m7j6kTkWdAQXI3/kDUYdV2hwP9sodCrd5YbG922ZQ== 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 4MHGjm6c5gzsQ0; Tue, 30 Aug 2022 18:56:12 +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 27UIuCiT036560; Tue, 30 Aug 2022 18:56:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27UIuCHM036559; Tue, 30 Aug 2022 18:56:12 GMT (envelope-from git) Date: Tue, 30 Aug 2022 18:56:12 GMT Message-Id: <202208301856.27UIuCHM036559@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: a529a35a72f1 - main - =?utf-8?Q?games/wyrmgus:=20update=205.3.5=20=E2=86=92=205.3.6?= 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: a529a35a72f1ca20c55781861ac94d1daf8c3938 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661885773; 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=MT0m/CFIE/sqPOdCtY9mU2sGYp3CGpD8XEJAlhh1Igw=; b=wl2JqCcyeUZfU7dcaO7bTA/4+CrdlH+i9zmpspwHTJzNSZ9O9YL1bJtmnq7+ookuC8nXJn llAK+3J5BkCEgcjN/5VfK05acqbjaqEPYx7xebEVH/SqtZPaZcAWtGaAsuKReZx74a5inC 0SG9FSGW6K7zLXW2kbbsOx69pGWsWktfAd9NR3IEtaOO/KjQEnIQTXSmM0jPJ8/IoGm0kN bLtZYD4SMyobBNgc2GcpPndWqklMVtk9dNi6C/JnDPV4WpNS5vdh9G84sFhk7MriK9WKiy X1GRgi5WA8wqb7dzdl3Cggjtc6KHK6q8voythHie8B6rSWSo8BzpdwTM9G3Rbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661885773; a=rsa-sha256; cv=none; b=A36b/WFuxaaJ0DDta6kqZOw2DHnCOmkH3LR2j0uB1OxzXY246ZYL3ux4YzAQ0qLvp4TKjq b9wWjs4sLvgG/qPoWP0Fh3Qoqxd4F5RiIPBDSNFGKGutQuw75nKLyPnuP06YNOvtPHBUwt zhVUZgR1opAQ2BKocNGNq7ufn8PeBfx6lB2VvkbH6MFZVUucvtT6a+qnxVSu/j/rujUOCO JqAodacQEeAlItD4/irQoIyCB2lMDf5zIKvbeC+YjPSLORJBLeqGMoYmXGdcyWdudoG5IG +orLoFiXftQWDnyTbSGUvulLHLvIu4WrvKvkhBFCJCjaHtxeSzrkHM0neFX/JA== 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=a529a35a72f1ca20c55781861ac94d1daf8c3938 commit a529a35a72f1ca20c55781861ac94d1daf8c3938 Author: Dmitry Marakasov AuthorDate: 2022-08-30 16:55:49 +0000 Commit: Dmitry Marakasov CommitDate: 2022-08-30 18:55:07 +0000 games/wyrmgus: update 5.3.5 → 5.3.6 --- games/wyrmgus/Makefile | 3 +- games/wyrmgus/distinfo | 6 +-- .../patch-260d0ee71b3e8339d159658bb02c2cb1e4ff8def | 43 ++++++++++++++++++++++ .../wyrmgus/files/patch-src_stratagus_translator.h | 11 ++++++ .../files/patch-src_util_container__random_util.h | 18 --------- 5 files changed, 58 insertions(+), 23 deletions(-) diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile index 40bfde9b4f01..91f36194b697 100644 --- a/games/wyrmgus/Makefile +++ b/games/wyrmgus/Makefile @@ -1,6 +1,5 @@ PORTNAME= wyrmgus -PORTVERSION= 5.3.5 -PORTREVISION= 1 +PORTVERSION= 5.3.6 DISTVERSIONPREFIX= v CATEGORIES= games devel diff --git a/games/wyrmgus/distinfo b/games/wyrmgus/distinfo index 290f5ba61d17..7139080fc94c 100644 --- a/games/wyrmgus/distinfo +++ b/games/wyrmgus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647210067 -SHA256 (Andrettin-Wyrmgus-v5.3.5_GH0.tar.gz) = 5728dc65910052cf41ba7421d5b75dfa0f2744fc301083405646b9ccaa259a64 -SIZE (Andrettin-Wyrmgus-v5.3.5_GH0.tar.gz) = 1632599 +TIMESTAMP = 1660163342 +SHA256 (Andrettin-Wyrmgus-v5.3.6_GH0.tar.gz) = d3678d4a01534f2331da879de3c099d36f89e9bb37baa225b5b170b57c9f97c9 +SIZE (Andrettin-Wyrmgus-v5.3.6_GH0.tar.gz) = 1631729 diff --git a/games/wyrmgus/files/patch-260d0ee71b3e8339d159658bb02c2cb1e4ff8def b/games/wyrmgus/files/patch-260d0ee71b3e8339d159658bb02c2cb1e4ff8def new file mode 100644 index 000000000000..737cbe86ddc1 --- /dev/null +++ b/games/wyrmgus/files/patch-260d0ee71b3e8339d159658bb02c2cb1e4ff8def @@ -0,0 +1,43 @@ +From 260d0ee71b3e8339d159658bb02c2cb1e4ff8def Mon Sep 17 00:00:00 2001 +From: Andrettin <6322423+Andrettin@users.noreply.github.com> +Date: Tue, 30 Aug 2022 18:31:42 +0200 +Subject: [PATCH] Fixed in-game game loading + +--- + src/game/game.cpp | 5 +++++ + src/game/loadgame.cpp | 2 +- + src/stratagus/mainloop.cpp | 5 ----- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/game/game.cpp b/src/game/game.cpp +index 27184e5d1..d0adcdacf 100644 +--- src/game/game.cpp ++++ src/game/game.cpp +@@ -866,6 +866,11 @@ boost::asio::awaitable StartMap(const std::filesystem::path &filepath, con + + Gui->setTop(oldTop); + vector::remove(Containers, container); ++ ++ if (!load_game_file.empty()) { ++ engine_interface::get()->load_game_deferred(load_game_file); ++ load_game_file.clear(); ++ } + } catch (...) { + std::throw_with_nested(std::runtime_error("Error running map \"" + path::to_string(filepath) + "\".")); + } +diff --git a/src/stratagus/mainloop.cpp b/src/stratagus/mainloop.cpp +index e356e46c8..0da8a174c 100644 +--- src/stratagus/mainloop.cpp ++++ src/stratagus/mainloop.cpp +@@ -451,11 +451,6 @@ static boost::asio::awaitable SingleGameLoop() + DisplayLoop(); + co_await GameLogicLoop(); + } +- +- if (!load_game_file.empty()) { +- engine_interface::get()->load_game_deferred(load_game_file); +- load_game_file.clear(); +- } + } + + /** diff --git a/games/wyrmgus/files/patch-src_stratagus_translator.h b/games/wyrmgus/files/patch-src_stratagus_translator.h new file mode 100644 index 000000000000..f6a8458bfa60 --- /dev/null +++ b/games/wyrmgus/files/patch-src_stratagus_translator.h @@ -0,0 +1,11 @@ +--- src/stratagus/translator.h.orig 2022-08-08 17:14:50 UTC ++++ src/stratagus/translator.h +@@ -26,6 +26,8 @@ + + #pragma once + ++#include ++ + #include "util/singleton.h" + + #include diff --git a/games/wyrmgus/files/patch-src_util_container__random_util.h b/games/wyrmgus/files/patch-src_util_container__random_util.h deleted file mode 100644 index 7f823767777b..000000000000 --- a/games/wyrmgus/files/patch-src_util_container__random_util.h +++ /dev/null @@ -1,18 +0,0 @@ ---- 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())]; - }