Subject: bug#72541: closed (Re: [bug#72541] [PATCH] gnu: gerbv: Fix missing version.)

From: [email-masked] (GNU bug Tracking System)
Date: Sat, 04 Jan 2025 18:44:02 +0000

Your bug report

#72541: [PATCH] gnu: gerbv: Fix missing version.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
72541: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=72541
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#72541] [PATCH] gnu: gerbv: Fix missing version.
From: Ludovic Courtès <[email-masked]>
To: Evgeny Pisemsky <[email-masked]>
Cc: [email-masked]
Date: Sat, 04 Jan 2025 19:43:24 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Evgeny Pisemsky <[email-masked]> skribis:

> From f85ab2e24f0da292f639c07f4d66430896b18d13 Mon Sep 17 00:00:00 2001
> Message-ID: <[email-masked]>
> From: Evgeny Pisemsky <[email-masked]>
> Date: Fri, 3 Jan 2025 21:40:01 +0300
> Subject: [PATCH] gnu: gerbv: Fix missing version.
>
> * gnu/packages/engineering.scm (gerbv): Fix missing version.
> [source]: Change indentation.
> [arguments]: Set correct configure flags, patch version generator shebang.
>
> Change-Id: I29a38fff03127d9ce2b5e04ca638dacfc3720125

Finally applied with the change below.

Thanks,
Ludo’.

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 5b43f8787e..f9c4ac9bbd 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -862,7 +862,7 @@ (define-public gerbv
                          gettext-minimal
                          ;; Version generator needs git to work properly:
                          ;; https://github.com/gerbv/gerbv/issues/244
-                         git
+                         git-minimal/pinned
                          `(,glib "bin")
                          libtool
                          pkg-config))

Subject: [PATCH] gnu: gerbv: Fix missing version.
From: Evgeny Pisemsky <[email-masked]>
To: [email-masked]
Date: Fri, 09 Aug 2024 15:00:51 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

This program currently lacks version number everywhere - in pkgconfig,
in CLI and in GUI, because it is generated by a script that needs git
and updating shebang. This patch fixes the problem.

>From c066b30a8f1afff37deb54d7ed571d99b059f619 Mon Sep 17 00:00:00 2001
Message-ID: <[email-masked]>
From: Evgeny Pisemsky <[email-masked]>
Date: Fri, 9 Aug 2024 14:40:05 +0300
Subject: [PATCH] gnu: gerbv: Fix missing version.

* gnu/packages/engineering.scm (gerbv): Fix missing version.
[source]: Change indentation.
[arguments]: Patch version generator shebang.
[native-inputs]: Add git.

Change-Id: I29a38fff03127d9ce2b5e04ca638dacfc3720125
---
 gnu/packages/engineering.scm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index d5d72a0c85..697ceff59f 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -27,7 +27,7 @@
 ;;; Copyright © 2021 Ivan Gankevich <[email-masked]>
 ;;; Copyright © 2021, 2022 Petr Hodina <[email-masked]>
 ;;; Copyright © 2021 Foo Chuan Wei <[email-masked]>
-;;; Copyright © 2022 Evgeny Pisemsky <[email-masked]>
+;;; Copyright © 2022, 2024 Evgeny Pisemsky <[email-masked]>
 ;;; Copyright © 2022 Olivier Dion <[email-masked]>
 ;;; Copyright © 2022 Peter Polidoro <[email-masked]>
 ;;; Copyright © 2022 Malte Frank Gerdes <[email-masked]>
@@ -833,22 +833,30 @@ (define-public gerbv
   (package
     (name "gerbv")
     (version "2.10.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/gerbv/gerbv")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/gerbv/gerbv")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags '("CFLAGS=-fcommon")))
+     (list
+      #:configure-flags '(list "CFLAGS=-fcommon")
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'patch-version-generator
+                     (lambda _
+                       (substitute* "utils/git-version-gen.sh"
+                         (("/bin/bash")
+                          (which "bash"))))))))
     (native-inputs (list autoconf
                          automake
                          desktop-file-utils
                          gettext-minimal
+                         git
                          `(,glib "bin")
                          libtool
                          pkg-config))

base-commit: 20dbf225f332ccc707578263ed710dcf2a8fb78e
-- 
2.45.2