GNU bug report logs - #63971
[PATCH] gnu: libsigrokdecode: Fix build & Upgrade.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63971 in the body.
You can then email your comments to 63971 AT debbugs.gnu.org in the normal way.

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

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

From: 路辉 <luhux76 <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: libsigrokdecode: Fix build & Upgrade.
Date: Fri, 9 Jun 2023 13:29:57 +0000

From c13524f3ea5f6338c3aff1b3b3c3598914a46adc Mon Sep 17 00:00:00 2001
From: Lu Hui <luhux76 <at> gmail.com>
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(-)

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 <efraim <at> flashner.co.il>
 ;;; Copyright © 2021 Leo Famulari <leo <at> famulari.name>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2023 Lu Hui <luhux76 <at> gmail.com>
 ;;;
 ;;; 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,
which provides
 (streaming) protocol decoding functionality.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))

 (define-public sigrok-firmware-fx2lafw
   (package
-- 
2.40.1

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

From: 宋文武 <iyzsong <at> envs.net>
To: 路辉 <luhux76 <at> gmail.com>
Cc: 63971-done <at> debbugs.gnu.org
Subject: Re: [bug#63971] [PATCH] gnu: libsigrokdecode: Fix build & Upgrade.
Date: Sun, 27 Aug 2023 10:20:45 +0800

路辉 <luhux76 <at> gmail.com> writes:

>>From c13524f3ea5f6338c3aff1b3b3c3598914a46adc Mon Sep 17 00:00:00 2001
> From: Lu Hui <luhux76 <at> gmail.com>
> Date: Fri, 9 Jun 2023 21:22:10 +0800
> Subject: [PATCH] gnu: libsigrokdecode: Fix build & Upgrade.

Applied with update to latest version and adjusted commit message, thank
you!

Previous Next

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