From patchwork Fri May 1 17:48:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21796 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 5C72827BBE4; Fri, 1 May 2020 18:53:18 +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 D2B6727BBE1 for ; Fri, 1 May 2020 18:53:17 +0100 (BST) Received: from localhost ([::1]:57264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUZqf-0006IX-Ad for patchwork@mira.cbaines.net; Fri, 01 May 2020 13:53:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUZqF-0006Bq-1P for guix-patches@gnu.org; Fri, 01 May 2020 13:53:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUZnW-0005GJ-T4 for guix-patches@gnu.org; Fri, 01 May 2020 13:52:50 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUZnW-0005Fy-Ga for guix-patches@gnu.org; Fri, 01 May 2020 13:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUZnW-0008IF-9o for guix-patches@gnu.org; Fri, 01 May 2020 13:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40994] 3-zathura-ps-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: Fri, 01 May 2020 17:50: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.158835535231802 (code B ref 40994); Fri, 01 May 2020 17:50:02 +0000 Received: (at 40994) by debbugs.gnu.org; 1 May 2020 17:49:12 +0000 Received: from localhost ([127.0.0.1]:50601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUZmi-0008Gr-08 for submit@debbugs.gnu.org; Fri, 01 May 2020 13:49:12 -0400 Received: from knopi.disroot.org ([178.21.23.139]:34612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUZmf-0008Gh-E6 for 40994@debbugs.gnu.org; Fri, 01 May 2020 13:49:10 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 90354217EB for <40994@debbugs.gnu.org>; Fri, 1 May 2020 19:49:07 +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 sBqhPD54hOV8 for <40994@debbugs.gnu.org>; Fri, 1 May 2020 19:49:05 +0200 (CEST) Date: Fri, 1 May 2020 13:48:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588355345; bh=5Y2NGWhoHu0E64Zp5urLnPoJhYHYHOM+1pHnwrSOUhk=; h=Date:From:To:Subject; b=Bg994zRwG+g77j2Gj8bwxv/wjSDkrQiySPXW7M5UY54VfpRws0yQD70LfzEovgN2B kUfLhSAmHgedEI3lIySGRe83wR1nlEhUAbSroMm66Yx4KEcb3dt44XTp54vGPwEVHk MlT3cQc/r0Wqo/OKfsgkIwICiue48/kex/iaDiAb2uRPruJnrE/EYVoC/JeZBE+R3v MbhUIQuheuX620no1VyrrGiR36ox66PrTY5ZtzZfobk7tnOvVoYADkcVvi+h5Y703+ +1GNJ2w+TrJ+PWgxzEMzRoV8n/BaC7UfUP4IFajQczdgunp5Xg/KnP2nAI5BHej9fl 5thBtkxevDPWw== From: Raghav Gururajan Message-ID: <20200501134842.5819e428.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 f399f61f261bbd3ab828ca27fc1d31f0e49d0d45 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 1 May 2020 13:42:52 -0400 Subject: [PATCH 3/3] gnu: zathura-ps: 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-ps): Remove variable. * gnu/packages/pwmt.scm (zathura-ps): Add variable. --- gnu/packages/pdf.scm | 35 -------------------------------- gnu/packages/pwmt.scm | 47 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 35 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index ff75e1ed55..c5539c7df5 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -426,41 +426,6 @@ reading and editing of existing PDF files.") using libarchive.") (license license:zlib))) -(define-public zathura-ps - (package - (name "zathura-ps") - (version "0.2.6") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-ps/download/zathura-ps-" - version ".tar.xz")) - (sha256 - (base32 - "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("libspectre" ,libspectre) - ("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.6: 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-ps/") - (synopsis "PS support for zathura (libspectre backend)") - (description "The zathura-ps plugin adds PS support to zathura -using libspectre.") - (license license:zlib))) - (define-public zathura-djvu (package (name "zathura-djvu") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index be9613bbf8..8b177e3e7a 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -29,6 +29,7 @@ #:use-module (gnu packages file) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -177,3 +178,49 @@ libraries. It currently supports multiple back-ends (PostScript, PDF, EPUB, DjVu and ComicBook) via plugins.") (home-page "https://pwmt.org/projects/zathura/") (license license:zlib))) + +(define-public zathura-ps + (package + (name "zathura-ps") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y")))) + (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 + ("libnotify" ,libnotify) ; For notification support + ("libspectre" ,libspectre) + ("zathura" ,zathura))) + (synopsis "PostScript support for zathura") + (description "The zathura-ps plugin adds PostScript support to zathura by +using the libspectre library.") + (home-page "https://pwmt.org/projects/zathura-ps/") + (license license:zlib))) -- 2.26.2