From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UKbuKceP2mB/GgAAgWs5BA (envelope-from ) for ; Tue, 29 Jun 2021 05:13:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wHqpJceP2mC+JAAAB5/wlQ (envelope-from ) for ; Tue, 29 Jun 2021 03:13:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B9428177D9 for ; Tue, 29 Jun 2021 05:13:10 +0200 (CEST) Received: from localhost ([::1]:43080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ly4BR-0006W2-P6 for larch@yhetil.org; Mon, 28 Jun 2021 23:13:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ly4BL-0006Vr-2p for guix-patches@gnu.org; Mon, 28 Jun 2021 23:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ly4BK-0000CF-Rd for guix-patches@gnu.org; Mon, 28 Jun 2021 23:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ly4BK-0001Ck-J1 for guix-patches@gnu.org; Mon, 28 Jun 2021 23:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46695] [PATCH 0/2] Update 0ad to 0.0.24-alpha References: <871rd9f6g0.fsf@cbaines.net> In-Reply-To: <871rd9f6g0.fsf@cbaines.net> Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Jun 2021 03:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "46695@debbugs.gnu.org" <46695@debbugs.gnu.org> Received: via spool by 46695-submit@debbugs.gnu.org id=B46695.16249363364578 (code B ref 46695); Tue, 29 Jun 2021 03:13:02 +0000 Received: (at 46695) by debbugs.gnu.org; 29 Jun 2021 03:12:16 +0000 Received: from localhost ([127.0.0.1]:53325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ly4Aa-0001Bm-Fd for submit@debbugs.gnu.org; Mon, 28 Jun 2021 23:12:16 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:53310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ly4AW-0001BV-KX for 46695@debbugs.gnu.org; Mon, 28 Jun 2021 23:12:14 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4GDTzV6WFyzQjhn for <46695@debbugs.gnu.org>; Tue, 29 Jun 2021 05:12:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1624936325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=XhqNJv3WXTE1EiNJGht9LuvBX94BQhYA0efVQDREnlQ=; b=eGFNHyYW69eLIJQ1EWi9K59CsF/t+3C7BxkREIjKeplVeIoqXCRSgjQIf0af9WJqZUSYNi Vwi5S+D3MEgFkn5WigbqQCyFxsk+5L6myUM1iBLimvXURke/qM0DFoo2JE9ECvCwGIl1aA NOmFgX5fOr42jcy6kC87q8JNylHPbp7PyiiuO8SRwUk79C3qoVLQogv29ajcaYt01QrDL9 mh1xKRwz6wdHiH+Tog5JvFeCQHk2WH8E4I9m7dCtlJyD8acxiRIIS8Am5IUL53mufXXjJ4 pMa0NG4VcAZ8nQmg+WA8ExK/W9r6jShmPRjB51t0NJmxIxx9AylvthArAi0sRQ== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id G9WM6tz_Bdvp for <46695@debbugs.gnu.org>; Tue, 29 Jun 2021 05:12:03 +0200 (CEST) Date: Tue, 29 Jun 2021 05:12:02 +0200 (CEST) From: Brendan Tildesley Message-ID: <830239188.255753.1624936322642@office.mailbox.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_255752_1108403817.1624936322550" X-Priority: 3 Importance: Normal X-MBO-SPAM-Probability: X-Rspamd-Score: -4.20 / 15.00 / 15.00 X-Rspamd-Queue-Id: ACB311857 X-Rspamd-UID: 11f179 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624936391; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=XhqNJv3WXTE1EiNJGht9LuvBX94BQhYA0efVQDREnlQ=; b=H896nygqbnNKyZGx502ZbcjA4aKdDCAlpYfX4+rqWepSh5Le1SsmdP1d8RHpybUcclLHjs lAviopK4QL2L9HoAtoeNNwfVxAsQ2z8U31V7UdN6UBQwR236cJ/mgt1zZW/E5APAiaVDUZ HGIj7N92ZqaO/hKQz9mOTqc2ELaaYOPUQE2mNivYj7QSOOgUE+oUpVjm+eon3uMsMoYBbw qDuUFGHEhCGrOzfWweQ2OfEhPayIbfgWT53wdo2mo+XMXlTidraeh3gPj9CwkgASXuuvIb kTHrlACvdvHgcuxYSjwVtNn7zC1iPAecOvfxdorYSi2JCDW5X49PuKUojtxKdA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624936391; a=rsa-sha256; cv=none; b=SWC5/68Na7LFQcvUulP8NYc7uVZEgxDwosWKetCG297ATZpWVr5wxgyZh8lTyHyPIHkIrz 2cLgIlbNHCHuu1QKPnAqlfU09eGFGWl2/HG+rlgnGK1CKcY9yrD3XPhdcCD9EkH9CXbQWl uXyrir1fQHbU6inFISx3ihgux7hfeXG+jXbtcJ2YQYIrr+w9MwEUtRzujSNOp8ZtjG5upW ZW1jDA0lVmjQhDx8Z5vZXMYyhIwjeOkMkYhvZdiV4a6zWlXdIxyOptbu0NL7AQeRMAm85C GSwfS0Ox6FQoZJwSBfmV4nUax2/lYUhjws3boGi7yEpdN3er9rgV331qmpaCeQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=eGFNHyYW; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b=eGFNHyYW; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: B9428177D9 X-Spam-Score: -0.32 X-Migadu-Scanner: scn1.migadu.com X-TUID: AiS0nGnxOR5T ------=_Part_255752_1108403817.1624936322550 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit This change to the patch above fixes the game. I was able to play many games and it runs better than the 23 alpha. However the tests segfault so I disabled them. Christopher said he doesn't have time for this at the moment, could a reviewer rebase this change on and test it? thanks. ------=_Part_255752_1108403817.1624936322550 Content-Type: text/x-patch; charset=ISO-8859-1; name=0001-0ad-fix.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-0ad-fix.patch X-Part-Id: 10d4632cba1040308a421bcb6027694b RnJvbSA4NTBhODUxMWMyZTY1ZDU1OGZkODhmMzEyNTFlMDZjNWEzNDdmYTlmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcmVuZGFuIFRpbGRlc2xleSA8bWFpbEBicmVuZGFuLnNjb3Q+ CkRhdGU6IFR1ZSwgMjkgSnVuIDIwMjEgMTM6MDQ6NDQgKzEwMDAKU3ViamVjdDogW1BBVENIXSAw YWQgZml4CgotLS0KIGdudS9wYWNrYWdlcy9nYW1lcy5zY20gfCAzICsrLQogMSBmaWxlIGNoYW5n ZWQsIDIgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNr YWdlcy9nYW1lcy5zY20gYi9nbnUvcGFja2FnZXMvZ2FtZXMuc2NtCmluZGV4IDJlYjI0MDEzOGIu LjBlNjA1MzYyMTcgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9nYW1lcy5zY20KKysrIGIvZ251 L3BhY2thZ2VzL2dhbWVzLnNjbQpAQCAtNjcwOCw3ICs2NzA4LDcgQEAgZmlnaHQgYWdhaW5zdCB0 aGVpciBwbG90IGFuZCBzYXZlIGhpcyBmZWxsb3cgcmFiYml0cyBmcm9tIHNsYXZlcnkuIikKICAg ICAgICAgICAgICAgICh4ei1wYXRoIChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgJWJ1aWxkLWlu cHV0cyAieHoiKSAiL2JpbiIpKSkKICAgICAgICAgICAgKHNldGVudiAiUEFUSCIgeHotcGF0aCkK ICAgICAgICAgICAgKG1rZGlyIG91dCkKLSAgICAgICAgICAgKGludm9rZSB0YXIgInh2ZiIgc291 cmNlICItQyIgb3V0ICItLXN0cmlwPTMiKSkpKSkKKyAgICAgICAgICAgKGludm9rZSB0YXIgInh2 ZiIgc291cmNlICItQyIgb3V0ICItLXN0cmlwPTIiKSkpKSkKICAgICAoc3lub3BzaXMgIkRhdGEg ZmlsZXMgZm9yIDBhZCIpCiAgICAgKGRlc2NyaXB0aW9uICIwYWQtZGF0YSBwcm92aWRlcyB0aGUg ZGF0YSBmaWxlcyByZXF1aXJlZCBieSB0aGUgZ2FtZSAwYWQuIikKICAgICAoaG9tZS1wYWdlICJo dHRwczovL3BsYXkwYWQuY29tIikKQEAgLTY3NjcsNiArNjc2Nyw3IEBAIGZpZ2h0IGFnYWluc3Qg dGhlaXIgcGxvdCBhbmQgc2F2ZSBoaXMgZmVsbG93IHJhYmJpdHMgZnJvbSBzbGF2ZXJ5LiIpCiAg ICAgKGJ1aWxkLXN5c3RlbSBnbnUtYnVpbGQtc3lzdGVtKQogICAgIChhcmd1bWVudHMKICAgICAg YCgjOm1ha2UtZmxhZ3MgJygiY29uZmlnPXJlbGVhc2UiICJ2ZXJib3NlPTEiICItQyIgImJ1aWxk L3dvcmtzcGFjZXMvZ2NjIikKKyAgICAgICAjOnRlc3RzPyAjZiAgICAgICAgICAgICAgICAgICAg ICA7OyBUZXN0cyBzZWdmYXVsdAogICAgICAgICM6cGhhc2VzCiAgICAgICAgKG1vZGlmeS1waGFz ZXMgJXN0YW5kYXJkLXBoYXNlcwogICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdwYXRjaC0v VXNlcnMvd2ZnLXJlZmVyZW5jZXMKLS0gCjIuMzIuMAoK ------=_Part_255752_1108403817.1624936322550--