From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cGeRMohwVmcHpwAA62LTzQ:P1 (envelope-from ) for ; Mon, 09 Dec 2024 04:22:32 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id cGeRMohwVmcHpwAA62LTzQ (envelope-from ) for ; Mon, 09 Dec 2024 05:22:32 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=eabF7CN9; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="cCgHH/Kc"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733718152; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=UFE+3j9d08qz4TNddAund8JVSqvt84QoZTtfjuiMo7o=; b=jyx92Vl5MiqYXH/5vtNdQzal4NwyoODAtu3AMcjZhjVfMr54hZG/zWlCbIPilXlRu9P04c bXZtEQ4IdO56qCSyOP79MRPAu9tQC94IkFc7nPmijVzsC9iwVtfIz8UE1iX2i19y0aOAms ZipoPx6Fy2kLGMz4fT0XBeiy/fBiTFS1ovvVYqTpMNShsLdN9ckD3GFZGOA/8MIAh3omLL 2ywcSXbwwYfz6Fy/PzLWjAiBPgsRAqXjAhmRfOFgI5EzJealzoOt8kqFPGPDG+8us7oOZp oN8foWjcde0Lsg0lrP60OZ8O+xuRzP35fx2Kzs7dkNOn+mR7tutbu7ILr0Czyw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=eabF7CN9; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b="cCgHH/Kc"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733718152; a=rsa-sha256; cv=none; b=I+NAQOqytY+Aj5MOIrwg8mEwszVYvJkStj1fKs0BOKzNtq4zwNbvieGNboKbcsZEufrCwV dDesD6cnmPriiEgQ95WIlaJBLfKcT37mIDDT4cQTzLCWNm/PIXdz5LbbNRQqXDqzCEoTe+ ihCMYUhDGzM7Z67+3uYZGU8Q+DNybH+RUNuFoja5GbT+fD0FtIERryBEYt/vyUlNL3vfAA l2Z7f/hrMTAC0KnPfX0pr4JstLu1/+aU/nzxDg2r4Vt8+aDEbbjVoHFJTXe7R/wE9uYQ8S 7HSeSVQeSz8hW300zKtmjfnBILkOQaV8Ehmv4XS/X2GjAZvso5tLxLQAqgkgSg== 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 C1B314097F for ; Mon, 09 Dec 2024 05:22:31 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tKVHZ-0006dB-E1; Sun, 08 Dec 2024 23:22:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tKVHX-0006bh-7p for guix-patches@gnu.org; Sun, 08 Dec 2024 23:22:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tKVHW-0008RE-VR for guix-patches@gnu.org; Sun, 08 Dec 2024 23:22:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:In-Reply-To:From:Date:MIME-Version:To:Subject; bh=UFE+3j9d08qz4TNddAund8JVSqvt84QoZTtfjuiMo7o=; b=eabF7CN9VRh2Fqr9sHETg2si0JKG4T/YJceJpwH8+4cz9JGZjVoSMZpp9V5dc/zyLJkI9bfpaUDdQp1yLIISztZofZHofTvhr+Wrhl/c7AWTQYtIBEMfyMAjO9YEEh6bO4MPgb2mIY39tZdKb0TzzOcPbwUZONxilVSiSHwW4GjUymfyiJRwXiYylxATKbC66uQWs8kuBBhRkVpbn5xYW9R4HOvKhsIS7OUQFV+T/icH4IUp1c0FtKbvAR+/91qnCUnM58fEILNivFuAta1GjQU8+15q2tcQBAQUkdPk1OYitR8pUX6aLuk+1ozBQbQzJNT5l4hu2I4qCYydcT1WYw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tKVHW-0003qj-Pa for guix-patches@gnu.org; Sun, 08 Dec 2024 23:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74505] [PATCH] Update freeciv to version 3.1.3 Resent-From: glab Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Dec 2024 04:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74505 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Rodion Goritskov Cc: 74505@debbugs.gnu.org Received: via spool by 74505-submit@debbugs.gnu.org id=B74505.173371810914751 (code B ref 74505); Mon, 09 Dec 2024 04:22:02 +0000 Received: (at 74505) by debbugs.gnu.org; 9 Dec 2024 04:21:49 +0000 Received: from localhost ([127.0.0.1]:52465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKVHF-0003ph-IF for submit@debbugs.gnu.org; Sun, 08 Dec 2024 23:21:48 -0500 Received: from layka.disroot.org ([178.21.23.139]:51218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKOGa-0006ch-2X for 74505@debbugs.gnu.org; Sun, 08 Dec 2024 15:52:39 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E2AC520521; Sun, 8 Dec 2024 21:52:34 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id h72T-n0NYUBT; Sun, 8 Dec 2024 21:52:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1733691150; bh=vtZvkKXunFd97LjvjFFGND0q4Qx5mPMZN6b04e+i96I=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=cCgHH/KcJ+B9+NtY3uCee2Bd3tDdW2EBrnRdipDZwjVkk4WxyNdB4LMP5OyM2hAh/ BggbrOJPI3OuV15i30zRmG+60DU42AcF5lZaCoVi+ElypP5/CQV3UhpUbP5l1QkQXE Id+6FYp/ukW+F44YpX1s79L6vM3TEftd5yAlnzRj1cRdAHlI7TQKF60X6t4lVXPle9 vi7+x8HwQYSn6C8Q+c+EscbYQYS6mIiF/7wk7ZMs8Yl+c6qPUiyOn3w+WZcXimA3Qw FYAi+7iPt4PaMNpsWbj27CMD9vHARmjWvHHK9hMlhvwC8nuiTmTQgaSiNhP777R1pV FBJE42S2Aliog== MIME-Version: 1.0 Date: Sun, 08 Dec 2024 20:52:30 +0000 In-Reply-To: <87frngtll4.fsf@bumblebee-old.mail-host-address-is-not-set> References: <87frngtll4.fsf@bumblebee-old.mail-host-address-is-not-set> Message-ID: <7c5dddb24c595fb17c162006c75a5c00@disroot.org> X-Sender: glab@disroot.org Content-Type: multipart/mixed; boundary="=_032583c9eb66e59ca6d8b2cc90fa7737" X-Mailman-Approved-At: Sun, 08 Dec 2024 23:21:43 -0500 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: , Reply-to: glab X-ACL-Warn: , glab via Guix-patches From: glab via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -0.06 X-Spam-Score: -0.06 X-Migadu-Queue-Id: C1B314097F X-TUID: adUdVb8h4K6Z --=_032583c9eb66e59ca6d8b2cc90fa7737 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2024-11-24 20:37, Rodion Goritskov wrote: > Hi! > > I tried building and running an updated version. > It builds fine, but game has no sound. > >> (inputs >> - (list curl cyrus-sasl gtk+ sdl-mixer zlib)) >> + (list curl cyrus-sasl gtk+ sdl-mixer zlib sqlite)) > > As far as I understand - sdl-mixer version 1 support had been dropped > in > version 3.1.0 [1] > > I tried building with sdl2-mixer instead of sdl-mixer - that fixed the > sound issue. > > Also, I think that dependency list should be sorted alphabetically (it > looks like it was previously). > > [1] - https://web.archive.org/web/https://gna.org/patch/?6246 Hello. Thank you, Rodion, for helping me with this patch. I think I have improved it, based on your feedback. Best regards, -- Gustavo --=_032583c9eb66e59ca6d8b2cc90fa7737 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-Update-freeciv-to-version-3.1.3.patch Content-Disposition: attachment; filename=0001-Update-freeciv-to-version-3.1.3.patch; size=1837 RnJvbSA4OWZlMmQ3NGRlYmFiNDM3Y2U4MTQ3YjQ5Yjc5NDNjMWE5ZWVjMzZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlEOiA8ODlmZTJkNzRkZWJhYjQzN2NlODE0N2I0OWI3OTQz YzFhOWVlYzM2Zi4xNzMzNjkwNzIxLmdpdC5nbGFiK2d1aXhAZGlzcm9vdC5vcmc+CkZyb206IEd1 c3Rhdm8gTGFib3JlaXJvIDxnbGFiK2d1aXhAZGlzcm9vdC5vcmc+CkRhdGU6IFNhdCwgMjMgTm92 IDIwMjQgMjA6MDU6MDkgKzAwMDAKU3ViamVjdDogW1BBVENIXSBVcGRhdGUgZnJlZWNpdiB0byB2 ZXJzaW9uIDMuMS4zCgpUaGlzIGlzIGEgdHJpdmlhbCB1cGRhdGUgdG8gdGhlIHBhY2thZ2UuIEEg bmV3IGRlcGVuZGVuY3kgaXMKaW50cm9kdWNlZCAoc3FsaXRlMykuCgpDaGFuZ2UtSWQ6IElmMGMz NDFiMTc5ZDE3MDQ0MzdmNGJkNzRkZDkyZDgzNGE5MDJjOWI5Ci0tLQogZ251L3BhY2thZ2VzL2dh bWVzLnNjbSB8IDcgKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZ2FtZXMuc2NtIGIvZ251L3Bh Y2thZ2VzL2dhbWVzLnNjbQppbmRleCA5YzczMTZmZi4uNzM0ZWFhM2MgMTAwNjQ0Ci0tLSBhL2du dS9wYWNrYWdlcy9nYW1lcy5zY20KKysrIGIvZ251L3BhY2thZ2VzL2dhbWVzLnNjbQpAQCAtODUs NiArODUsNyBAQAogOzs7IENvcHlyaWdodCDCqSAyMDI0IEphbWVzIFNtaXRoIDxqc3VidW50dXhw QGRpc3Jvb3Qub3JnPgogOzs7IENvcHlyaWdodCDCqSAyMDI0IEphbiBXaWVsa2lld2ljeiA8dG9u YV9rb3NtaWN6bmVnb19zbWllY2lhQGludGVyaWEucGw+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMjQg QXNodml0aCBTaGV0dHkgPGFzaHZpdGhzaGV0dHkxMEBnbWFpbC5jb20+Cis7OzsgQ29weXJpZ2h0 IMKpIDIwMjQgR3VzdGF2byBMYWJvcmVpcm8gPGdsYWIrZ3VpeEBkaXNyb290Lm9yZz4KIDs7Owog Ozs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4LgogOzs7CkBAIC02NzIxLDcgKzY3MjIs NyBAQCAoZGVmaW5lLXB1YmxpYyBrb2JvZGVsdXhlCiAoZGVmaW5lLXB1YmxpYyBmcmVlY2l2CiAg IChwYWNrYWdlCiAgICAobmFtZSAiZnJlZWNpdiIpCi0gICAodmVyc2lvbiAiMy4wLjgiKQorICAg KHZlcnNpb24gIjMuMS4zIikKICAgIChzb3VyY2UKICAgICAob3JpZ2luCiAgICAgIChtZXRob2Qg dXJsLWZldGNoKQpAQCAtNjczMywxMCArNjczNCwxMCBAQCAoZGVmaW5lLXB1YmxpYyBmcmVlY2l2 CiAgICAgICAgICAgICAgICAgICAodmVyc2lvbi1tYWpvcittaW5vciB2ZXJzaW9uKSAiLyIgdmVy c2lvbgogICAgICAgICAgICAgICAgICAgIi9mcmVlY2l2LSIgdmVyc2lvbiAiLnRhci54eiIpKSkK ICAgICAgKHNoYTI1NgotICAgICAgKGJhc2UzMiAiMW0zbnd6MGFhZDZwMzN6dm1kbGRidzM5cml3 Mnhxbjk5YjYzODRidng0NDhjOHBzNm5pdiIpKSkpCisgICAgICAoYmFzZTMyICIwYnZ6NWhxcHBq NTg5dzA4YnpyZnpmNW02bndmd3J6Z2cwM2xxYjNwOGhzcGpreDhjNDNsIikpKSkKICAgIChidWls ZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKICAgIChpbnB1dHMKLSAgICAobGlzdCBjdXJsIGN5 cnVzLXNhc2wgZ3RrKyBzZGwtbWl4ZXIgemxpYikpCisgICAgKGxpc3QgY3VybCBjeXJ1cy1zYXNs IGd0aysgc2RsMi1taXhlciBzcWxpdGUgemxpYikpCiAgICAobmF0aXZlLWlucHV0cwogICAgIChs aXN0IHBrZy1jb25maWcpKQogICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly93d3cuZnJlZWNpdi5vcmcv IikKCmJhc2UtY29tbWl0OiBmMTI2M2Y0MWVkNzQyZDg5YjM1NDI0MWEwNGQxOWMwODQwYjg2YmM0 Ci0tIAoyLjQ2LjAKCg== --=_032583c9eb66e59ca6d8b2cc90fa7737--