From patchwork Thu Oct 17 08:56:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 32059 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7D61927BBE2; Thu, 17 Oct 2024 10:02:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 78E8D27BBE9 for ; Thu, 17 Oct 2024 10:02:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1MO9-0002Jq-Gq; Thu, 17 Oct 2024 05:01:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1MO6-0002JN-Kb for guix-patches@gnu.org; Thu, 17 Oct 2024 05:01:42 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t1MO6-0006c9-C5 for guix-patches@gnu.org; Thu, 17 Oct 2024 05:01:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=uD+yHcvxfLgbiRnJfPyQ0byA/VkAnCiSBBvX5m8Nk6I=; b=C0FwTF7dELnV+hJS0W4YJUhjEZWFHJh0A1QdHAFA358J4RuVLlUfnzIlBXF+VrSXyuTqH6NOxc/2eInFdrGlH+Dt3B8ktxNvNknZlVCmZYV3AjCUFicqmg4pmJA0jET4e8/YLxR5YlkVP2kj9WDb6Q8NG8T8pCxFAjDG3j+ZiSYfTmeOJkBKwVUhICT1fhyCf9lvSN2hHtJcSf8bXg047KQCi1pPHPjwTPsKmnrnv+PSe3ndNIKOuoaowL59wkM1hRsNGKaKYF2ezECdIyGA+WZgLGhikZQzk4CZt8JrluQDTdPqnuQVZ5VYNiE2ZTz7QUk2bTrr1zfs463vU16DLg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t1MOQ-0004MJ-GU for guix-patches@gnu.org; Thu, 17 Oct 2024 05:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73847] [PATCH] gnu: gtkwave: Update to 3.4.0-0.0a800de. Resent-From: Cayetano Santos Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Thu, 17 Oct 2024 09:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73847 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73847@debbugs.gnu.org Cc: Cayetano Santos , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by submit@debbugs.gnu.org id=B.172915566916671 (code B ref -1); Thu, 17 Oct 2024 09:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Oct 2024 09:01:09 +0000 Received: from localhost ([127.0.0.1]:33363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1MNY-0004Kp-QU for submit@debbugs.gnu.org; Thu, 17 Oct 2024 05:01:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:51190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1MNV-0004Kg-VW for submit@debbugs.gnu.org; Thu, 17 Oct 2024 05:01:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1MNA-0002DR-RM for guix-patches@gnu.org; Thu, 17 Oct 2024 05:00:44 -0400 Received: from confino.investici.org ([93.190.126.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1MN7-0006IG-Jy for guix-patches@gnu.org; Thu, 17 Oct 2024 05:00:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1729155637; bh=uD+yHcvxfLgbiRnJfPyQ0byA/VkAnCiSBBvX5m8Nk6I=; h=From:To:Cc:Subject:Date:From; b=FbIDA2tz9XFmKO34LUABW5HAAwoGEbckoyxeoo+X2lM7+aN/Za/4zLPjFfyCOGA7C 6qh2iQRllqosvoM77t4B/+7Q//YQn4AgNs3jruGaq3GkAPj5K7nZBp9+GEhRkt8wSs zvdB49Jo3L2EXL+C+T9JNTRi/zQA5VlH6m9UbIgw= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4XThd11tJtz11BM; Thu, 17 Oct 2024 09:00:37 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4XThd10hMhz11BG; Thu, 17 Oct 2024 09:00:37 +0000 (UTC) Date: Thu, 17 Oct 2024 10:56:30 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=93.190.126.19; envelope-from=csantosb@inventati.org; helo=confino.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Cayetano Santos X-ACL-Warn: , Cayetano Santos via Guix-patches X-Patchwork-Original-From: Cayetano Santos via Guix-patches via From: Cayetano Santos Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: d95588242c605fbb72e25fe36a0903a1538e9018 -- 2.46.0 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