GNU bug report logs - #76642
[PATCH] gnu: grafx2: Update to 2.9.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 28 Feb 2025 14:03:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 28 09:03:51 2025
Received: from localhost ([127.0.0.1]:47499 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1to0xx-0007EB-Un
	for submit <at> debbugs.gnu.org; Fri, 28 Feb 2025 09:03:51 -0500
Received: from lists.gnu.org ([2001:470:142::17]:58934)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <iyzsong@HIDDEN>) id 1to0xu-0007C3-0T
 for submit <at> debbugs.gnu.org; Fri, 28 Feb 2025 09:03:48 -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 <iyzsong@HIDDEN>) id 1to0xT-0007Io-Rt
 for guix-patches@HIDDEN; Fri, 28 Feb 2025 09:03:22 -0500
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 <iyzsong@HIDDEN>) id 1to0xP-000756-9n
 for guix-patches@HIDDEN; Fri, 28 Feb 2025 09:03:18 -0500
Received: from localhost (mail.envs.net [127.0.0.1])
 by mail.envs.net (Postfix) with ESMTP id CF22538A3F95;
 Fri, 28 Feb 2025 14:03:02 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa;
 t=1740751382; bh=go5PAOAviuCkY6K0hmXoqXPnGvg+fy853kI7OMrSlMQ=;
 h=From:To:Cc:Subject:Date:From;
 b=WUxSuP/s4XX8QRP2/2/zQ2fqEe6Sl8CgGyYT+n08GqV133T1EjUTM9etacSFMeb7I
 8QCV4SLOAEz09aco0buLY+dHlX6Ff3mAwT9s8F6FkV/IQfo40kjz6Y6T1WVARBZDML
 fHtXFOfcf7qs3cGUV5yi7Ex65O2XUA7vS/8m5IuiW0y5qnMqKPNJg4JGWCOTC+59X6
 wuQ/Zz/0kPtgPT9HoeE05FyDgSa1+pMZsodAoOulOQa5lINpUNQL7HiBZtmITnvY8b
 USzui1lYdDlyyXxwP/7O5Q2G489MZxJbCwyg0deAkgq4huPX47cMIwehd3JuZUOsbz
 4CZo/Qm9J5/sYbS/4jPmVjn++1C/xcKdpJRO4JvvipDLZeJrWa4wTHCdUcJWw+0TCJ
 /efGEuEHSrPfZP1iUsmbKgQNgM0mOYcL5Jp1dLst4DdLs36eR3vA0SKkmW879Rii8e
 +DjSMUToYPZqT7VDqiDW0S+egW5HAICuomY4EjZ7KHer1u45Gq5oyd0j3WfjrijXjG
 mK94SCGgZa60s1qatIyevupNo5dc6FfpOMWWfj/QDdCSmRGSAzKAJj4vjfZu2ne+bc
 LK5RZZQxoxSYZLz+tsgAciC4AiIKds0v5KwtyLIdJAGCN31jq3yi1tw3TsaEBJRbLo
 wpO8f5NPHZ7z7fmXcY0GAMXk=
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 pH-2O63OSmIn; Fri, 28 Feb 2025 14:02:58 +0000 (UTC)
Received: from localhost (unknown [112.44.106.181])
 (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;
 Fri, 28 Feb 2025 14:02:58 +0000 (UTC)
Received: from localhost.localdomain (localhost.lan [127.0.0.1])
 by localhost (OpenSMTPD) with ESMTP id 47306d76;
 Fri, 28 Feb 2025 14:06:56 +0000 (UTC)
From: iyzsong@HIDDEN
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: grafx2: Update to 2.9.
Date: Fri, 28 Feb 2025 22:06:53 +0800
Message-ID: <853611ad97a112d3699352d0f3e69e4e85872db0.1740751610.git.iyzsong@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@HIDDEN;
 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,
 RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

From: 宋文武 <iyzsong@HIDDEN>

* gnu/packages/game-development.scm (grafx2): Update to 2.9.
[source]: Use git-fetch.
[native-inputs]: Add which.
[inputs]: Use SDL2 libraries.  Add fontconfig.  Replace lua@HIDDEN with lua@HIDDEN
Remove libpng.

Change-Id: I8e731d51d430b6a68f786d0a6320f2e1b7b92dae
---
 gnu/packages/game-development.scm | 103 +++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 38 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 6133ad078b..458a922e9f 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1931,48 +1931,75 @@ (define-public python-pyxel
       (license license:expat))))
 
 (define-public grafx2
-  (package
-    (name "grafx2")
-    (version "2.4")
-    (source (origin
-              (method url-fetch)
-              ;; XXX: There is no URL that contains the version. :(
-              (uri "http://pulkomandy.tk/projects/GrafX2/downloads/21")
-              (file-name (string-append "grafx2-" version ".tgz"))
-              (sha256
-               (base32
-                "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (delete 'configure) ; no configure script
-         (add-before 'build 'change-to-src-directory
-           (lambda _
-             (chdir "src")
-             #t)))
-       #:make-flags
-       ;; SDL header files are referenced without the preceeding "SDL/".
-       (list (string-append "CFLAGS=-I"
-                            (assoc-ref %build-inputs "sdl-union")
-                            "/include/SDL"
-                            " -fcommon")
-             (string-append "prefix="
-                            (assoc-ref %outputs "out")))
-       #:tests? #f)) ; no check target
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list libpng lua-5.1
-           (sdl-union (list sdl sdl-image sdl-ttf))))
-    (synopsis "Bitmap paint program")
-    (description "GrafX2 is a bitmap paint program inspired by the Amiga
+  (let ((3rd/font8x8
+         (origin
+           (method git-fetch)
+           (uri (git-reference
+                 (url "https://github.com/dhepper/font8x8")
+                 (commit "8e279d2d864e79128e96188a6b9526cfa3fbfef9")))
+           (file-name "font8x8-checkout")
+           (sha256
+            (base32 "0v67bm7yp7spr34yf2s6adjx91w0hhcy3i2pc7n55rz3a8wzcd7l"))))
+        (3rd/6502
+         (origin
+           (method url-fetch)
+           (uri "https://github.com/redcode/6502/releases/download/v0.1/6502-v0.1.tar.xz")
+           (sha256
+            (base32 "03wlndlmfsz51x7hmrfs02r3fzqk8a0grbzm2h80pm33f4r0z9dv"))))
+        (3rd/recoil
+         (origin
+           (method url-fetch)
+           (uri "https://downloads.sourceforge.net/project/recoil/recoil/6.4.2/recoil-6.4.2.tar.gz")
+           (sha256
+            (base32 "1p73cgfacia2gxvswhdixk6grpp9rs2n5258axh5vdb6ly8w3pi3")))))
+    (package
+      (name "grafx2")
+      (version "2.9")
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/GrafX2/grafX2")
+               (commit (string-append "v" version))))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0rf85pm40nmp9f95adbzzfx2ypvqjl51wqvk461c4bk8z7anlniz"))
+         (modules '((guix build utils)))
+         (snippet
+          #~(begin
+              (copy-recursively #$3rd/font8x8
+                                "tools/8x8fonts/font8x8")
+              (mkdir "3rdparty/archives")
+              (copy-file #$3rd/6502
+                         "3rdparty/archives/6502-v0.1.tar.xz")
+              (copy-file #$3rd/recoil
+                         "3rdparty/archives/recoil-6.4.2.tar.gz")))))
+      (build-system gnu-build-system)
+      (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (delete 'configure)          ; no configure script
+            (add-before 'build 'change-to-src-directory
+              (lambda _
+                (chdir "src"))))
+        #:make-flags
+        #~(list "API=sdl2"
+                (string-append "PREFIX="
+                               (assoc-ref %outputs "out")))
+        #:tests? #f))                  ; no check target
+      (native-inputs
+       (list pkg-config which))
+      (inputs
+       (list fontconfig lua (sdl-union (list sdl2 sdl2-image sdl2-ttf))))
+      (synopsis "Bitmap paint program")
+      (description "GrafX2 is a bitmap paint program inspired by the Amiga
 programs Deluxe Paint and Brilliance.  Specializing in 256-color drawing, it
 includes a very large number of tools and effects that make it particularly
 suitable for pixel art, game graphics, and generally any detailed graphics
 painted with a mouse.")
-    (home-page "http://pulkomandy.tk/projects/GrafX2")
-    (license license:gpl2))) ; GPLv2 only
+      (home-page "http://pulkomandy.tk/projects/GrafX2")
+      (license license:gpl2)))) ; GPLv2 only
 
 (define-public ois
   (package

base-commit: a76708a872e65230931f3c5c3b079d0a39d5cb84
-- 
2.48.1