From patchwork Sun Jun 9 15:02:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 65259 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 194F427BBE2; Sun, 9 Jun 2024 16:04:11 +0100 (BST) 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=unavailable 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 6772D27BBE9 for ; Sun, 9 Jun 2024 16:04:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sGK5E-0000Cy-Ng; Sun, 09 Jun 2024 11:03:48 -0400 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 1sGK5C-0000CU-G5 for guix-patches@gnu.org; Sun, 09 Jun 2024 11:03:47 -0400 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 1sGK5C-000481-8I for guix-patches@gnu.org; Sun, 09 Jun 2024 11:03:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sGK5S-00018T-AV for guix-patches@gnu.org; Sun, 09 Jun 2024 11:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69411] [PATCH v2] gnu: zeal: Update to 0.7.1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jun 2024 15:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69411 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69411@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 69411-submit@debbugs.gnu.org id=B69411.17179454074261 (code B ref 69411); Sun, 09 Jun 2024 15:04:02 +0000 Received: (at 69411) by debbugs.gnu.org; 9 Jun 2024 15:03:27 +0000 Received: from localhost ([127.0.0.1]:43218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sGK4s-00016a-10 for submit@debbugs.gnu.org; Sun, 09 Jun 2024 11:03:27 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sGK4p-00016A-H2 for 69411@debbugs.gnu.org; Sun, 09 Jun 2024 11:03:24 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 2C974240101 for <69411@debbugs.gnu.org>; Sun, 9 Jun 2024 17:02:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1717945380; bh=xaNXZm5MBMCFz0sXPW5SH2iFVE0htuOojahSbiut2To=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=A/eQxNhQVS+SI1U8gZm19wnhkybzxItAxKnF5ziU7QvNbGyWb0dm10NqCho7/HDxn 1T1GuIQDiynfw0MQZZl6X3cCJLs/os4bqj1IrDg/y5WqPYe1nA8pM70nI8V8vF3z4H LNhyhdLSLu4RQ/DdaihFvKK5jutxqYHi1+Mw1MFIQZDwrNMcuomnbJESps4rPW+RsA LQHKGcOplbueBsPgGl6vKMIDwVDO4rkN+ZC3HPycSU49W4U7KsfQy8B41t9z8mXxDt 1S0ET2ytVOp2i4PoqBfaOadAX4oJ6yNnsKM57vM/JmWcpJVwL7UduK2C3FNiWNqPMa fethJpZdFcyEg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Vxyq73pjYz6tvZ; Sun, 9 Jun 2024 17:02:59 +0200 (CEST) From: Felix Gruber Date: Sun, 9 Jun 2024 15:02:30 +0000 Message-ID: In-Reply-To: <0517714c696bf3d32f66d84d6c8ff3ba41b791d9.1708963090.git.felgru@posteo.net> References: <0517714c696bf3d32f66d84d6c8ff3ba41b791d9.1708963090.git.felgru@posteo.net> MIME-Version: 1.0 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.1. [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: bc8a41f4a8d9f1f0525d7bc97c67ed3c8aea3111 diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 12fbaf1d0c..2a047ba790 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. ;;; @@ -410,52 +411,49 @@ (define-public scrollkeeper (license 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.1") + (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 "1yz9zz18rh1d67w40ib4pna70vqkwa9i9nyj423rjysv5rdj2pzp")))) + (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 license:gpl3+)))) + (license license:gpl3+))) (define-public markdeep (package