[bug#78137,electronics-team] gnu: gtkwave: Update to 3.4.0-0.bb978d9.

Message ID 637fef4126c2b44d8fc82ce17e065e491d5eb686.1745935840.git.csantosb@inventati.org
State New
Headers
Series [bug#78137,electronics-team] gnu: gtkwave: Update to 3.4.0-0.bb978d9. |

Commit Message

Cayetano Santos April 29, 2025, 2:10 p.m. UTC
  * gnu/packages/fpga.scm (gtkwave): Update to 3.4.0-0.bb978d9.

Change-Id: I38aabca14c2789ad7b3bc304b7018644dc6d0fa6
---

Update package and fetch from its new home at github, branch master. Note that branch lts comprises the v3.x series.

[source]: Switch to git-fetch, new uri.
[version]: Switch to branch master, version 3.4.
[build-system]: Switch to meson-build-system.
[native-inputs]: Add new requirements.
[inputs]: Add libfst and tcllib.
[homepage]: Update URL.

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


base-commit: 881d46eb386c2de8bc6f1405972ee1e115eeb3a1
prerequisite-patch-id: d0bc54cf519652d6da310bfa99fe88c37275c298
prerequisite-patch-id: 445cfff048522cbeff4f72a4fc26088b591d0eb2
prerequisite-patch-id: cfb57a770c5842c09a09babb7e0a8db1b7af3426
prerequisite-patch-id: e8a09c6bf1ac37d125a3353a8535880866796309
prerequisite-patch-id: 3a61467968b32892273f687c17983450a368cc94
prerequisite-patch-id: 21b2f5649dd576054bd09b705eedc0d3f9a0ad40
prerequisite-patch-id: 11c1a4c6255b9ec68fc2dac4a8e6a4d3fb57c65f
prerequisite-patch-id: 6b9c8a416da71858be3d7993b265348728fbc05d
prerequisite-patch-id: 5dea2248b3d1c5f73c23e2a9baf6ddcc80bcb08d
prerequisite-patch-id: ba8b325464becfb2d07b744ea7dbc641e45d8706
prerequisite-patch-id: 01a405a7f983be361c4136012366098c34331d3d
prerequisite-patch-id: a86f79363080611b53d31c07a5811a1a8b4c836e
prerequisite-patch-id: cbd7ce8e4c113b13ace6585d10c286b74696f15f
prerequisite-patch-id: 8ed48edd220dea035ebdc7250488277a101e54b1
prerequisite-patch-id: 40d90dbaf56a83ab21d256c3b61b15ab069ca3be
prerequisite-patch-id: 26c764ced5719f25db5e6d6bbf7b8cf1b0556b75
prerequisite-patch-id: ffb488bdef37ca0e7fca5252d732c6eea9cb9272
prerequisite-patch-id: 10568bc6c8a0d9713505a3ac375ffc424b06615d
prerequisite-patch-id: a7360a53edf94070f1589ea6bddceaeaaccd3c90
prerequisite-patch-id: 48698cd40d9ef43b8b646660f2e18141681792ed
prerequisite-patch-id: cc1917ae421a9d5e5e737ab0d7d64eafb80c66ea
prerequisite-patch-id: f25b46e1e08ed9a23bafd4547b30559e87aafc83
prerequisite-patch-id: ebfbf78c71e216e14009a9c619502d515bd301e9
prerequisite-patch-id: 4debf0c53a034e80221112c95ed3572f436ed5b6
prerequisite-patch-id: 4e2979d172c82620e1f423201034aa00610ea22f
prerequisite-patch-id: c411a74b430b78540a70d5516623bd92508e1505
prerequisite-patch-id: eb5d2e8f4679f970898c2b0f1a0caf6dc941712a
prerequisite-patch-id: 1ad337c9c9741592793782f97db490bba02d3c4b
--
2.49.0
  

Patch

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 4fcd6a47a6..fc44166bff 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -53,6 +53,7 @@  (define-module (gnu packages fpga)
   #: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)
@@ -77,6 +78,7 @@  (define-module (gnu packages fpga)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages shells)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages texinfo)
@@ -434,39 +436,41 @@  (define-public nextpnr-ice40
       (license license:expat))))
 
 (define-public gtkwave
-  (package
-    (name "gtkwave")
-    (version "3.3.121")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (list (string-append "mirror://sourceforge/gtkwave/"
-                                 "gtkwave-gtk3-" version "/"
-                                 "gtkwave-gtk3-" version ".tar.gz")
-                  (string-append "https://gtkwave.sourceforge.net/"
-                                 "gtkwave-" version ".tar.gz")))
-       (sha256
-        (base32 "0ikk49zyar5aiq7pg9whi4nfzq7xm8sz7bn3b6vaylkdimw4bajl"))))
-    (build-system glib-or-gtk-build-system)
-    (native-inputs
-     (list gperf pkg-config))
-    (inputs
-     (list gtk+ tcl tk))
-    (arguments
-     (list #:configure-flags
-           #~(list "--enable-gtk3"
-                   (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
+  ;; there are no releases in master branch, which includes 3.4.0
+  (let ((commit "bb978d9d667d569b9153ffa34007e300302907dc")
+        (revision "0"))
+    (package
+      (name "gtkwave")
+      (version (git-version "3.4.0" revision commit)) ; version from meson.build
+      (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 "1nv27cpz5937cb6bkhpw8w0ji6hm9xr8f0znvfwzfl1fwwypf23y"))))
+      (build-system meson-build-system)
+      (native-inputs (list desktop-file-utils
+                           flex
+                           `(,glib "bin")
+                           gobject-introspection
+                           gperf
+                           perl
+                           pkg-config
+                           tcsh))
+      (inputs (list gtk
+                    gtk+
+                    `(,gtk+ "bin")
+                    libfst
+                    tcllib))
+      (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
   ;; XXX: The latest version tag (0.9.2) was placed in 2019, there are latest