From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id oDMFE+FErV4TTAAA0tVLHw (envelope-from ) for ; Sat, 02 May 2020 10:01:05 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id oKhlH+pErV6nFQAAB5/wlQ (envelope-from ) for ; Sat, 02 May 2020 10:01:14 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::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 529CF94363C for ; Sat, 2 May 2020 10:01:13 +0000 (UTC) Received: from localhost ([::1]:44756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUoxN-0006PO-Im for larch@yhetil.org; Sat, 02 May 2020 06:01:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUowf-0005o1-PH for guix-patches@gnu.org; Sat, 02 May 2020 06:00:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUowF-0006N1-ER for guix-patches@gnu.org; Sat, 02 May 2020 06:00:29 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUowE-0006Lo-VW for guix-patches@gnu.org; Sat, 02 May 2020 06:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUowE-0003hc-SH for guix-patches@gnu.org; Sat, 02 May 2020 06:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40994] 7-zathura-cb-v1 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: Sat, 02 May 2020 10:00: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.158841356714156 (code B ref 40994); Sat, 02 May 2020 10:00:02 +0000 Received: (at 40994) by debbugs.gnu.org; 2 May 2020 09:59:27 +0000 Received: from localhost ([127.0.0.1]:51295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUova-0003g4-2A for submit@debbugs.gnu.org; Sat, 02 May 2020 05:59:27 -0400 Received: from knopi.disroot.org ([178.21.23.139]:40178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUovY-0003fv-3O for 40994@debbugs.gnu.org; Sat, 02 May 2020 05:59:21 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 686292CC85 for <40994@debbugs.gnu.org>; Sat, 2 May 2020 11:59:18 +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 n-0UcsAP2RkA for <40994@debbugs.gnu.org>; Sat, 2 May 2020 11:59:16 +0200 (CEST) Date: Sat, 2 May 2020 05:58:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588413555; bh=4UXQyff/yaYKVH60wBjzYjeS3LRlxkPF4w7BtApJjfc=; h=Date:From:To:Subject; b=bCrsQWv9MNiBxp2ZAWthhDtOjgIK5HRIDbUXI0T6IDFFcErmqkBKK+weBvgqr7xt+ 9qnfdrr5Dc73tdpJ+4rFRVebi+hnTwZhR3Sl89ZNbFqwzb8Fnp0HTdELzfgQ9vNTlh s/t7GYZIj13HeCqKSpYu9wWQn61WFZ7iYX1lA7xb7khkIQVJ0XpG662a9KQmcBFBks yxGZFMkR35N2wtqlNP7ZCQv6xXr13taRVBI1fWmupGvPjCzpGJPxj4m4RhzpeFemYs a/TsLf3vjiGw7TS/o40+MZ9qtB+tmtOoacSiHabV7AKykkOdZiNvQzxDHifRGPC3t8 6D8Wa3hdjaqEw== From: Raghav Gururajan Message-ID: <20200502055854.2016b98d.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/77B6Y/sNcb9RuYgaBDgHaok" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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-Scanner: scn0 X-Spam-Score: 1.59 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=bCrsQWv9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [1.59 / 13.00]; GENERIC_REPUTATION(0.00)[-0.49488883341533]; DWL_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; R_DKIM_REJECT(1.00)[disroot.org:s=mail]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; HAS_ATTACHMENT(0.00)[]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.15), country: US(-0.00), ip: 2001:470:142::17(-0.49)]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; DKIM_TRACE(0.00)[disroot.org:-]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MIME_TRACE(0.00)[0:+,1:+,2:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[raghavgururajan@disroot.org,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[xpdfreader.com:url,pwmt.org:url,disroot.org:email]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; PREVIOUSLY_DELIVERED(0.00)[40994@debbugs.gnu.org]; HAS_LIST_UNSUB(-0.01)[]; RCPT_COUNT_ONE(0.00)[1]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_SEVEN(0.00)[10]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[disroot.org : SPF not aligned (relaxed),none] X-TUID: nFj0gHzsIFxd --MP_/77B6Y/sNcb9RuYgaBDgHaok Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/77B6Y/sNcb9RuYgaBDgHaok Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=7-zathura-cb-v1.patch >From 60c6f623546f09070e0397395cc2b44920d99549 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 05:56:43 -0400 Subject: [PATCH 7/7] gnu: zathura-cb: Move to pwmt module. Moved variable from pdf.scm to pwmt.scm, for being part of pwmt project. Added extra dependencies and arguments for additional features. Updated synopsis and description. Made some cosmetic changes in the definition. * gnu/packages/pdf.scm (zathura-cb): Remove variable. * gnu/packages/pwmt.scm (zathura-cb): Add variable. --- gnu/packages/pdf.scm | 35 -------------------------------- gnu/packages/pwmt.scm | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6949ca4750..caae864979 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -391,41 +391,6 @@ reading and editing of existing PDF files.") (license license:gpl3) ; or gpl2, but not gpl2+ (home-page "https://www.xpdfreader.com/"))) -(define-public zathura-cb - (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))) - (build-system meson-build-system) - (arguments - `(#:tests? #f ; package does not contain tests - #: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. - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "meson.build" - (("(install_dir:).*" _ key) - (string-append key - "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) - #t))))) - (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))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 173a35d892..a67a707faa 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -24,6 +24,7 @@ (define-module (gnu packages pwmt) #:use-module (gnu packages) + #:use-module (gnu packages backup) #:use-module (gnu packages check) #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) @@ -357,3 +358,48 @@ using the mupdf rendering library.") using the DjVu library.") (home-page "https://pwmt.org/projects/zathura-djvu/") (license license:zlib))) + +(define-public zathura-cb + (package + (name "zathura-cb") + (version "0.1.8") + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-directory + ;; 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 + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; For configuration dumping support + ("libarchive" ,libarchive) + ("libnotify" ,libnotify) ; For notification support + ("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/") + (license license:zlib))) -- 2.26.2 --MP_/77B6Y/sNcb9RuYgaBDgHaok--