[PATCH 0/2] gnu: frotz: Update to 2.55.

  • Done
  • quality assurance status badge
Details
2 participants
  • Adam Faiz
  • Andreas Enge
Owner
unassigned
Submitted by
Adam Faiz
Severity
normal

Debbugs page

A
A
Adam Faiz wrote on 14 Jul 07:57 -0700
(address . guix-patches@gnu.org)
41ca1378-700a-45f8-a768-6b9ed6f069ff@disroot.org
From c71f5ace0641a70df71eb1ec9bd17198312a5b1c Mon Sep 17 00:00:00 2001
Message-ID: <cover.1752504959.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Mon, 14 Jul 2025 22:55:59 +0800
Subject: [PATCH 0/2] gnu: frotz: Update to 2.55.

This patch series updates frotz and frotz-dumb-terminal.

AwesomeAdam54321 (2):
  gnu: frotz: Update to 2.55.
  gnu: frotz-dumb-terminal: Update to 2.55.

 gnu/packages/games.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


base-commit: 7479725ff28e2bf2f5f90cf412a18d5da39cbf9e
--
2.50.0
A
A
Adam Faiz wrote on 14 Jul 08:01 -0700
[PATCH 1/2] gnu: frotz: Update to 2.55.
(address . 79016@debbugs.gnu.org)
51cd5ff1-1a04-4809-8b5a-72a59eb9fe53@disroot.org
From fc3d8f33e81547bd30670e2929cf4731db95f376 Mon Sep 17 00:00:00 2001
Message-ID:
<fc3d8f33e81547bd30670e2929cf4731db95f376.1752504959.git.adam.faiz@disroot.org>
In-Reply-To: <cover.1752504959.git.adam.faiz@disroot.org>
References: <cover.1752504959.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Mon, 14 Jul 2025 22:49:27 +0800
Subject: [PATCH 1/2] gnu: frotz: Update to 2.55.

* gnu/packages/games.scm (frotz): Update to 2.55.

Change-Id: I010868f2952777f7634788dedc5c20b89d871403
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index af9b7ebe66..4cd8c8963e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9540,7 +9540,7 @@ (define-public xonotic
 (define-public frotz
   (package
     (name "frotz")
-    (version "2.54")
+    (version "2.55")
     (source (origin
               (method url-fetch)
               (uri (list (string-append
@@ -9551,7 +9551,7 @@ (define-public frotz
                           "frotz/frotz-" version ".tar.gz")))
               (sha256
                (base32
- "1vsfq9ryyb4nvzxpnnn40k423k9pdy8k67i8390qz5h0vmxw0fds"))))
+ "0wfqhxwgjwhgnjh1byjzsfj3mqhy5hialngyb53p5jjbz4pr3mp3"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f                  ; there are no tests
--
2.50.0
A
A
Adam Faiz wrote on 14 Jul 08:03 -0700
[PATCH 2/2] gnu: frotz-dumb-terminal: Update to 2.55.
(address . 79016@debbugs.gnu.org)
718be183-2eb0-47a0-bfb7-bbc897fc14fa@disroot.org
From c71f5ace0641a70df71eb1ec9bd17198312a5b1c Mon Sep 17 00:00:00 2001
Message-ID:
<c71f5ace0641a70df71eb1ec9bd17198312a5b1c.1752504959.git.adam.faiz@disroot.org>
In-Reply-To: <cover.1752504959.git.adam.faiz@disroot.org>
References: <cover.1752504959.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Mon, 14 Jul 2025 21:58:11 +0800
Subject: [PATCH 2/2] gnu: frotz-dumb-terminal: Update to 2.55.

* gnu/packages/games.scm (frotz-dumb-terminal): Update to 2.55.

Change-Id: Ifde6b3ab631ab64a43509119caffdd61fe2e378f
---
 gnu/packages/games.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Toggle diff (36 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 4cd8c8963e..f0fc5bfcdb 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9639,7 +9639,7 @@ (define-public naev
 (define-public frotz-dumb-terminal
   (package
     (name "frotz-dumb-terminal")
-    (version "2.44")
+    (version "2.55")
     (source (origin
               (method url-fetch)
               (uri (list (string-append
@@ -9650,8 +9650,9 @@ (define-public frotz-dumb-terminal
                           "frotz/frotz-" version ".tar.gz")))
               (sha256
                (base32
- "1v735xr3blznac8fnwa27s1vhllx4jpz7kw7qdw1bsfj6kq21v3k"))))
+ "0wfqhxwgjwhgnjh1byjzsfj3mqhy5hialngyb53p5jjbz4pr3mp3"))))
     (build-system gnu-build-system)
+    (native-inputs (list pkg-config which))
     (arguments
      `(#:tests? #f                      ; there are no tests
        #:phases
@@ -9659,7 +9660,7 @@ (define-public frotz-dumb-terminal
          (delete 'configure)
          (replace 'build
            (lambda _
-             (invoke "make" "dumb")))
+             (invoke "make" (string-append "CC=" ,(cc-for-target))
"dumb")))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
--
2.50.0
A
A
Andreas Enge wrote on 14 Jul 11:06 -0700
Re: [PATCH 1/2] gnu: frotz: Update to 2.55.
(name . Adam Faiz)(address . adam.faiz@disroot.org)
aHVHDVgvCIB5_snh@jurong
Hello Adam,

unfortunately I cannot apply your patch with "git am", the error message
says there is an error in line 10. I suppose you prepared them before
the addition of asciiquarium yesterday; could you maybe send a v2?

Concerning the second patch, please record all changes in the commit
message (native-inputs, phases); there are examples you can find with
"git log".

Thanks!

Andreas
A
A
Adam Faiz wrote on 19 Jul 03:34 -0700
[PATCH v2 1/2] gnu: frotz: Update to 2.55.
(address . 79016@debbugs.gnu.org)
c97d46af-ccbf-4c22-9e6d-0f859d8e7efd@disroot.org
From 941264c294418e0c2b1496ff3df11c5747c8e310 Mon Sep 17 00:00:00 2001
Message-ID:
<941264c294418e0c2b1496ff3df11c5747c8e310.1752594380.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Mon, 14 Jul 2025 22:49:27 +0800
Subject: [PATCH v2 1/2] gnu: frotz: Update to 2.55.

* gnu/packages/games.scm (frotz): Update to 2.55.

Change-Id: I010868f2952777f7634788dedc5c20b89d871403
---
 gnu/packages/games.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 7dd0eb89a5..dfd4a041fd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9582,7 +9582,7 @@ (define-public xonotic
 (define-public frotz
   (package
     (name "frotz")
-    (version "2.54")
+    (version "2.55")
     (source (origin
               (method url-fetch)
               (uri (list (string-append
@@ -9593,7 +9593,7 @@ (define-public frotz
                           "frotz/frotz-" version ".tar.gz")))
               (sha256
                (base32
- "1vsfq9ryyb4nvzxpnnn40k423k9pdy8k67i8390qz5h0vmxw0fds"))))
+ "0wfqhxwgjwhgnjh1byjzsfj3mqhy5hialngyb53p5jjbz4pr3mp3"))))
     (build-system gnu-build-system)
     (arguments
      (list #:tests? #f                  ; there are no tests

base-commit: 8737b5332ed57ec056e70f3f7f1d88e4012101cd
--
2.50.0
A
A
Adam Faiz wrote on 19 Jul 03:35 -0700
[PATCH v2 2/2] gnu: frotz-dumb-terminal: Update to 2.55.
(address . 79016@debbugs.gnu.org)
92711f81-6e0a-4bb8-886f-db6fb55ff100@disroot.org
From bdc10f0861b55eb79de4769a07f8fd2f8a19fd26 Mon Sep 17 00:00:00 2001
Message-ID:
<bdc10f0861b55eb79de4769a07f8fd2f8a19fd26.1752594380.git.adam.faiz@disroot.org>
In-Reply-To:
<941264c294418e0c2b1496ff3df11c5747c8e310.1752594380.git.adam.faiz@disroot.org>
References:
<941264c294418e0c2b1496ff3df11c5747c8e310.1752594380.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Mon, 14 Jul 2025 21:58:11 +0800
Subject: [PATCH v2 2/2] gnu: frotz-dumb-terminal: Update to 2.55.

* gnu/packages/games.scm (frotz-dumb-terminal): Update to 2.55.
[native-inputs]: Add pkg-config and which.
[arguments]<#:phases>: Set CC variable in make command during 'build phase.

Change-Id: Ifde6b3ab631ab64a43509119caffdd61fe2e378f
---
 gnu/packages/games.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Toggle diff (36 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index dfd4a041fd..8a7024cab8 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9681,7 +9681,7 @@ (define-public naev
 (define-public frotz-dumb-terminal
   (package
     (name "frotz-dumb-terminal")
-    (version "2.44")
+    (version "2.55")
     (source (origin
               (method url-fetch)
               (uri (list (string-append
@@ -9692,8 +9692,9 @@ (define-public frotz-dumb-terminal
                           "frotz/frotz-" version ".tar.gz")))
               (sha256
                (base32
- "1v735xr3blznac8fnwa27s1vhllx4jpz7kw7qdw1bsfj6kq21v3k"))))
+ "0wfqhxwgjwhgnjh1byjzsfj3mqhy5hialngyb53p5jjbz4pr3mp3"))))
     (build-system gnu-build-system)
+    (native-inputs (list pkg-config which))
     (arguments
      `(#:tests? #f                      ; there are no tests
        #:phases
@@ -9701,7 +9702,7 @@ (define-public frotz-dumb-terminal
          (delete 'configure)
          (replace 'build
            (lambda _
-             (invoke "make" "dumb")))
+             (invoke "make" (string-append "CC=" ,(cc-for-target))
"dumb")))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
--
2.50.0
A
A
Andreas Enge wrote on 27 Jul 01:46 -0700
Close
(address . 79016-done@debbugs.gnu.org)
aIXnelnMf4BBrmJP@jurong
Also pushed.

Andreas
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 79016@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 79016
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch