From patchwork Wed May 24 13:38:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Deslauriers, Douglas via Guix-patches\" via" X-Patchwork-Id: 50271 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 8AC3A27BBE9; Wed, 24 May 2023 14:39:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 0C3E427BBE2 for ; Wed, 24 May 2023 14:39:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1oho-0006td-U4; Wed, 24 May 2023 09:39:09 -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 1q1ohj-0006pi-VA for guix-patches@gnu.org; Wed, 24 May 2023 09:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1ohj-0003bo-NV for guix-patches@gnu.org; Wed, 24 May 2023 09:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1ohi-0001ev-AI; Wed, 24 May 2023 09:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63682] [PATCH 2/2] gnu: warzone2100: Rewrite package arguments to G-expressions. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 24 May 2023 13:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63682@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 63682-submit@debbugs.gnu.org id=B63682.16849355386367 (code B ref 63682); Wed, 24 May 2023 13:39:02 +0000 Received: (at 63682) by debbugs.gnu.org; 24 May 2023 13:38:58 +0000 Received: from localhost ([127.0.0.1]:42799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1ohe-0001ed-9z for submit@debbugs.gnu.org; Wed, 24 May 2023 09:38:58 -0400 Received: from mail.envs.net ([5.199.136.28]:36868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1ohb-0001eU-LZ for 63682@debbugs.gnu.org; Wed, 24 May 2023 09:38:56 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id D3E2E38A18A0; Wed, 24 May 2023 13:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1684935534; bh=pbFXAAX3PkeZFq+aqRBYw+AfHnYcmKqdGXkMfGrvdAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PcMK+keLXXDSUjj2Xcx9Jbw9U0mSb0501NZ/R3zh+l9pSsAEDDmDHf11J881w3cqZ o0ajQvsSI3uC0+cmKyjWrdN7VtvgatMCfQHkF/EfWN7dOkPiLqCfDM9nXtQPMc4qCK Wnm1EmekNT7Pn3S7N4FQGoITk+rtFrnvfAWNrqaDV+1JtEA3O7f3KPgM29i3PAu2ux AVnILyArydG6Tx2E/dtslUaTX/aTXKOPwcS7Qg3XRK+Dl/KkNmuoAE04yYSDO2M5o3 B+2ZGj1qh26lGrRT59ZgEFR2t/249WO46z98G4WcT6Hu+FajvQ8OTAiBIclYO0UQIM gRPKrNe33wCi6bymXQj5tv2vfyXKfjxHdPwK2r19NaOi6koNYRfClFhhYbtVFZwaVM S4a01FRzJN0bjgneB9plaEqQpyqyGBtkkuGWPsg0p/7JZed1Mp7o9HHJ2iCuRA/4QX mrA6ZUqIG8rYyD7+mpzTo3H7IXrOnTQbDXO4J+UajKD8L47rkhBTRIu4tfTKg19zuc 7u7JkcUc8SzVlPhy8uAUGveO8VNDbX1ScbkMBlWdmPgzt9qSX8axPRDiv4Gvyfb5jK IJpXWxAjGT6riAu6U768p7/ocm4IzvnZ40UNSg1Uc1K0Rv0Asa4KgBexlBxali5NIH qOkAgxvLVdKKCBUSUPRcDrUE= 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 loa93sO9y0ZF; Wed, 24 May 2023 13:38:51 +0000 (UTC) Received: from localhost (unknown [36.170.57.133]) (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; Wed, 24 May 2023 13:38:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 24136701; Wed, 24 May 2023 13:38:47 +0000 (UTC) Date: Wed, 24 May 2023 21:38:35 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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: "Deslauriers, Douglas 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 (warzone2100)[arguments]: Convert to list of G-expressions. --- gnu/packages/games.scm | 47 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index eb3e0eb842..86382f7080 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5414,30 +5414,29 @@ (define-public warzone2100 #t)))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DWZ_DISTRIBUTOR=Guix" - "-DWZ_ENABLE_BACKEND_VULKAN=off" - "-DENABLE_DISCORD=off") - #:tests? #f ; TODO: Tests seem to be broken, configure.ac is missing. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-utfcpp-include - (lambda _ - (substitute* "lib/framework/wzstring.cpp" - (("") "")) - #t)) - (add-after 'unpack 'link-tests-with-qt - (lambda _ - (substitute* "tests/Makefile.am" - (("(framework_linktest_LDADD|maptest_LDADD) = " prefix) - (string-append prefix "$(QT5_LIBS) "))) - #t)) - (add-after 'unpack 'fix-ivis-linktest - (lambda _ - (substitute* "tests/ivis_linktest.cpp" - (("iV_DrawTextRotated.*;") - (string-append "iV_DrawTextRotated(\"Press ESC to exit.\", " - "100, 100, 0.0f, font_regular);"))) - #t))))) + (list #:configure-flags #~'("-DWZ_DISTRIBUTOR=Guix" + "-DWZ_ENABLE_BACKEND_VULKAN=off" + "-DENABLE_DISCORD=off") + #:tests? #f ; TODO: Tests seem to be broken, configure.ac is missing. + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-utfcpp-include + (lambda _ + (substitute* "lib/framework/wzstring.cpp" + (("") + "")))) + (add-after 'unpack 'link-tests-with-qt + (lambda _ + (substitute* "tests/Makefile.am" + (("(framework_linktest_LDADD|maptest_LDADD) = " + prefix) + (string-append prefix "$(QT5_LIBS) "))))) + (add-after 'unpack 'fix-ivis-linktest + (lambda _ + (substitute* "tests/ivis_linktest.cpp" + (("iV_DrawTextRotated.*;") + (string-append + "iV_DrawTextRotated(\"Press ESC to exit.\", " + "100, 100, 0.0f, font_regular);")))))))) (native-inputs (list asciidoc ruby-asciidoctor gettext-minimal