GNU bug report logs - #73847
[PATCH] gnu: gtkwave: Update to 3.4.0-0.0a800de.

Previous Next

Package: guix-patches;

Reported by: Cayetano Santos <csantosb <at> inventati.org>

Date: Thu, 17 Oct 2024 09:02:02 UTC

Severity: normal

Tags: patch

Merged with 74764

Done: Cayetano Santos <cayetano.santos <at> ciemat.es>

To reply to this bug, email your comments to 73847 AT debbugs.gnu.org.
There is no need to reopen the bug first.

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

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to , guix-patches <at> gnu.org:
bug#73847; Package guix-patches. (Thu, 17 Oct 2024 09:02:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Cayetano Santos <csantosb <at> inventati.org>:
New bug report received and forwarded. Copy sent to , guix-patches <at> gnu.org. (Thu, 17 Oct 2024 09:02:02 GMT) Full text and rfc822 format available.

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

From: Cayetano Santos <csantosb <at> inventati.org>
To: guix-patches <at> gnu.org
Cc: Cayetano Santos <csantosb <at> inventati.org>
Subject: [PATCH] gnu: gtkwave: Update to 3.4.0-0.0a800de.
Date: Thu, 17 Oct 2024 10:56:30 +0200

* gnu/packages/fpga.scm (gtkwave): Update to 3.4.0-0.0a800de.

Change-Id: I58db65ebdebe2388640012b6248d1d9cd4540dcb
---

Update to gtkwave package to its new home at github, which implies:
. meson build system
. a set of different dependencies and modules
. 3.4.0 is old, I take last commit

 gnu/packages/fpga.scm | 64 +++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index ea81054d5b..6543c4454a 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages fpga)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
@@ -40,15 +41,18 @@ (define-module (gnu packages fpga)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
@@ -65,7 +69,6 @@ (define-module (gnu packages fpga)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
-  #:use-module (gnu packages tcl)
   #:use-module (gnu packages version-control))
 
 (define-public abc
@@ -349,38 +352,35 @@ (define-public arachne-pnr
     (license license:gpl2))))
 
 (define-public gtkwave
-  (package
-    (name "gtkwave")
-    (version "3.3.121")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (list (string-append "mirror://sourceforge/gtkwave/"
-                                 "gtkwave-" version "/"
-                                 "gtkwave-" version ".tar.gz")
-                  (string-append "https://gtkwave.sourceforge.net/"
-                                 "gtkwave-" version ".tar.gz")))
-       (sha256
-        (base32 "15w3x3zx5klqg1vjkakixw9zwfnkib7gf376knf5sryakd3bc1av"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list gperf pkg-config))
-    (inputs
-     (list tcl tk gtk+-2))
-    (arguments
-     (list #:configure-flags
-           #~(list (string-append "--with-tcl="
-                                  (assoc-ref %build-inputs "tcl")
-                                  "/lib")
-                   (string-append "--with-tk="
-                                  (assoc-ref %build-inputs "tk")
-                                  "/lib"))))
-    (synopsis "Waveform viewer for FPGA simulator trace files")
-    (description "This package is a waveform viewer for FPGA
+  (let ((commit "0a800de96255f7fb11beadb6729fdf670da76ecb")
+        (revision "0"))
+    (package
+      (name "gtkwave")
+      (version (git-version "3.4.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/gtkwave/gtkwave")
+               (commit commit)))
+         (sha256
+          (base32 "113psdcv6a1npfv40gs1cjf9ck342fp31pf4y8msvc2dhcr72l1b"))))
+      (build-system meson-build-system)
+      (native-inputs (list cmake
+                           desktop-file-utils
+                           flex
+                           `(,glib "bin")
+                           gobject-introspection
+                           gperf
+                           pkg-config))
+      (inputs (list gtk+ gtk
+                    `(,gtk+ "bin")))
+      (synopsis "Waveform viewer for FPGA simulator trace files")
+      (description "This package is a waveform viewer for FPGA
 simulator trace files (@dfn{FST}).")
-    (home-page "https://gtkwave.sourceforge.net/")
-    ;; Exception against free government use in tcl_np.c and tcl_np.h.
-    (license (list license:gpl2+ license:expat license:tcl/tk))))
+      (home-page "https://github.com/gtkwave/gtkwave")
+      ;; Exception against free government use in tcl_np.c and tcl_np.h.
+      (license (list license:gpl2+ license:expat license:tcl/tk)))))
 
 (define-public python-migen
   (package

base-commit: d95588242c605fbb72e25fe36a0903a1538e9018
--
2.46.0
Information forwarded to guix-patches <at> gnu.org:
bug#73847; Package guix-patches. (Sat, 02 Nov 2024 17:59:02 GMT) Full text and rfc822 format available.

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

From: Cayetano Santos <csantosb <at> inventati.org>
To: 73847 <at> debbugs.gnu.org
Cc: Cayetano Santos <csantosb <at> inventati.org>
Subject: [PATCH v1] gnu: gtkwave: Update to 3.4.0-0.0a800de.
Date: Sat,  2 Nov 2024 18:58:17 +0100

* gnu/packages/fpga.scm (gtkwave): Update to 3.4.0-0.0a800de.

Change-Id: I58db65ebdebe2388640012b6248d1d9cd4540dcb
---

cmake needs its minimal variant here

 gnu/packages/fpga.scm | 64 +++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index c812ed3b7e..32daf19599 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -33,6 +33,7 @@ (define-module (gnu packages fpga)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
@@ -40,15 +41,18 @@ (define-module (gnu packages fpga)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
@@ -65,7 +69,6 @@ (define-module (gnu packages fpga)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
-  #:use-module (gnu packages tcl)
   #:use-module (gnu packages version-control))
 
 (define-public abc
@@ -355,38 +358,35 @@ (define-public arachne-pnr
     (license license:gpl2))))
 
 (define-public gtkwave
-  (package
-    (name "gtkwave")
-    (version "3.3.121")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (list (string-append "mirror://sourceforge/gtkwave/"
-                                 "gtkwave-" version "/"
-                                 "gtkwave-" version ".tar.gz")
-                  (string-append "https://gtkwave.sourceforge.net/"
-                                 "gtkwave-" version ".tar.gz")))
-       (sha256
-        (base32 "15w3x3zx5klqg1vjkakixw9zwfnkib7gf376knf5sryakd3bc1av"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list gperf pkg-config))
-    (inputs
-     (list tcl tk gtk+-2))
-    (arguments
-     (list #:configure-flags
-           #~(list (string-append "--with-tcl="
-                                  (assoc-ref %build-inputs "tcl")
-                                  "/lib")
-                   (string-append "--with-tk="
-                                  (assoc-ref %build-inputs "tk")
-                                  "/lib"))))
-    (synopsis "Waveform viewer for FPGA simulator trace files")
-    (description "This package is a waveform viewer for FPGA
+  (let ((commit "0a800de96255f7fb11beadb6729fdf670da76ecb")
+        (revision "0"))
+    (package
+      (name "gtkwave")
+      (version (git-version "3.4.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/gtkwave/gtkwave")
+               (commit commit)))
+         (sha256
+          (base32 "113psdcv6a1npfv40gs1cjf9ck342fp31pf4y8msvc2dhcr72l1b"))))
+      (build-system meson-build-system)
+      (native-inputs (list cmake-minimal
+                           desktop-file-utils
+                           flex
+                           `(,glib "bin")
+                           gobject-introspection
+                           gperf
+                           pkg-config))
+      (inputs (list gtk+ gtk
+                    `(,gtk+ "bin")))
+      (synopsis "Waveform viewer for FPGA simulator trace files")
+      (description "This package is a waveform viewer for FPGA
 simulator trace files (@dfn{FST}).")
-    (home-page "https://gtkwave.sourceforge.net/")
-    ;; Exception against free government use in tcl_np.c and tcl_np.h.
-    (license (list license:gpl2+ license:expat license:tcl/tk))))
+      (home-page "https://github.com/gtkwave/gtkwave")
+      ;; Exception against free government use in tcl_np.c and tcl_np.h.
+      (license (list license:gpl2+ license:expat license:tcl/tk)))))
 
 (define-public python-migen
   (package

base-commit: 6e50b0c56a8cc767bd3acb26638f78c450bde718
--
2.46.0
Information forwarded to guix-patches <at> gnu.org:
bug#73847; Package guix-patches. (Tue, 10 Dec 2024 11:43:02 GMT) Full text and rfc822 format available.

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

From: Cayetano Santos <csantosb <at> inventati.org>
To: 73847 <at> debbugs.gnu.org
Cc: Cayetano Santos <csantosb <at> inventati.org>,
 Cayetano Santos via Guix-patches via <guix-patches <at> gnu.org>
Subject: [PATCH v2] gnu: gtkwave: Update to 3.4.0-0.0a800de.
Date: Tue, 10 Dec 2024 12:42:04 +0100

From: Cayetano Santos via Guix-patches via <guix-patches <at> gnu.org>

* gnu/packages/fpga.scm (gtkwave): Update to 3.4.0-0.0a800de.

Change-Id: I58db65ebdebe2388640012b6248d1d9cd4540dcb
Signed-off-by: Cayetano Santos <csantosb <at> inventati.org>
---
 gnu/packages/fpga.scm | 65 ++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index e69169b980..2083d8fa7a 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages fpga)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system meson)
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
@@ -42,16 +43,19 @@ (define-module (gnu packages fpga)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
@@ -68,7 +72,6 @@ (define-module (gnu packages fpga)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
-  #:use-module (gnu packages tcl)
   #:use-module (gnu packages version-control))
 
 (define-public abc
@@ -361,38 +364,36 @@ (define-public arachne-pnr
     (license license:gpl2))))
 
 (define-public gtkwave
-  (package
-    (name "gtkwave")
-    (version "3.3.121")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (list (string-append "mirror://sourceforge/gtkwave/"
-                                 "gtkwave-" version "/"
-                                 "gtkwave-" version ".tar.gz")
-                  (string-append "https://gtkwave.sourceforge.net/"
-                                 "gtkwave-" version ".tar.gz")))
-       (sha256
-        (base32 "15w3x3zx5klqg1vjkakixw9zwfnkib7gf376knf5sryakd3bc1av"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list gperf pkg-config))
-    (inputs
-     (list tcl tk gtk+-2))
-    (arguments
-     (list #:configure-flags
-           #~(list (string-append "--with-tcl="
-                                  (assoc-ref %build-inputs "tcl")
-                                  "/lib")
-                   (string-append "--with-tk="
-                                  (assoc-ref %build-inputs "tk")
-                                  "/lib"))))
-    (synopsis "Waveform viewer for FPGA simulator trace files")
-    (description "This package is a waveform viewer for FPGA
+  (let ((commit "0a800de96255f7fb11beadb6729fdf670da76ecb")
+        (revision "0"))
+    (package
+      (name "gtkwave")
+      (version (git-version "3.4.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/gtkwave/gtkwave")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "113psdcv6a1npfv40gs1cjf9ck342fp31pf4y8msvc2dhcr72l1b"))))
+      (build-system meson-build-system)
+      (native-inputs (list cmake-minimal
+                           desktop-file-utils
+                           flex
+                           `(,glib "bin")
+                           gobject-introspection
+                           gperf
+                           pkg-config))
+      (inputs (list gtk+ gtk
+                    `(,gtk+ "bin")))
+      (synopsis "Waveform viewer for FPGA simulator trace files")
+      (description "This package is a waveform viewer for FPGA
 simulator trace files (@dfn{FST}).")
-    (home-page "https://gtkwave.sourceforge.net/")
-    ;; Exception against free government use in tcl_np.c and tcl_np.h.
-    (license (list license:gpl2+ license:expat license:tcl/tk))))
+      (home-page "https://github.com/gtkwave/gtkwave")
+      ;; Exception against free government use in tcl_np.c and tcl_np.h.
+      (license (list license:gpl2+ license:expat license:tcl/tk)))))
 
 (define-public python-migen
   (package

base-commit: 93e1586116f39a30ba1fcb67bd839a43533dfaf4
-- 
2.46.0
Information forwarded to guix-patches <at> gnu.org:
bug#73847; Package guix-patches. (Tue, 07 Jan 2025 18:07:02 GMT) Full text and rfc822 format available.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: Cayetano Santos <csantosb <at> inventati.org>
Cc: 74764 <at> debbugs.gnu.org, 73847 <at> debbugs.gnu.org
Subject: Re: bug#74764: [PATCH v2] gnu: gtkwave: Update to 3.4.0-0.0a800de.
Date: Tue, 07 Jan 2025 19:06:13 +0100

Cayetano Santos <csantosb <at> inventati.org> skribis:

> From: Cayetano Santos via Guix-patches via <guix-patches <at> gnu.org>
>
> * gnu/packages/fpga.scm (gtkwave): Update to 3.4.0-0.0a800de.
>
> Change-Id: I58db65ebdebe2388640012b6248d1d9cd4540dcb
> Signed-off-by: Cayetano Santos <csantosb <at> inventati.org>

[...]

> +  (let ((commit "0a800de96255f7fb11beadb6729fdf670da76ecb")
> +        (revision "0"))
> +    (package
> +      (name "gtkwave")
> +      (version (git-version "3.4.0" revision commit))

Normally we only package releases.

If you think we really need to take a snapshot in this case, could you
add a comment explaining why?

Thanks,
Ludo’.
Merged 73847 74764. Request was from Ludovic Courtès <ludo <at> gnu.org> to control <at> debbugs.gnu.org. (Wed, 08 Jan 2025 10:56:02 GMT) Full text and rfc822 format available.
Information forwarded to guix-patches <at> gnu.org:
bug#73847; Package guix-patches. (Mon, 19 May 2025 12:25:02 GMT) Full text and rfc822 format available.

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

From: Cayetano Santos <csantosb <at> inventati.org>
To: 73847-done <at> debbugs.gnu.org
Subject: close
Date: Mon, 19 May 2025 14:23:55 +0200

[Message part 1 (text/plain, inline)]
Obsoleted by #78137.

[signature.asc (application/pgp-signature, inline)]
This bug report was last modified 26 days ago.

Previous Next

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