From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 6E22LLhv7WVVEgEAqHPOHw:P1 (envelope-from ) for ; Sun, 10 Mar 2024 09:30:48 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 6E22LLhv7WVVEgEAqHPOHw (envelope-from ) for ; Sun, 10 Mar 2024 09:30:48 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=FXs9K0TY; 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=1710059448; 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: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=YHo5Lt1OUBcLnyLGGQ4/Kf/aJG0jUsbTmeES1mQOJlg=; b=JwBtoL5fu1u0izrbpdmhzWVCcnZLMuPkIdxYndTPx7JD2wwWJCFgTFiYZeoHcTbsrXN2MM kgbEWInDyJklOlXfKA4aYA3iyMTME13HbBv6+GQ4iHC1G9IEeqXWlZhfFgDun/FTyuh3US 9n0UDtRrZNHVP4kyswFSkLBLQrb+gspcmtNHQ7P4DVswlmlDd8HWxJwHg/A0AylW1TJqgW XGcz7zGh8VrRoj/2FjwsqnJt3+QpTzpyb9k4cIxCp33jFrrIinN/QQI7w9fQ60RVDWJ0oQ P+siE1dN6Vw/EzTdPA6ExmZvhyX6EbXhRytigdgB9UAt5Sx8mPC0Dl812o488w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=FXs9K0TY; 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=1710059448; a=rsa-sha256; cv=none; b=CyzdGGGA6AFIEf0N5sU62cdk3x7BdqJdUUoKPsvG0bWiILxl8zv9rQAel3qA/VuiNpysGg E3pewWw23OCUZilFVHqCBR7s4iZqeLwd31SeU7MUeRggPWy2rTOshBnh7+jWH9AxJ1ZK0H be1XKFUpRWjDLWxd9N6YYKKWxETS0U4e7lZwgFsa2kJ8tWEHRJAjpxx8uQ2O3v6WlxkBqY RxCP3tul4wlKo91qKRhnR0mXnS7z9IxNQl/xkudHJ/pITbii+eDiRuk9ihxNZKYR44DCGf nKjTCPYCHTPFU+OUDV7lhantwHsRXWVn/GGZNAhmziJrI7f711/+qeDUOcijGg== 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 845BE3D445 for ; Sun, 10 Mar 2024 09:30:47 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjEZl-0002Ev-Sk; Sun, 10 Mar 2024 04:30:33 -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 1rjEZj-0002Ea-Rc for guix-patches@gnu.org; Sun, 10 Mar 2024 04:30:31 -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 1rjEZh-0008Hc-E4 for guix-patches@gnu.org; Sun, 10 Mar 2024 04:30:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rjEaE-0005xX-GC; Sun, 10 Mar 2024 04:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69705] [PATCH] gnu: freegish: Update to 0-3.caf58a2f9. 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: Sun, 10 Mar 2024 08:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69705@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by submit@debbugs.gnu.org id=B.171005941722848 (code B ref -1); Sun, 10 Mar 2024 08:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Mar 2024 08:30:17 +0000 Received: from localhost ([127.0.0.1]:35600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjEZU-0005wR-Uq for submit@debbugs.gnu.org; Sun, 10 Mar 2024 04:30:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:52134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjEZS-0005wI-Me for submit@debbugs.gnu.org; Sun, 10 Mar 2024 04:30:15 -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 1rjEYv-00029f-97 for guix-patches@gnu.org; Sun, 10 Mar 2024 04:29:41 -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 1rjEYh-00081E-7m for guix-patches@gnu.org; Sun, 10 Mar 2024 04:29:41 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 2BA1438A071C; Sun, 10 Mar 2024 08:29:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1710059364; bh=YHo5Lt1OUBcLnyLGGQ4/Kf/aJG0jUsbTmeES1mQOJlg=; h=From:To:Cc:Subject:Date:From; b=FXs9K0TYc94QWp76HZbIiKfOqyJJ+FHQrdgFmA7kZH4JEoG9slexSIgs8SwHqz2Iv ZqK5r8ZZ3t3kk3EA6MNNJAGGWWR+i1NGxov73DipJvMGxwb0LS0E2HCwHXVr8UA5gE C4sRJ1dBaQJkkxfDnNdzPIyi5cpubERpX8z4+bZAjg/faI06hBEcF+b5HFfMpRY9MV nDRnw+xUt7ZUU16Wkca4eimGNLSh6vIkCR+4g+4yEjqj5dOXUobR+9g5WY3SEyXgEs K+ZrMFLKmvL/b/87dza3eoGqC9HY9NAng/pY+UKFH6GHTl6AihqIeqFZ+Zf7L5kcaD 1DcNNEt5MszrXpwyE2d8qz3d/S/3hrE4OoFn26R01CUDezft3ozv2HDhyxwVf5FgSt IzqGvjmpk/sHIeSU4eUVsTGM1bgJySk/TvWjFxH/ZwxSPVht7xzGf9hPf48nA1nEoM CmzRh/uqaBtdtifFcdKEM9EpHL358wJsIvcdg9bclUAG7cnGeIHGZmXhhjWW+6utnz yTQLpQfo94lDkvPfBfbLIgGysiMWFH256vMSwrZ75ndNXCijJTATq/G0VGTgjuVGY2 sZjVnPEAEpD/uD0ioAcg3OVwxKE8q+KtnLJ5PchiYbGyg4BIuqbWezTr27bZ/fJU/J bvzANKKfXQtOJVYwYPlQZ1yo= 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 xKJi5Nc_TyVn; Sun, 10 Mar 2024 08:29:20 +0000 (UTC) Received: from localhost (unknown [36.170.57.203]) (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; Sun, 10 Mar 2024 08:29:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 0a7071c8; Sun, 10 Mar 2024 08:29:39 +0000 (UTC) Date: Sun, 10 Mar 2024 16:29:36 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham 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 From: iyzsong--- 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.48 X-Spam-Score: -5.48 X-Migadu-Queue-Id: 845BE3D445 X-Migadu-Scanner: mx13.migadu.com X-TUID: Wg28A+s/Z+es From: 宋文武 * gnu/packages/games.scm (freegish): Update to 0-3.caf58a2f9. [inputs]: Replace sdl-union with sdl2. Remove zlib. [arguments]: Adjust configure-flags, remove unneeded phases. Change-Id: I43883bd3de985dc337e244a810214ea5ae6aabd1 --- gnu/packages/games.scm | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9ff08e5e74..0fb7f5889e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6654,8 +6654,8 @@ (define-public megaglest (license license:gpl2+))) (define-public freegish - (let ((commit "21977ee5fc2008231b35160df00efe954c508b16") - (revision "2")) + (let ((commit "caf58a2f990a939230bab82226e29cd79732f366") + (revision "3")) (package (name "freegish") (version (string-append "0-" revision "." (string-take commit 9))) @@ -6667,7 +6667,7 @@ (define-public freegish (file-name (git-file-name name version)) (sha256 (base32 - "1qh0gcnbyxyzmb13jifwba4xrzj94m4w9whdvl0gnds6ricmwply")) + "0980ad8xg0bzm6507bq9sbgw03i7jj33g0f955g0q8jvpb22r65v")) (modules '((guix build utils))) ;; The audio files in the "music" directory are licensed under ;; CC-BY-NC, so we delete them. @@ -6679,25 +6679,14 @@ (define-public freegish (arguments `(#:tests? #f ; no tests included #:configure-flags - (list "-DCMAKE_INSTALL_FHS=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-DATAPATH - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("^option\\(INSTALL_FHS" line) - (string-append "add_definitions(-DDATAPATH=\"" - (assoc-ref outputs "out") "/share/freegish\")\n" - line))) - #t))))) + (list "-DINSTALL_FHS=ON"))) (inputs - (list (sdl-union (list sdl sdl-mixer)) + (list sdl2 openal libvorbis libogg mesa - libpng - zlib)) + libpng)) (home-page "https://github.com/freegish/freegish") (synopsis "Side-scrolling physics platformer with a ball of tar") (description "In FreeGish you control Gish, a ball of tar who lives base-commit: 7758e63f7a89f53fbb7c7a265ae472af0a8dfab0 -- 2.41.0