From patchwork Wed May 6 09:41:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21914 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 2C27127BBE3; Wed, 6 May 2020 10:43:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 8938027BBE1 for ; Wed, 6 May 2020 10:43:11 +0100 (BST) Received: from localhost ([::1]:43564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWGa7-0002ni-10 for patchwork@mira.cbaines.net; Wed, 06 May 2020 05:43:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWGa0-0002nV-P8 for guix-patches@gnu.org; Wed, 06 May 2020 05:43:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55251) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jWGZy-0006xb-C0 for guix-patches@gnu.org; Wed, 06 May 2020 05:43:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jWGZy-0007Uc-7s for guix-patches@gnu.org; Wed, 06 May 2020 05:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40994] All patches attached References: <20200501075253.0c2c27d0.raghavgururajan@disroot.org> In-Reply-To: <20200501075253.0c2c27d0.raghavgururajan@disroot.org> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 May 2020 09:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40994@debbugs.gnu.org Received: via spool by 40994-submit@debbugs.gnu.org id=B40994.158875812428728 (code B ref 40994); Wed, 06 May 2020 09:43:02 +0000 Received: (at 40994) by debbugs.gnu.org; 6 May 2020 09:42:04 +0000 Received: from localhost ([127.0.0.1]:38564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWGYt-0007Sq-0a for submit@debbugs.gnu.org; Wed, 06 May 2020 05:42:04 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWGYn-0007Se-KH for 40994@debbugs.gnu.org; Wed, 06 May 2020 05:41:53 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E9C1F2E89A for <40994@debbugs.gnu.org>; Wed, 6 May 2020 11:41:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EhoQ7Zk-L6eX for <40994@debbugs.gnu.org>; Wed, 6 May 2020 11:41:43 +0200 (CEST) Date: Wed, 6 May 2020 05:41:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588758103; bh=Mwosm203+xUs+BYW06+8tJ4fMceApW8Fyiq8FEhaAys=; h=Date:From:To:Subject; b=MGdNjmv90Q5Fa5pFtM17cziCNIvOWea2x2rA5vSW16mNk1HMkByrG3WYL6fL0XkCJ yPztKUV6RmzS+nSUBoSeDUwi3P/yyMHEsb9YBYVccBph5Hf/YxtkYUg78OnYc4aVSM dm6WjFr5vRX5bfsWkoz53QCn/hfNSLExDFTw2axuRF0FzcYDRtKIwjr1I7aSf/+C3Y kl4xRv5lKPStXmP4PGmjXs9BC8yHYxy319DcukvI8mjUa/q3efb5QDqAIRz4CF07/6 jqhl4+E2gHlVD8zP6D+sGasXcOQUpdIyn1e8Hhof2UGh6XFyRgC4BXIl+MwCM4FMhB n1XKyUN2myjCg== From: Raghav Gururajan Message-ID: <20200506054119.5200ef6c.raghavgururajan@disroot.org> 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" X-getmail-retrieved-from-mailbox: Patches From 6b4e210a1bc4282f0ff07a6279f55a8f42706a86 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 3 May 2020 00:18:21 -0400 Subject: [PATCH 14/14] gnu: zathura-cb: Update package definition. * gnu/packages/pwmt.scm (zathura-cb): [arguments]<#:glib-or-gtk?>: New argument. [inputs]: New inputs. [synopsis]: Updated. [description]: Updated. --- gnu/packages/pwmt.scm | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 5ad4cbe7f7..f361c91c00 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -358,33 +358,42 @@ using the DjVu library.") (package (name "zathura-cb") (version "0.1.8") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-" - version ".tar.xz")) - (sha256 - (base32 - "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("libarchive" ,libarchive) - ("zathura" ,zathura))) + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-cb/download/" + "zathura-cb-" version ".tar.xz")) + (sha256 + (base32 + "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) (build-system meson-build-system) (arguments - `(#:tests? #f ; package does not contain tests + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.1.8: the new Meson build system - ;; now hard-codes an incorrect plugin directory. Fix it. + ;; This package tries to install into directory of Zathura. + ;; That cannot be allowed. Fix it. (lambda* (#:key outputs #:allow-other-keys) (substitute* "meson.build" (("(install_dir:).*" _ key) (string-append key "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) #t))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; To generate cargs for zathura + ("libarchive" ,libarchive) + ("libnotify" ,libnotify) ; To generate cargs for zathura + ("zathura" ,zathura))) + (synopsis "Comic book support for zathura") + (description "The zathura-cb plugin adds comic book support to zathura.") (home-page "https://pwmt.org/projects/zathura-cb/") - (synopsis "Comic book support for zathura (libarchive backend)") - (description "The zathura-cb plugin adds comic book support to zathura -using libarchive.") (license license:zlib))) -- 2.26.2