From patchwork Fri Jun 9 13:29:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?6Lev6L6J?= X-Patchwork-Id: 50797 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 B49CF27BBE9; Fri, 9 Jun 2023 16:13:08 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 D591E27BBE2 for ; Fri, 9 Jun 2023 16:13:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7cCm-0002BP-6E; Fri, 09 Jun 2023 09:31:04 -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 1q7cCk-0002AU-Lc for guix-patches@gnu.org; Fri, 09 Jun 2023 09:31:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7cCk-0002GU-Cw for guix-patches@gnu.org; Fri, 09 Jun 2023 09:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7cCk-0001nu-9P for guix-patches@gnu.org; Fri, 09 Jun 2023 09:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63971] [PATCH] gnu: libsigrokdecode: Fix build & Upgrade. Resent-From: =?utf-8?b?6Lev6L6J?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Jun 2023 13:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63971 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63971@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16863174186879 (code B ref -1); Fri, 09 Jun 2023 13:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Jun 2023 13:30:18 +0000 Received: from localhost ([127.0.0.1]:58617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7cC2-0001mt-6L for submit@debbugs.gnu.org; Fri, 09 Jun 2023 09:30:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:51324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7cC0-0001ml-Jn for submit@debbugs.gnu.org; Fri, 09 Jun 2023 09:30:17 -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 1q7cBy-000221-8z for guix-patches@gnu.org; Fri, 09 Jun 2023 09:30:14 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q7cBw-0001wB-A4 for guix-patches@gnu.org; Fri, 09 Jun 2023 09:30:13 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-5149c76f4dbso3145186a12.1 for ; Fri, 09 Jun 2023 06:30:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686317410; x=1688909410; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=CfOEAXcY0RKmeltwbu0fQWEKZAFbBaAM3ntURoCIpJA=; b=JCE7/zaQJNNKVu+QIa2LMdvA6xQy+AoRpgFKS7K4zGj7CYd8GrXwFpIYihoyACRAy+ Mj3nl2Dsz0p4+WuaOuPE/jMqKGoQJsdYxWhHAA7g63/d0DUdYNn4aq3mazXHFKx98ys/ hcR0bxW5/ocUv2vEQaOElZ3tsoo30lxybToiFhHQ8lOTbWfCxPqUcDg2tV7hiRxaq5nQ 1DU75rBTKuW0J6mmfokl6rssBAqlbGxLJMfTnWpGhETCR/Qe16e+DhSze4xlTEWcb2Ay E7EiNbcvypiqK5Dw70kKG1544Dblr+xgSIGSlC/Do17WZ6VpxSrhYCN+b24nokhzzphB sOYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686317410; x=1688909410; h=content-transfer-encoding:to:subject:message-id:date:from :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CfOEAXcY0RKmeltwbu0fQWEKZAFbBaAM3ntURoCIpJA=; b=ZHUXk8bJNwY1hQitcivl9lq9EQHcke6Gqc4oRwRbB2yD2q54vyb/ORoL07WsnwjZ7g XGrxJfYqirWr8lVePj+JpSCPCObTjnCxJnUUwkTp/C9/HCu59jMSKxVGWyno3xxDm7Pi QTXlt1vDQGiEOFkA1W3STtcMa4Y2W5m6J0uhAp4Tv8p29WUz5AwTZp0PjTXy1EyX608p qaTuK44/5lQ0rKIwId6WzNmh4nJDFupiqa9pw9seeDzgw/CTs9crNJMptX3NVqJCPjNc GIS3Bm1G78nILp5yljnNLSQfnhb+xCpV6baVQynClvtu8iCst0IL/4NNUH5FCbvBLSFs w1zg== X-Gm-Message-State: AC+VfDzQRLxNdztio54kRq/mxdH2kwlf7AkwreVGVVOYPzSA6y7I9DfO JsrE/xH9IlGxkUIaa590075d0fjlTUQjX3Hq2oHa+pVROKK3Mg== X-Google-Smtp-Source: ACHHUZ6VX/udz0cm/cAFxwrgqP4q0TuuTnyN9ozoAKer7o/V65JUDfqfj0VRf1RzXNPYonQAl0u6fl2l+K0TWHgk5eQ= X-Received: by 2002:aa7:c48a:0:b0:514:9acd:7bc1 with SMTP id m10-20020aa7c48a000000b005149acd7bc1mr1342708edq.9.1686317410293; Fri, 09 Jun 2023 06:30:10 -0700 (PDT) MIME-Version: 1.0 From: =?utf-8?b?6Lev6L6J?= Date: Fri, 9 Jun 2023 13:29:57 +0000 Message-ID: Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=luhux76@gmail.com; helo=mail-ed1-x541.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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_ENVFROM_END_DIGIT=0.25, 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-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 From c13524f3ea5f6338c3aff1b3b3c3598914a46adc Mon Sep 17 00:00:00 2001 From: Lu Hui Date: Fri, 9 Jun 2023 21:22:10 +0800 Subject: [PATCH] gnu: libsigrokdecode: Fix build & Upgrade. * gnu/packages/electronics.scm (libsigrokdecode)[version]: use git version [source]: switch to git repo. [native-inputs]: add libtool. [arguments]<#:phases>: not need replace bootstrap. --- gnu/packages/electronics.scm | 81 +++++++++++++++++------------------- 1 file changed, 39 insertions(+), 42 deletions(-) which provides (streaming) protocol decoding functionality.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public sigrok-firmware-fx2lafw (package diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index a8c07f6d94..980827ae1f 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2023 Lu Hui ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,49 +80,45 @@ (define-public libserialport (license license:lgpl3+))) (define-public libsigrokdecode - (package - (name "libsigrokdecode") - (version "0.5.3") - (source (origin - (method url-fetch) - (uri (string-append - "http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-" - version ".tar.gz")) - (sha256 - (base32 - "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265")) - (patches - (search-patches "libsigrokdecode-python3.9-fix.patch")))) - (outputs '("out" "doc")) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (invoke "autoconf") - (invoke "aclocal") - (invoke "automake" "-ac"))) - (add-after 'build 'build-doc - (lambda _ - (invoke "doxygen") - #t)) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (copy-recursively "doxy/html-api" - (string-append (assoc-ref outputs "doc") - "/share/doc/libsigrokdecode")) - #t))))) - (native-inputs - (list check doxygen graphviz pkg-config automake autoconf)) - ;; libsigrokdecode.pc lists "python" in Requires.private, and "glib" in Requires. - (propagated-inputs - (list glib python)) - (build-system gnu-build-system) - (home-page "https://www.sigrok.org/wiki/Libsigrokdecode") - (synopsis "Library providing (streaming) protocol decoding functionality") - (description "Libsigrokdecode is a shared library written in C, which provides + (let* ((commit "73cb5461acdbd007f4aa9e81385940fad6607696") + (revision "0")) + (package + (name "libsigrokdecode") + (version (git-version "0.5.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sigrokproject/libsigrokdecode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1i4jpkhb9yqf1fmbvlzdifj9arkspspffn93q8yh4vq5zr27k085")))) + (outputs '("out" "doc")) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda _ + (invoke "doxygen") + #t)) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "doxy/html-api" + (string-append (assoc-ref outputs "doc") + "/share/doc/libsigrokdecode")) + #t))))) + (native-inputs + (list check doxygen graphviz pkg-config automake autoconf libtool)) + ;; libsigrokdecode.pc lists "python" in Requires.private, and "glib" in Requires. + (propagated-inputs + (list glib python)) + (build-system gnu-build-system) + (home-page "https://www.sigrok.org/wiki/Libsigrokdecode") + (synopsis "Library providing (streaming) protocol decoding functionality") + (description "Libsigrokdecode is a shared library written in C,