From patchwork Tue Mar 26 13:50:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 62252 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EC85D27BBEA; Tue, 26 Mar 2024 15:22:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F1D1E27BBE2 for ; Tue, 26 Mar 2024 15:22:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rp8d5-0006rD-OO; Tue, 26 Mar 2024 11:22:23 -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 1rp8ct-0006og-U0 for guix-patches@gnu.org; Tue, 26 Mar 2024 11:22:13 -0400 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 1rp8cs-0003Lr-2c for guix-patches@gnu.org; Tue, 26 Mar 2024 11:22:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rp8cm-0001ar-9V; Tue, 26 Mar 2024 11:22:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70006] [PATCH] gnu: wesnoth: Update to 1.18.0. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Tue, 26 Mar 2024 15:22:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70006 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70006@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by submit@debbugs.gnu.org id=B.17114664846003 (code B ref -1); Tue, 26 Mar 2024 15:22:04 +0000 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) 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 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-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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 7dfb3155fc4dd37bea93a8704c37e4aff87e5013 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}.")))