From patchwork Sat May 2 09:16:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21826 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 B723427BBE4; Sat, 2 May 2020 10:17:09 +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 3C70B27BBE1 for ; Sat, 2 May 2020 10:17:09 +0100 (BST) Received: from localhost ([::1]:54358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUoGi-0003p9-R2 for patchwork@mira.cbaines.net; Sat, 02 May 2020 05:17:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUoGd-0003ox-Fx for guix-patches@gnu.org; Sat, 02 May 2020 05:17:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUoGc-0005Uo-Gm for guix-patches@gnu.org; Sat, 02 May 2020 05:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUoGc-0005UK-2z for guix-patches@gnu.org; Sat, 02 May 2020 05:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUoGb-0002dn-Uh for guix-patches@gnu.org; Sat, 02 May 2020 05:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40994] 6-zathura-djvu-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 09:17:01 +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.158841099210113 (code B ref 40994); Sat, 02 May 2020 09:17:01 +0000 Received: (at 40994) by debbugs.gnu.org; 2 May 2020 09:16:32 +0000 Received: from localhost ([127.0.0.1]:51235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoG7-0002d3-Uj for submit@debbugs.gnu.org; Sat, 02 May 2020 05:16:32 -0400 Received: from knopi.disroot.org ([178.21.23.139]:58616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoG6-0002ct-JG for 40994@debbugs.gnu.org; Sat, 02 May 2020 05:16:31 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1ABE927385 for <40994@debbugs.gnu.org>; Sat, 2 May 2020 11:16:29 +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 EC9ad35dAucU for <40994@debbugs.gnu.org>; Sat, 2 May 2020 11:16:27 +0200 (CEST) Date: Sat, 2 May 2020 05:16:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588410987; bh=N7l8tWWcwbpsBT66czTXdLIDorDw0wd9EuanKxfPSgQ=; h=Date:From:To:Subject; b=bPixExDW7/a42fSbyL5udS9dYBdyxHOcWk3FZ6lhjnnIhDUNCitTVAndn8nRTy+oN 4U91BastsQkIpoLWalG5JM1Wy+fq57BZjqEfC4f6OLQ6tPGBOxeSF2f2ZRyrohMXXn xCPq23f5S96zU9wD/V2z4At8gePf+FGdTDSh7/ksgxyxUoGdZAqC+vEcAX7BjgQFK/ oikQOF7lpTX4nC4Tlc/DU3pWnnY+gL3yFWeZzWgNvMhD6+kK2iPqXxk4gZ3EEL+T+n htmceRfNzO9menov8w5jv4Dz5+Wwz76jv5Fdijr7poTOBEqGrG/Z0kOtrt2tXFLu2/ gs28L7f8pzQ/w== From: Raghav Gururajan Message-ID: <20200502051607.31a204b3.raghavgururajan@disroot.org> Mime-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From e2dde54a224777bcb2b050cb828db1a9fe6da532 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 05:12:02 -0400 Subject: [PATCH 6/6] gnu: zathura-djvu: 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. Removed phase 'patch-plugin-directory'. Added configure-flag 'plugindir'. Updated synopsis and description. Made some cosmetic changes in the definition. * gnu/packages/pdf.scm (zathura-djvu): Remove variable. * gnu/packages/pwmt.scm (zathura-djvu): Add variable. --- gnu/packages/pdf.scm | 36 ------------------------------------ gnu/packages/pwmt.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 30a8ec20e6..6949ca4750 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -426,42 +426,6 @@ reading and editing of existing PDF files.") using libarchive.") (license license:zlib))) -(define-public zathura-djvu - (package - (name "zathura-djvu") - (version "0.2.9") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-" - version ".tar.xz")) - (sha256 - (base32 - "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs - `(("djvulibre" ,djvulibre) - ("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.2.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-djvu/") - (synopsis "DjVu support for zathura (DjVuLibre backend)") - (description "The zathura-djvu plugin adds DjVu support to zathura -using the DjVuLibre library.") - (license license:zlib))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index c2c53ca8ec..173a35d892 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -25,6 +25,7 @@ (define-module (gnu packages pwmt) #:use-module (gnu packages) #:use-module (gnu packages check) + #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) #:use-module (gnu packages file) #:use-module (gnu packages freedesktop) @@ -317,3 +318,42 @@ using the poppler rendering library.") using the mupdf rendering library.") (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/") (license license:zlib))) + +(define-public zathura-djvu + (package + (name "zathura-djvu") + (version "0.2.9") + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln")))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas + #:configure-flags + (list + (string-append "-Dplugindir=" + (assoc-ref %outputs "out") "/lib/zathura")))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("djvulibre" ,djvulibre) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; For configuration dumping support + ("libnotify" ,libnotify) ; For notification support + ("zathura" ,zathura))) + (synopsis "DjVu support for zathura") + (description "The zathura-djvu plugin adds DjVu support to zathura +using the DjVu library.") + (home-page "https://pwmt.org/projects/zathura-djvu/") + (license license:zlib))) -- 2.26.2