From unknown Sun Jun 15 08:12:32 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#70006 <70006@debbugs.gnu.org> To: bug#70006 <70006@debbugs.gnu.org> Subject: Status: [PATCH] gnu: wesnoth: Update to 1.18.0. Reply-To: bug#70006 <70006@debbugs.gnu.org> Date: Sun, 15 Jun 2025 15:12:32 +0000 retitle 70006 [PATCH] gnu: wesnoth: Update to 1.18.0. reassign 70006 guix-patches submitter 70006 iyzsong@envs.net severity 70006 normal tag 70006 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 26 11:21:24 2024 Received: (at submit) by debbugs.gnu.org; 26 Mar 2024 15:21:24 +0000 Received: from localhost ([127.0.0.1]:34450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rp8c8-0001Yg-8H for submit@debbugs.gnu.org; Tue, 26 Mar 2024 11:21:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:49758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rp8c3-0001X1-HM for submit@debbugs.gnu.org; Tue, 26 Mar 2024 11:21:21 -0400 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 1rp7Bw-0002Tj-Ro for guix-patches@gnu.org; Tue, 26 Mar 2024 09:50:16 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rp7Bt-0000RW-U1 for guix-patches@gnu.org; Tue, 26 Mar 2024 09:50:16 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 77F6938A589A; Tue, 26 Mar 2024 13:50:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1711461010; bh=lmgbbxm6Xeqfi21iPCijWhTHiJCZcoOcXfqWKA8eJ2o=; h=From:To:Cc:Subject:Date:From; b=IQXRaL+7BsOk8F0LmNocsGEQ78TxKXfwRdv0DOpovEh39hyPypALIY2GsYnLwGYf8 89+nsewyyFC/16RyRqV5gWA9fYwok5Fu9lc/HD1bV5gDtmy4HqOOk8jQeXHfsdLz/x mzr5Quahef+X6TWqxz8urennI7fmIPUr0dko3yH/Oka0a/Y0ohcTH5EbSc1q0gEAVK Pm9R610203CUzChdzTLKQ0cFodrOfSCQcdIuhjQfw+CvHf1lAMpH9O7wVURGaeTYnS 7MHOn5UloMn4YrJRLdp/qbGDuyUgVadVYEcwCmSmjHJtuXd8bjruHSP1BeiHQ6Ecnu 6TAn7hEzLCqopVd6NsLBY6JBwt1ybz5YvnTTKSTrUjSqBX4z7SdEZglrdnB6tWmpbJ mGyl3Z8om2OvbLTyms7n8NB9DrYC1M61e6tPNNNx+0hjYi7ikblZH3l5D0D55HZR2D jSQmmfGDkhMjxpkRW2oRwnkAgyzXVWRmy6kxtMiIfol0N5FMiAcO3hKmHrY1BDc7bg X8Nc9zqFwftOYnMdmIhCaEfpoyRPsQQnSVt6swdKPTRB0/DGHcBpZD256hvusd03Pf VyKxLCs6+I4vhrGL2l4FTp4y0Fk5Rufjv0Tc0I5WTj2dDmdCtIK1JY6OSatEZ68E/o 4ldd9MPb+bF4WUm3hi/25VTk= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id UunBxEPJ4Lhi; Tue, 26 Mar 2024 13:50:06 +0000 (UTC) Received: from localhost (unknown [36.170.45.227]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 26 Mar 2024 13:50:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id dca92cd9; Tue, 26 Mar 2024 13:50:44 +0000 (UTC) From: iyzsong@envs.net To: guix-patches@gnu.org Subject: [PATCH] gnu: wesnoth: Update to 1.18.0. Date: Tue, 26 Mar 2024 21:50:38 +0800 Message-ID: <64ba1c7c4bd0d6ff447374c32446f7096a1e1ffa.1711460910.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) From: 宋文武 * gnu/packages/games.scm (wesnoth): Update to 1.18.0. [arguments]: Pass "-DENABLE_SYSTEM_LUA=ON" to 'configure-flags'. Add phases. [inputs]: Remove fribidi, sdl-union, sdl2-ttf. Add curl, lua-5.4. [native-inputs]: Add python-minimal. (wesnoth-server): Update to 1.18.0. [inputs]: Remove sdl2. Add lua-5.4. [native-inputs]: Replace with pkg-config. [arguments]: Rewrite with 'substitute-keyword-arguments'. Change-Id: I1ee4237dbbaeeb9d5a93637d740fbf4dba0922d2 --- gnu/packages/games.scm | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f150c33e83..5ae22716b1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4613,7 +4613,7 @@ (define-public gnujump (define-public wesnoth (package (name "wesnoth") - (version "1.16.11") + (version "1.18.0") (source (origin (method git-fetch) (uri (git-reference @@ -4622,21 +4622,36 @@ (define-public wesnoth (file-name (git-file-name name version)) (sha256 (base32 - "0z0y2il4xq8fdj20fwfggpf6286hb099jh1kdywap9rlrybq142d")))) + "0ar0zkyl4rzqgambmdqhklscx478liql1k458ax64bp4xw441kfc")))) (build-system cmake-build-system) (arguments - (list #:tests? #f)) ;no test target + (list #:tests? #f ;no test target + #:configure-flags #~'("-DENABLE_SYSTEM_LUA=ON") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + ;; XXX: Our Lua doesn't have a C++ library, force C linkage. + (substitute* '("src/lua/wrapper_lua.h" + "src/lua/wrapper_lualib.h" + "src/lua/wrapper_lauxlib.h") + (("#include \"(lua|lualib|lauxlib)\\.h\"") + "#include \"lua.hpp\""))))))) (inputs (list boost + curl dbus - fribidi libvorbis + lua-5.4 openssl pango - (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))) + sdl2 + sdl2-image + sdl2-mixer)) (native-inputs (list gettext-minimal - pkg-config)) + pkg-config + python-minimal)) (home-page "https://www.wesnoth.org/") (synopsis "Turn-based strategy game") (description @@ -4655,10 +4670,13 @@ (define-public wesnoth-server (inherit wesnoth) (name "wesnoth-server") (inputs - (list boost icu4c openssl sdl2)) + (list boost icu4c lua-5.4 openssl)) + (native-inputs + (list pkg-config)) (arguments - `(#:configure-flags '("-DENABLE_GAME=OFF") - ,@(package-arguments wesnoth))) + (substitute-keyword-arguments (package-arguments wesnoth) + ((#:configure-flags _) + #~'("-DENABLE_SYSTEM_LUA=ON" "-DENABLE_GAME=OFF")))) (synopsis "Dedicated @emph{Battle for Wesnoth} server") (description "This package contains a dedicated server for @emph{The Battle for Wesnoth}."))) base-commit: 7dfb3155fc4dd37bea93a8704c37e4aff87e5013 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 27 09:02:47 2024 Received: (at submit) by debbugs.gnu.org; 27 Mar 2024 13:02:47 +0000 Received: from localhost ([127.0.0.1]:36117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpSvT-0003Xc-2S for submit@debbugs.gnu.org; Wed, 27 Mar 2024 09:02:47 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpSvN-0003XA-5P for submit@debbugs.gnu.org; Wed, 27 Mar 2024 09:02:41 -0400 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 1rpSv8-0007zI-9U for guix-patches@gnu.org; Wed, 27 Mar 2024 09:02:25 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpSv6-00005h-OY for guix-patches@gnu.org; Wed, 27 Mar 2024 09:02:22 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 1C1DC27BBE2; Wed, 27 Mar 2024 13:02:20 +0000 (GMT) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 2a9411e7; Wed, 27 Mar 2024 13:02:19 +0000 (UTC) References: <64ba1c7c4bd0d6ff447374c32446f7096a1e1ffa.1711460910.git.iyzsong@member.fsf.org> User-agent: mu4e 1.10.8; emacs 29.1 From: Christopher Baines To: iyzsong@envs.net Subject: Re: [bug#70006] [PATCH] gnu: wesnoth: Update to 1.18.0. Date: Wed, 27 Mar 2024 13:02:01 +0000 In-reply-to: <64ba1c7c4bd0d6ff447374c32446f7096a1e1ffa.1711460910.git.iyzsong@member.fsf.org> Message-ID: <87bk6zg750.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: guix-patches@gnu.org, =?utf-8?B?5a6L5paH5q2m?= , Adam Faiz , 70006-done@debbugs.gnu.org, Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable iyzsong--- via Guix-patches via writes: > From: =E5=AE=8B=E6=96=87=E6=AD=A6 > > * gnu/packages/games.scm (wesnoth): Update to 1.18.0. > [arguments]: Pass "-DENABLE_SYSTEM_LUA=3DON" to 'configure-flags'. Add p= hases. > [inputs]: Remove fribidi, sdl-union, sdl2-ttf. Add curl, lua-5.4. > [native-inputs]: Add python-minimal. > (wesnoth-server): Update to 1.18.0. > [inputs]: Remove sdl2. Add lua-5.4. > [native-inputs]: Replace with pkg-config. > [arguments]: Rewrite with 'substitute-keyword-arguments'. > > Change-Id: I1ee4237dbbaeeb9d5a93637d740fbf4dba0922d2 > --- > gnu/packages/games.scm | 36 +++++++++++++++++++++++++++--------- > 1 file changed, 27 insertions(+), 9 deletions(-) Looks good to me, I've pushed this to master as e9a547d2c57e22bea0b6da6cc67d423ff9d47b07. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYEGNtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XegQw//eNnqAj2VDShuI0fGo7Mp/wRHEkwSbq2f MCOznTFB5XeCzwXARpVgnajP4A0SqxK7VPBNgbM4/Gwro1q5tvoVTdJmAiqxM/GE snVIOwEwZWm+wgWzMzuurSZYJnOZcLDRY4PI7TCLCi6ydnjxXPoSjbAeMw6BLEKD S+gDn9VFNBOohev5MeaebYFJC8rBtdluypvNMT6779hxAAZzUQ7bx1mwvGR8gZvR uZHxI6Y46SyIg3DmkV7q5NFZvgmeF+90jsblGyF7BHzY7PnJZXEoYphMabTcFh75 5ZHXb2FZYQ2lBLKuu23YCU/dIjKwFXUFv6nlgXSn3nYj8d61iGS3EEr47g18AI+l OoAbrKGnFWsXfxfVl1eo+GQr+WaEYmwQRJSWWAZ8Kd3AwiuZ2LZPj8Nz0T0amgll CYDhDnTF1ZGFTHzKM8w6vokBczN3g949wCA08YGgC+4qIcRo08+xnpAa/spYNhhd T9x5fbaTNiDq/rJgBhQBrfcBdODXyFKPP6B9L84xHF4cviFKZjX1VasAHDinRTNU FtpFSaoU23gyP513RwE2War37a6W7OqjuH81QgIi9XFGICE7rGnY4YcgZk6aop8T 4e5ahnS/F3J5/qHn0RI4OgonPoPuxdh4A0aK7H+epKJ3KitQJB3s/0k3QFXvUGS8 8+337NcQvtQ= =BwOU -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 08:12:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 25 Apr 2024 11:24:53 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator