GNU bug report logs - #46307
[PATCH] gnu: zeal: Update to 0.6.1-1.d3c5521.

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 46307 in the body.
You can then email your comments to 46307 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: Michael Rohleder <mike <at> rohleder.de>
To: guix-patches <at> gnu.org
Cc: Michael Rohleder <mike <at> rohleder.de>
Subject: [PATCH] gnu: zeal: Update to 0.6.1-1.d3c5521.
Date: Thu,  4 Feb 2021 23:54:26 +0100

* gnu/packages/documentation.scm (zeal): Update to 0.6.1-1.d3c5521.
[arguments]: Add phase wrap-qt-process-path.
[inputs]: Add qtwebengine, qtwebchannel, qtdeclarative, qtquickcontrols. Remove qtwebkit.
[home-page]: Changed to https://zealdocs.org/.
---
Zeal doesn't build with qt 5.15 (staging merge) for some reasons.
This patch upgrades to newest upstream commit (and change the inputs accordingly),
which fixes this.

 gnu/packages/documentation.scm | 76 +++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 0fca0b11eb..eb3227ca63 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe <at> gmail.com>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado <at> elephly.net>
-;;; Copyright © 2020 Michael Rohleder <mike <at> rohleder.de>
+;;; Copyright © 2020, 2021 Michael Rohleder <mike <at> rohleder.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -313,32 +313,50 @@ local system.")
     (license lgpl2.1+)))
 
 (define-public zeal
-  (package
-    (name "zeal")
-    (version "0.6.1")
-    (home-page "https://github.com/zealdocs/zeal")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url home-page)
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v"))))
-    (build-system qt-build-system)
-    (arguments `(#:tests? #f))          ; no tests
-    (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("libarchive" ,libarchive)
-       ("sqlite" ,sqlite)
-       ("qtbase" ,qtbase)
-       ("qtwebkit" ,qtwebkit)
-       ("qtx11extras" ,qtx11extras)
-       ("xcb-util-keyms" ,xcb-util-keysyms)))
-    (synopsis "Offline documentation browser inspired by Dash")
-    (description "Zeal is a simple offline documentation browser
+  (let ((commit "d3c5521c501d24050f578348ff1b9d68244b992c")
+        (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 "1ky2qi2cmjckc51lm3i28815ixgqdm36j7smixxr16jxpmbqs6sl"))))
+      (build-system qt-build-system)
+      (arguments
+       `(#: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")
+                                        "/lib/qt5/libexec/QtWebEngineProcess")))
+                 (wrap-program bin
+                   `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
+                 #t))))))
+      (native-inputs
+       `(("extra-cmake-modules" ,extra-cmake-modules)
+         ("pkg-config" ,pkg-config)))
+      (inputs
+       `(("libarchive" ,libarchive)
+         ("sqlite" ,sqlite)
+         ("qtbase" ,qtbase)
+         ("qtdeclarative" ,qtdeclarative)
+         ("qtwebchannel" ,qtwebchannel)
+         ("qtwebengine" ,qtwebengine)
+         ("qtquickcontrols" ,qtquickcontrols)
+         ("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
 inspired by Dash.")
-    (license gpl3+)))
+      (license gpl3+))))
-- 
2.30.0

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

From: Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
To: Michael Rohleder <mike <at> rohleder.de>
Cc: 46307-done <at> debbugs.gnu.org
Subject: Re: [bug#46307] [PATCH] gnu: zeal: Update to 0.6.1-1.d3c5521.
Date: Fri, 05 Feb 2021 17:22:27 +0100

Hello,

Michael Rohleder <mike <at> rohleder.de> writes:

> * gnu/packages/documentation.scm (zeal): Update to 0.6.1-1.d3c5521.
> [arguments]: Add phase wrap-qt-process-path.
> [inputs]: Add qtwebengine, qtwebchannel, qtdeclarative, qtquickcontrols. Remove qtwebkit.
> [home-page]: Changed to https://zealdocs.org/.
> ---
> Zeal doesn't build with qt 5.15 (staging merge) for some reasons.
> This patch upgrades to newest upstream commit (and change the inputs accordingly),
> which fixes this.

Applied. Thank you

Regards,
-- 
Nicolas Goaziou

Previous Next

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