From unknown Sun Jun 22 08:00:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#46307] [PATCH] gnu: zeal: Update to 0.6.1-1.d3c5521. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Feb 2021 22:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46307 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46307@debbugs.gnu.org Cc: Michael Rohleder X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161247928327681 (code B ref -1); Thu, 04 Feb 2021 22:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Feb 2021 22:54:43 +0000 Received: from localhost ([127.0.0.1]:42428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l7nWM-0007CP-Jq for submit@debbugs.gnu.org; Thu, 04 Feb 2021 17:54:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:55148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l7nWI-0007CE-S6 for submit@debbugs.gnu.org; Thu, 04 Feb 2021 17:54:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7nWH-0005ix-L3 for guix-patches@gnu.org; Thu, 04 Feb 2021 17:54:38 -0500 Received: from wp224.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84e7::]:58900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7nWF-0007j0-A6 for guix-patches@gnu.org; Thu, 04 Feb 2021 17:54:37 -0500 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1l7nW9-0002Yc-CO; Thu, 04 Feb 2021 23:54:29 +0100 Received: from [192.168.1.3] (helo=micha.rohleder.de) by www.rohleder.de with esmtp (Exim 4.94) (envelope-from ) id 1l7nW0-0008CX-Ty; Thu, 04 Feb 2021 23:54:29 +0100 From: Michael Rohleder Date: Thu, 4 Feb 2021 23:54:26 +0100 Message-Id: <20210204225426.20206-1-mike@rohleder.de> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1612479275;e8e5c1b8; X-HE-SMSGID: 1l7nW9-0002Yc-CO Received-SPF: permerror client-ip=2a01:488:42:1000:50ed:84e7::; envelope-from=mike@rohleder.de; helo=wp224.webpack.hosteurope.de 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, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Ricardo Wurmus -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; ;;; 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 From unknown Sun Jun 22 08:00:53 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Michael Rohleder Subject: bug#46307: closed (Re: [bug#46307] [PATCH] gnu: zeal: Update to 0.6.1-1.d3c5521.) Message-ID: References: <87czxeeb7g.fsf@nicolasgoaziou.fr> <20210204225426.20206-1-mike@rohleder.de> X-Gnu-PR-Message: they-closed 46307 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 46307@debbugs.gnu.org Date: Fri, 05 Feb 2021 16:23:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1612542182-24329-1" This is a multi-part message in MIME format... ------------=_1612542182-24329-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #46307: [PATCH] gnu: zeal: Update to 0.6.1-1.d3c5521. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 46307@debbugs.gnu.org. --=20 46307: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D46307 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1612542182-24329-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 46307-done) by debbugs.gnu.org; 5 Feb 2021 16:22:38 +0000 Received: from localhost ([127.0.0.1]:44573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l83sU-0006JY-Cm for submit@debbugs.gnu.org; Fri, 05 Feb 2021 11:22:38 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:51113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l83sS-0006JK-4V for 46307-done@debbugs.gnu.org; Fri, 05 Feb 2021 11:22:36 -0500 X-Originating-IP: 185.131.40.67 Received: from localhost (40-67.ipv4.commingeshautdebit.fr [185.131.40.67]) (Authenticated sender: admin@nicolasgoaziou.fr) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id EE62C20002; Fri, 5 Feb 2021 16:22:28 +0000 (UTC) From: Nicolas Goaziou To: Michael Rohleder Subject: Re: [bug#46307] [PATCH] gnu: zeal: Update to 0.6.1-1.d3c5521. References: <20210204225426.20206-1-mike@rohleder.de> Date: Fri, 05 Feb 2021 17:22:27 +0100 In-Reply-To: <20210204225426.20206-1-mike@rohleder.de> (Michael Rohleder's message of "Thu, 4 Feb 2021 23:54:26 +0100") Message-ID: <87czxeeb7g.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 46307-done Cc: 46307-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Michael Rohleder 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 ------------=_1612542182-24329-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Feb 2021 22:54:43 +0000 Received: from localhost ([127.0.0.1]:42428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l7nWM-0007CP-Jq for submit@debbugs.gnu.org; Thu, 04 Feb 2021 17:54:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:55148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l7nWI-0007CE-S6 for submit@debbugs.gnu.org; Thu, 04 Feb 2021 17:54:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7nWH-0005ix-L3 for guix-patches@gnu.org; Thu, 04 Feb 2021 17:54:38 -0500 Received: from wp224.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84e7::]:58900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7nWF-0007j0-A6 for guix-patches@gnu.org; Thu, 04 Feb 2021 17:54:37 -0500 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1l7nW9-0002Yc-CO; Thu, 04 Feb 2021 23:54:29 +0100 Received: from [192.168.1.3] (helo=micha.rohleder.de) by www.rohleder.de with esmtp (Exim 4.94) (envelope-from ) id 1l7nW0-0008CX-Ty; Thu, 04 Feb 2021 23:54:29 +0100 From: Michael Rohleder To: guix-patches@gnu.org Subject: [PATCH] gnu: zeal: Update to 0.6.1-1.d3c5521. Date: Thu, 4 Feb 2021 23:54:26 +0100 Message-Id: <20210204225426.20206-1-mike@rohleder.de> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1612479275;e8e5c1b8; X-HE-SMSGID: 1l7nW9-0002Yc-CO Received-SPF: permerror client-ip=2a01:488:42:1000:50ed:84e7::; envelope-from=mike@rohleder.de; helo=wp224.webpack.hosteurope.de 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, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Michael Rohleder X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Ricardo Wurmus -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; ;;; 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 ------------=_1612542182-24329-1--