GNU bug report logs - #70971
[PATCH 0/3] Update dhewm3

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 70971 in the body.
You can then email your comments to 70971 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: James Smith <jsubuntuxp <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH 0/3] Update dhewm3
Date: Wed, 15 May 2024 17:42:19 -0700

This patch series makes changes to dhewm3, such as fetching from the git
repository instead of a generated tarball, switching to G-Expressions, and
updating it to 1.5.3.

James Smith (3):
  gnu: dhewm3: Use git repository.
  gnu: dhewm3: Use gexps.
  gnu: dhewm3: Update to 1.5.3.

 gnu/packages/game-development.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)


base-commit: 6cdb6cc6ef3b6d810cb26d19e23da309d63d1eaf
-- 
2.41.0

Message #8 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: James Smith <jsubuntuxp <at> disroot.org>
To: 70971 <at> debbugs.gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH 1/3] gnu: dhewm3: Use git repository.
Date: Wed, 15 May 2024 17:46:39 -0700

* gnu/packages/game-development.scm (dhewm3) [source]: Use git repository
instead of downloading a tarball from GitHub.

Change-Id: I81ff5de0687221d7eec64b0165dbf10c2d041260
---
 gnu/packages/game-development.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index bf0f984ec7..86d3cc0a06 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -29,6 +29,7 @@
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan <at> gmail.com>
 ;;; Copyright © 2022 dan <i <at> dan.games>
 ;;; Copyright © 2023 John Kehayias <john.kehayias <at> protonmail.com>
+;;; Copyright © 2024 James Smith <jsubuntuxp <at> disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3099,13 +3100,13 @@ (define-public dhewm3
     (name "dhewm3")
     (version "1.5.2")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/dhewm/dhewm3/releases/download/"
-                    version "/dhewm3-" version "-src.tar.xz"))
+              (method git-fetch)
+              (uri (git-reference (url "https://github.com/dhewm/dhewm3")
+                                  (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "10p0w1x5wx9b7d8mzvb6yqjia9prhkjwz04vbvphy8p383r33am6"))))
+                "056prmry1lag1pandcw058y5yzbah80ccmz8qlmlx9siz8zlxqyw"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ; No tests.
-- 
2.41.0

Message #11 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: James Smith <jsubuntuxp <at> disroot.org>
To: 70971 <at> debbugs.gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH 2/3] gnu: dhewm3: Use gexps.
Date: Wed, 15 May 2024 17:46:40 -0700

* gnu/packages/game-development.scm (dhewm3) [arguments]: Use gexps.

Change-Id: I0a9090a30a988adeb177f282066b1aa31ca1a483
---
 gnu/packages/game-development.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 86d3cc0a06..1c0d4ec6bf 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -3109,12 +3109,12 @@ (define-public dhewm3
                 "056prmry1lag1pandcw058y5yzbah80ccmz8qlmlx9siz8zlxqyw"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f                      ; No tests.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'change-to-build-dir
-           (lambda _
-             (chdir "neo"))))))
+     (list #:tests? #f                  ; No tests.
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'change-to-build-dir
+                 (lambda _
+                   (chdir "neo"))))))
     (inputs
      (list curl
            libx11
-- 
2.41.0

Message #14 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: James Smith <jsubuntuxp <at> disroot.org>
To: 70971 <at> debbugs.gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH 3/3] gnu: dhewm3: Update to 1.5.3.
Date: Wed, 15 May 2024 17:46:41 -0700

* gnu/packages/game-development.scm (dhewm3): Update to 1.5.3.

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

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 1c0d4ec6bf..3520a23454 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -3098,7 +3098,7 @@ (define-public warsow-qfusion
 (define-public dhewm3
   (package
     (name "dhewm3")
-    (version "1.5.2")
+    (version "1.5.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference (url "https://github.com/dhewm/dhewm3")
@@ -3106,7 +3106,7 @@ (define-public dhewm3
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "056prmry1lag1pandcw058y5yzbah80ccmz8qlmlx9siz8zlxqyw"))))
+                "1zbwhrngmgb0969izmxididyx892qk7591aa9mbigakw6dvmlm84"))))
     (build-system cmake-build-system)
     (arguments
      (list #:tests? #f                  ; No tests.
-- 
2.41.0

Message #17 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: James Smith <jsubuntuxp <at> disroot.org>
To: 70971 <at> debbugs.gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH v2 0/3] Update dhewm3
Date: Thu,  6 Jun 2024 22:45:41 -0700

Rebased patch series, updated existing copyright line instead of creating a
duplicate copyright line in the first patch.

James Smith (3):
  gnu: dhewm3: Use git repository.
  gnu: dhewm3: Use gexps.
  gnu: dhewm3: Update to 1.5.3.

 gnu/packages/game-development.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)


base-commit: 580d77d0fb12448ef1621699cc0c56e787e2aadb
-- 
2.45.1

Message #20 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: James Smith <jsubuntuxp <at> disroot.org>
To: 70971 <at> debbugs.gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH v2 1/3] gnu: dhewm3: Use git repository.
Date: Thu,  6 Jun 2024 22:45:42 -0700

* gnu/packages/game-development.scm (dhewm3) [source]: Use git repository
instead of downloading a tarball from GitHub.

Change-Id: I81ff5de0687221d7eec64b0165dbf10c2d041260
---
 gnu/packages/game-development.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 5b7852c4eb..89ace2925b 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -22,7 +22,7 @@
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org>
 ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407 <at> posteo.ro>
 ;;; Copyright © 2021 Dmitry Polyakov <polyakov <at> liltechdude.xyz>
-;;; Copyright © 2020-2022 James Smith <jsubuntuxp <at> disroot.org>
+;;; Copyright © 2020-2022, 2024 James Smith <jsubuntuxp <at> disroot.org>
 ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz <at> elenq.tech>
 ;;; Copyright © 2021 Andy Tai <atai <at> atai.org>
 ;;; Copyright © 2022 Felix Gruber <felgru <at> posteo.net>
@@ -3101,13 +3101,13 @@ (define-public dhewm3
     (name "dhewm3")
     (version "1.5.2")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/dhewm/dhewm3/releases/download/"
-                    version "/dhewm3-" version "-src.tar.xz"))
+              (method git-fetch)
+              (uri (git-reference (url "https://github.com/dhewm/dhewm3")
+                                  (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "10p0w1x5wx9b7d8mzvb6yqjia9prhkjwz04vbvphy8p383r33am6"))))
+                "056prmry1lag1pandcw058y5yzbah80ccmz8qlmlx9siz8zlxqyw"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ; No tests.
-- 
2.45.1

Message #23 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: James Smith <jsubuntuxp <at> disroot.org>
To: 70971 <at> debbugs.gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH v2 2/3] gnu: dhewm3: Use gexps.
Date: Thu,  6 Jun 2024 22:45:43 -0700

* gnu/packages/game-development.scm (dhewm3) [arguments]: Use gexps.

Change-Id: I0a9090a30a988adeb177f282066b1aa31ca1a483
---
 gnu/packages/game-development.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 89ace2925b..45a0db95c2 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -3110,12 +3110,12 @@ (define-public dhewm3
                 "056prmry1lag1pandcw058y5yzbah80ccmz8qlmlx9siz8zlxqyw"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f                      ; No tests.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'change-to-build-dir
-           (lambda _
-             (chdir "neo"))))))
+     (list #:tests? #f                  ; No tests.
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'change-to-build-dir
+                 (lambda _
+                   (chdir "neo"))))))
     (inputs
      (list curl
            libx11
-- 
2.45.1

Message #26 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: James Smith <jsubuntuxp <at> disroot.org>
To: 70971 <at> debbugs.gnu.org
Cc: James Smith <jsubuntuxp <at> disroot.org>
Subject: [PATCH v2 3/3] gnu: dhewm3: Update to 1.5.3.
Date: Thu,  6 Jun 2024 22:45:44 -0700

* gnu/packages/game-development.scm (dhewm3): Update to 1.5.3.

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

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 45a0db95c2..c3a0cfbbd1 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -3099,7 +3099,7 @@ (define-public warsow-qfusion
 (define-public dhewm3
   (package
     (name "dhewm3")
-    (version "1.5.2")
+    (version "1.5.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference (url "https://github.com/dhewm/dhewm3")
@@ -3107,7 +3107,7 @@ (define-public dhewm3
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "056prmry1lag1pandcw058y5yzbah80ccmz8qlmlx9siz8zlxqyw"))))
+                "1zbwhrngmgb0969izmxididyx892qk7591aa9mbigakw6dvmlm84"))))
     (build-system cmake-build-system)
     (arguments
      (list #:tests? #f                  ; No tests.
-- 
2.45.1

Message #29 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: James Smith <jsubuntuxp <at> disroot.org>
To: Christopher Baines <mail <at> cbaines.net>
Cc: 宋文武 <iyzsong <at> envs.net>, 70971 <at> debbugs.gnu.org,
 Adam Faiz <adam.faiz <at> disroot.org>,
 James Smith via Guix-patches via <guix-patches <at> gnu.org>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: Re: [bug#70971] [PATCH v2 1/3] gnu: dhewm3: Use git repository.
Date: Tue, 11 Jun 2024 05:45:19 -0700

Christopher Baines <mail <at> cbaines.net> writes:

> James Smith via Guix-patches via <guix-patches <at> gnu.org> writes:
>
>> * gnu/packages/game-development.scm (dhewm3) [source]: Use git repository
>> instead of downloading a tarball from GitHub.
>>
>> Change-Id: I81ff5de0687221d7eec64b0165dbf10c2d041260
>> ---
>>  gnu/packages/game-development.scm | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> I'm missing why you're making this change? I don't see anything wrong
> with using these upstream release tarballs.

I noticed that the package was using a tarball from GitHub and assumed
that it was one that was autogenerated. Upon closer inspection, I see
that it's a manually pack tarball instead. I can send a new set of
patches that excludes switching to the git repository if needed.

Message #32 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: James Smith via Guix-patches via <guix-patches <at> gnu.org>
Cc: 宋文武 <iyzsong <at> envs.net>, 70971 <at> debbugs.gnu.org,
 Adam Faiz <adam.faiz <at> disroot.org>, James Smith <jsubuntuxp <at> disroot.org>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: Re: [bug#70971] [PATCH v2 1/3] gnu: dhewm3: Use git repository.
Date: Tue, 11 Jun 2024 11:38:20 +0100

[Message part 1 (text/plain, inline)]

James Smith via Guix-patches via <guix-patches <at> gnu.org> writes:

> * gnu/packages/game-development.scm (dhewm3) [source]: Use git repository
> instead of downloading a tarball from GitHub.
>
> Change-Id: I81ff5de0687221d7eec64b0165dbf10c2d041260
> ---
>  gnu/packages/game-development.scm | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

I'm missing why you're making this change? I don't see anything wrong
with using these upstream release tarballs.

[signature.asc (application/pgp-signature, inline)]

Message #41 received at 70971 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 70971 <at> debbugs.gnu.org, James Smith <jsubuntuxp <at> disroot.org>
Subject: Re: [bug#70971] [PATCH v2 1/3] gnu: dhewm3: Use git repository.
Date: Sat, 22 Jun 2024 17:33:39 +0100

[Message part 1 (text/plain, inline)]

James Smith <jsubuntuxp <at> disroot.org> writes:

> Christopher Baines <mail <at> cbaines.net> writes:
>
>> James Smith via Guix-patches via <guix-patches <at> gnu.org> writes:
>>
>>> * gnu/packages/game-development.scm (dhewm3) [source]: Use git repository
>>> instead of downloading a tarball from GitHub.
>>>
>>> Change-Id: I81ff5de0687221d7eec64b0165dbf10c2d041260
>>> ---
>>>  gnu/packages/game-development.scm | 12 ++++++------
>>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> I'm missing why you're making this change? I don't see anything wrong
>> with using these upstream release tarballs.
>
> I noticed that the package was using a tarball from GitHub and assumed
> that it was one that was autogenerated. Upon closer inspection, I see
> that it's a manually pack tarball instead. I can send a new set of
> patches that excludes switching to the git repository if needed.

I tried to apply the patches, but they look to have already been
applied.

I'll leave the issue open until it's been decided whether to keep the
switch to the Git repository or go back to using tarballs.

[signature.asc (application/pgp-signature, inline)]

Message #46 received at 70971-done <at> debbugs.gnu.org (full text, mbox):

From: Andreas Enge <andreas <at> enge.fr>
To: 70971-done <at> debbugs.gnu.org
Subject: Close
Date: Sun, 30 Jun 2024 12:46:56 +0200

Hello,

I am closing this bug report, as I think either way, using tarballs or
git repositories, is fine. Now that the switch to git has been applied,
I do not see a compelling reason to revert it.

Andreas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.