GNU bug report logs - #69411
[PATCH] gnu: zeal: Update to 0.7.0.

Previous Next

Package: guix-patches;

Reported by: Felix Gruber <felgru <at> posteo.net>

Date: Mon, 26 Feb 2024 16:26:04 UTC

Severity: normal

Tags: patch

Done: Andreas Enge <andreas <at> enge.fr>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#69411; Package guix-patches. (Mon, 26 Feb 2024 16:26:04 GMT) Full text and rfc822 format available.
Acknowledgement sent to Felix Gruber <felgru <at> posteo.net>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Mon, 26 Feb 2024 16:26:04 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH] gnu: zeal: Update to 0.7.0.
Date: Mon, 26 Feb 2024 15:58:10 +0000

* gnu/packages/documentation.scm (zeal): Update to 0.7.0.
  [arguments]: Convert to gexp.
  [inputs]: Use new label-less style.

Change-Id: I9d2851ee303f2e8ebed80b4a1e463aa290bea111
---
 gnu/packages/documentation.scm | 84 +++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 43 deletions(-)

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 5d455431d3..8fd06326dc 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021, 2022 Marius Bakke <marius <at> gnu.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.counoyer <at> gmail.com>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2024 Felix Gruber <felgru <at> posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -380,49 +381,46 @@ (define-public scrollkeeper
     (license lgpl2.1+)))
 
 (define-public zeal
-  (let ((commit "1cfa7c637f745be9d98777f06b4f8dec90892bf2")
-        (revision "1"))
-    (package
-      (name "zeal")
-      (version (git-version "0.6.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/zealdocs/zeal")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1m7pp3cwc21x03718vhwfd9j2n8md3hv5dp10s234vcsd755s7a3"))))
-      (build-system qt-build-system)
-      (arguments
-       `(#:tests? #f                    ;no tests
-         #:phases
-         (modify-phases %standard-phases
+  (package
+    (name "zeal")
+    (version "0.7.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/zealdocs/zeal")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0nlya5r6dfvxqxyw9srav70ni5c11q9d4kmhywx63dfm65mmlldk"))))
+    (build-system qt-build-system)
+    (arguments
+      (list
+       #:tests? #f                    ;no tests
+       #:phases
+       #~(modify-phases %standard-phases
            (add-after 'wrap 'wrap-qt-process-path
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (bin (string-append out "/bin/zeal"))
-                      (qt-process-path (string-append
-                                        (assoc-ref inputs "qtwebengine-5")
-                                        "/lib/qt5/libexec/QtWebEngineProcess")))
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let* ((bin (string-append #$output "/bin/zeal"))
+                      (qt-process-path
+                        (search-input-file inputs
+                          "/lib/qt5/libexec/QtWebEngineProcess")))
                  (wrap-program bin
-                   `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
-                 #t))))))
-      (native-inputs
-       (list extra-cmake-modules pkg-config))
-      (inputs
-       `(("libarchive" ,libarchive)
-         ("sqlite" ,sqlite)
-         ("qtbase" ,qtbase-5)
-         ("qtdeclarative-5" ,qtdeclarative-5)
-         ("qtwebchannel-5" ,qtwebchannel-5)
-         ("qtwebengine-5" ,qtwebengine-5)
-         ("qtquickcontrols-5" ,qtquickcontrols-5)
-         ("qtx11extras" ,qtx11extras)
-         ("xcb-util-keyms" ,xcb-util-keysyms)))
-      (home-page "https://zealdocs.org/")
-      (synopsis "Offline documentation browser inspired by Dash")
-      (description "Zeal is a simple offline documentation browser
+                   `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
+    (native-inputs
+     (list extra-cmake-modules pkg-config))
+    (inputs
+     (list libarchive
+           sqlite
+           qtbase-5
+           qtdeclarative-5
+           qtwebchannel-5
+           qtwebengine-5
+           qtquickcontrols-5
+           qtx11extras
+           xcb-util-keysyms))
+    (home-page "https://zealdocs.org/")
+    (synopsis "Offline documentation browser inspired by Dash")
+    (description "Zeal is a simple offline documentation browser
 inspired by Dash.")
-      (license gpl3+))))
+    (license gpl3+)))

base-commit: 1d85f921f6977875d98de68ffdedf43be3dfcd9d
-- 
2.43.0
Information forwarded to guix-patches <at> gnu.org:
bug#69411; Package guix-patches. (Sun, 09 Jun 2024 15:04:02 GMT) Full text and rfc822 format available.

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

From: Felix Gruber <felgru <at> posteo.net>
To: 69411 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH v2] gnu: zeal: Update to 0.7.1.
Date: Sun,  9 Jun 2024 15:02:30 +0000

* gnu/packages/documentation.scm (zeal): Update to 0.7.1.
  [arguments]: Convert to gexp.
  [inputs]: Use new label-less style.

Change-Id: I9d2851ee303f2e8ebed80b4a1e463aa290bea111
---
 gnu/packages/documentation.scm | 84 +++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 43 deletions(-)

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 12fbaf1d0c..2a047ba790 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021, 2022 Marius Bakke <marius <at> gnu.org>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.counoyer <at> gmail.com>
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2024 Felix Gruber <felgru <at> posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -410,52 +411,49 @@ (define-public scrollkeeper
     (license license:lgpl2.1+)))
 
 (define-public zeal
-  (let ((commit "1cfa7c637f745be9d98777f06b4f8dec90892bf2")
-        (revision "1"))
-    (package
-      (name "zeal")
-      (version (git-version "0.6.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/zealdocs/zeal")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1m7pp3cwc21x03718vhwfd9j2n8md3hv5dp10s234vcsd755s7a3"))))
-      (build-system qt-build-system)
-      (arguments
-       `(#:tests? #f                    ;no tests
-         #:phases
-         (modify-phases %standard-phases
+  (package
+    (name "zeal")
+    (version "0.7.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/zealdocs/zeal")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1yz9zz18rh1d67w40ib4pna70vqkwa9i9nyj423rjysv5rdj2pzp"))))
+    (build-system qt-build-system)
+    (arguments
+      (list
+       #:tests? #f                    ;no tests
+       #:phases
+       #~(modify-phases %standard-phases
            (add-after 'wrap 'wrap-qt-process-path
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (bin (string-append out "/bin/zeal"))
-                      (qt-process-path (string-append
-                                        (assoc-ref inputs "qtwebengine-5")
-                                        "/lib/qt5/libexec/QtWebEngineProcess")))
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let* ((bin (string-append #$output "/bin/zeal"))
+                      (qt-process-path
+                        (search-input-file inputs
+                          "/lib/qt5/libexec/QtWebEngineProcess")))
                  (wrap-program bin
-                   `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
-                 #t))))))
-      (native-inputs
-       (list extra-cmake-modules pkg-config))
-      (inputs
-       `(("libarchive" ,libarchive)
-         ("sqlite" ,sqlite)
-         ("qtbase" ,qtbase-5)
-         ("qtdeclarative-5" ,qtdeclarative-5)
-         ("qtwebchannel-5" ,qtwebchannel-5)
-         ("qtwebengine-5" ,qtwebengine-5)
-         ("qtquickcontrols-5" ,qtquickcontrols-5)
-         ("qtx11extras" ,qtx11extras)
-         ("xcb-util-keyms" ,xcb-util-keysyms)))
-      (home-page "https://zealdocs.org/")
-      (synopsis "Offline documentation browser inspired by Dash")
-      (description "Zeal is a simple offline documentation browser
+                   `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
+    (native-inputs
+     (list extra-cmake-modules pkg-config))
+    (inputs
+     (list libarchive
+           sqlite
+           qtbase-5
+           qtdeclarative-5
+           qtwebchannel-5
+           qtwebengine-5
+           qtquickcontrols-5
+           qtx11extras
+           xcb-util-keysyms))
+    (home-page "https://zealdocs.org/")
+    (synopsis "Offline documentation browser inspired by Dash")
+    (description "Zeal is a simple offline documentation browser
 inspired by Dash.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public markdeep
   (package

base-commit: bc8a41f4a8d9f1f0525d7bc97c67ed3c8aea3111
-- 
2.43.0
Reply sent to Andreas Enge <andreas <at> enge.fr>:
You have taken responsibility. (Sat, 06 Jul 2024 17:52:01 GMT) Full text and rfc822 format available.
Notification sent to Felix Gruber <felgru <at> posteo.net>:
bug acknowledged by developer. (Sat, 06 Jul 2024 17:52:02 GMT) Full text and rfc822 format available.

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

From: Andreas Enge <andreas <at> enge.fr>
To: 69411-done <at> debbugs.gnu.org
Subject: Close
Date: Sat, 6 Jul 2024 19:50:45 +0200

Hello Felix,

thank you for the patch, and for modernising the package style.
Applied.

Andreas
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sun, 04 Aug 2024 11:24:07 GMT) Full text and rfc822 format available.
This bug report was last modified 139 days ago.

Previous Next

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