From patchwork Mon Feb 26 15:58:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 61139 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 084B227BBEA; Mon, 26 Feb 2024 16:26:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EF99C27BBE2 for ; Mon, 26 Feb 2024 16:25:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rednW-0005m2-2X; Mon, 26 Feb 2024 11:25:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rednQ-0005AA-Hz for guix-patches@gnu.org; Mon, 26 Feb 2024 11:25:40 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rednP-0001i3-5l for guix-patches@gnu.org; Mon, 26 Feb 2024 11:25:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1redno-0008BQ-FX for guix-patches@gnu.org; Mon, 26 Feb 2024 11:26:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69411] [PATCH] gnu: zeal: Update to 0.7.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Feb 2024 16:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69411 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69411@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170896472031280 (code B ref -1); Mon, 26 Feb 2024 16:26:04 +0000 Received: (at submit) by debbugs.gnu.org; 26 Feb 2024 16:25:20 +0000 Received: from localhost ([127.0.0.1]:47567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1redn5-00088P-V1 for submit@debbugs.gnu.org; Mon, 26 Feb 2024 11:25:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:42962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reddS-0005jt-F5 for submit@debbugs.gnu.org; Mon, 26 Feb 2024 11:15:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1redNC-0003h3-4D for guix-patches@gnu.org; Mon, 26 Feb 2024 10:58:34 -0500 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1redNA-0004fZ-0d for guix-patches@gnu.org; Mon, 26 Feb 2024 10:58:33 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id BEA6B240028 for ; Mon, 26 Feb 2024 16:58:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1708963109; bh=vtfYAUPCGbEaQ9TYjhAx4ieVX/IfqubQYOPLsEMW6OY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=cXyaw2zJQA9Aw6IMgXAzl8KZnBd0ltwX3e2pcuOLuzoT6vcQhu8Y9o4z0Alvd9Xfy jNTZ/IzR9FCil/d44TE87VbAmyHdfAYOnnNH6pKquE84EuVJkO1VkfTTyHetTKQwgZ QyOpiXu19OVUPDGjAzbKUJsCsMEoxo8xq13Clu1M73IoUbzulAMqCWDce1TzhDGxJ6 McgtPv97y+45rb8jFVzimlC4uHyjbd2Bk8Ky0xIlc5HjZbzITuhu+Rsqmazz9+nFkW /+6zsC3hW2UccYRJuFyrktvNpfhpKjDAv/b2Kk44eLSg38XLZowM+EDxlUommD0raY eUSLljDqSmIyg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Tk4z916vvz9rxF; Mon, 26 Feb 2024 16:58:28 +0100 (CET) From: Felix Gruber Date: Mon, 26 Feb 2024 15:58:10 +0000 Message-ID: <0517714c696bf3d32f66d84d6c8ff3ba41b791d9.1708963090.git.felgru@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=felgru@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: 1d85f921f6977875d98de68ffdedf43be3dfcd9d 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 ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2024 Felix Gruber ;;; ;;; 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+)))