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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Andreas Enge <andreas <at> enge.fr>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#69411: closed ([PATCH] gnu: zeal: Update to 0.7.0.)
Date: Sat, 06 Jul 2024 17:52:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sat, 6 Jul 2024 19:50:45 +0200
with message-id <ZomD9efNkg6IN_kw <at> jurong>
and subject line Close
has caused the debbugs.gnu.org bug report #69411,
regarding [PATCH] gnu: zeal: Update to 0.7.0.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
69411: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=69411
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

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

[Message part 3 (message/rfc822, inline)]

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

Previous Next

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