From patchwork Tue Nov 28 23:16:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Merkley X-Patchwork-Id: 57032 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 4223527BBEA; Wed, 29 Nov 2023 02:01:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 7D10A27BBE9 for ; Wed, 29 Nov 2023 02:01:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r89tH-00065i-SN; Tue, 28 Nov 2023 21:01:28 -0500 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 1r87L2-0002tT-46 for guix-patches@gnu.org; Tue, 28 Nov 2023 18:17:56 -0500 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 1r87L1-0006ya-JD for guix-patches@gnu.org; Tue, 28 Nov 2023 18:17:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r87L8-0000oU-Cg for guix-patches@gnu.org; Tue, 28 Nov 2023 18:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67519] [PATCH] gtkwave: Update to 3.3.117 and use gtk3 Resent-From: Nathan Merkley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Nov 2023 23:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67519 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67519@debbugs.gnu.org Cc: Nathan Merkley X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17012134513081 (code B ref -1); Tue, 28 Nov 2023 23:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Nov 2023 23:17:31 +0000 Received: from localhost ([127.0.0.1]:48437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r87Kc-0000nd-MB for submit@debbugs.gnu.org; Tue, 28 Nov 2023 18:17:31 -0500 Received: from lists.gnu.org ([2001:470:142::17]:47786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r87KY-0000nH-4A for submit@debbugs.gnu.org; Tue, 28 Nov 2023 18:17:29 -0500 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 1r87KK-0002rG-T9 for guix-patches@gnu.org; Tue, 28 Nov 2023 18:17:13 -0500 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r87KJ-0006uN-1r for guix-patches@gnu.org; Tue, 28 Nov 2023 18:17:12 -0500 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-6cd8ce7bf7fso2718399b3a.0 for ; Tue, 28 Nov 2023 15:17:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701213427; x=1701818227; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NGR9sgTrixadD1pfQx/3xW8F0ih9Gp50XzcG+FIjzOo=; b=e6H1GcYZ+dKlhnjiv3sLoOQSH5z/k2YEftPhBeu6yneter3l7feLUL2LDO2nLq58vi e1Z+VLI7qODEBmV8jQqKh1sUqH5ZO9UQHWSYKU8373b8JmmM4GVNT0AlmVUcDBU4NwF4 3nfx8zvJ3lRRgu7jOKjRmWq3HNkt2ISLq5xDuF1z6asvg69AKmv1+9TihrKk2XQ+MOEZ yU2byVFhsNgOb9rZ3jT6OivWoV/5YrlShptsk5H6anl/2UQnQBT2Js22dauiGndpUIaz xnQDHbGAX0j7RdsjU8qQEg/6QgNHz3xQweRIlZeh+y9UeXh6zuLhdOIuNXts9JFvkkcp NCrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701213427; x=1701818227; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NGR9sgTrixadD1pfQx/3xW8F0ih9Gp50XzcG+FIjzOo=; b=P+CWq2bT/FEGviEKPB/PR3PBIYP5NyhMMNbhAExD8FYugqWt+bSNaSM1lXMRweoXHW b1q8qZylZU/sSPHu3GHCI3gFKP5k1UGbeyGkrS7hcjqCpFNPTiUoKEN2ne8+b0xBorSy oD9nXDrI9Iy+Ppeq/E5fmh5OZA2+OMWxcqlBNMlqGR/q3qDl16Yrinp+jD0PfvRorV3d gy2lHyP35Tq3xSlpb/rYeUqVmGBVMi6rd4AN4Q/6uQGGfBzLDJCqhgIFD8iPDLBq5DWF RzVt2UITavZzJDRh4B3rTVrhA3CcAIUxUyaS69LgFy4uW/y0Uaehje+r7n6gp5N6poAw UhvA== X-Gm-Message-State: AOJu0YwCHkMyOpxUjW5AoRsg9W86MhENP7eL66gLotL5vDPke5paAhu8 jNj+LicbnCfVnxai1R59XXEVCsLpoqg= X-Google-Smtp-Source: AGHT+IEdrE9vTPZBjLkIp8o1gU92nXsQCM6Ng7JzxYh2G2cA3tjjqEeH2uebnz5vDuiXiOc6Fcy8zw== X-Received: by 2002:a05:6a20:d495:b0:18b:386a:46a5 with SMTP id im21-20020a056a20d49500b0018b386a46a5mr18382252pzb.17.1701213426807; Tue, 28 Nov 2023 15:17:06 -0800 (PST) Received: from marauder.nextcenturymeters.com (c-67-169-255-59.hsd1.ut.comcast.net. [67.169.255.59]) by smtp.gmail.com with ESMTPSA id p5-20020a170902780500b001c5fc11c085sm11038673pll.264.2023.11.28.15.17.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 15:17:06 -0800 (PST) From: Nathan Merkley Date: Tue, 28 Nov 2023 16:16:31 -0700 Message-ID: <3cef56ba1d81f8701c611a8e14e48cc3188886f2.1701212697.git.nathanmerkley@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=nathanmerkley@gmail.com; helo=mail-pf1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-Mailman-Approved-At: Tue, 28 Nov 2023 21:01:25 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.3.117 and use gtk3 Change-Id: If2e660144b86b30fb6e90a7623fb0d9a439f6e65 --- gnu/packages/fpga.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) base-commit: 62376e3eb67644454bc655bed56be4be965bd13e diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 13ac1a0b57..48df57125d 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -31,6 +31,7 @@ (define-module (gnu packages fpga) #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (gnu packages) @@ -38,6 +39,7 @@ (define-module (gnu packages fpga) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages elf) + #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tcl) #:use-module (gnu packages readline) @@ -346,25 +348,28 @@ (define-public arachne-pnr (define-public gtkwave (package (name "gtkwave") - (version "3.3.113") + (version "3.3.117") (source (origin (method url-fetch) (uri (list (string-append "mirror://sourceforge/gtkwave/" - "gtkwave-" version "/" - "gtkwave-" version ".tar.gz") + "gtkwave-gtk3-" version "/" + "gtkwave-gtk3-" version ".tar.gz") (string-append "https://gtkwave.sourceforge.net/" - "gtkwave-" version ".tar.gz"))) + "gtkwave-gtk3" version ".tar.gz"))) (sha256 - (base32 "1zqkfchmns5x90qxa8kg39bfhax3vxf1mrdz3lhyb9fz1gp4difn")))) - (build-system gnu-build-system) + (base32 "1f8xazl1i4fbwffgcwaal740i9vdrwcgmy0sc2qcn4d9hrsm7w9w")))) + (build-system glib-or-gtk-build-system) (native-inputs - (list gperf pkg-config)) + (list gperf pkg-config `(,glib "bin"))) (inputs - (list tcl tk gtk+-2)) + (list tcl tk gtk+)) (arguments (list #:configure-flags - #~(list (string-append "--with-tcl=" + #~(list "--disable-dependency-tracking" + "--with-gsettings" + "--enable-gtk3" + (string-append "--with-tcl=" (assoc-ref %build-inputs "tcl") "/lib") (string-append "--with-tk="