From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0E4lJVB7HGCDDQAA0tVLHw (envelope-from ) for ; Thu, 04 Feb 2021 22:55:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sO7CIFB7HGCHFQAAbx9fmQ (envelope-from ) for ; Thu, 04 Feb 2021 22:55:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id D60BD940396 for ; Thu, 4 Feb 2021 22:55:11 +0000 (UTC) Received: from localhost ([::1]:60998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7nWo-0005kb-M7 for larch@yhetil.org; Thu, 04 Feb 2021 17:55:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7nWg-0005kE-Qm for guix-patches@gnu.org; Thu, 04 Feb 2021 17:55:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59115) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l7nWg-0007xy-JU for guix-patches@gnu.org; Thu, 04 Feb 2021 17:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l7nWg-0007D0-IW for guix-patches@gnu.org; Thu, 04 Feb 2021 17:55:02 -0500 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.15 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: D60BD940396 X-Spam-Score: 0.15 X-Migadu-Scanner: scn1.migadu.com X-TUID: NYol8cDLq5KW * 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