From patchwork Sat May 2 08:50:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21825 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 3C2AD27BBE4; Sat, 2 May 2020 09:53:22 +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 B490627BBE1 for ; Sat, 2 May 2020 09:53:21 +0100 (BST) Received: from localhost ([::1]:44838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUnth-0001WP-AO for patchwork@mira.cbaines.net; Sat, 02 May 2020 04:53:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUntL-0000vk-B7 for guix-patches@gnu.org; Sat, 02 May 2020 04:53:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUnrS-0007xn-N6 for guix-patches@gnu.org; Sat, 02 May 2020 04:52:59 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39651) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUnrS-0007wl-9s for guix-patches@gnu.org; Sat, 02 May 2020 04:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUnrS-00020V-7r for guix-patches@gnu.org; Sat, 02 May 2020 04:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40994] 5-zathura-pdf-mupdf-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 08:51: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.15884094437686 (code B ref 40994); Sat, 02 May 2020 08:51:02 +0000 Received: (at 40994) by debbugs.gnu.org; 2 May 2020 08:50:43 +0000 Received: from localhost ([127.0.0.1]:51197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnr8-0001zu-LM for submit@debbugs.gnu.org; Sat, 02 May 2020 04:50:42 -0400 Received: from knopi.disroot.org ([178.21.23.139]:58780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnr6-0001zl-Ia for 40994@debbugs.gnu.org; Sat, 02 May 2020 04:50:42 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id F257C28458 for <40994@debbugs.gnu.org>; Sat, 2 May 2020 10:50:38 +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 vv0HAXuXHDtj for <40994@debbugs.gnu.org>; Sat, 2 May 2020 10:50:37 +0200 (CEST) Date: Sat, 2 May 2020 04:50:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588409437; bh=pJ0LDIlL7wATr/PnvT/5WpnJtdOruU18vpKh4ULaVew=; h=Date:From:To:Subject; b=VPx922HqAj4COd8RWU6+OOZp0/0MeMcQCLsHfI42M1qITYm4HHMadex8j+titq9+6 XC8sGTuZ4kl2GZE4/oHNPfRytZ0TBezqnMq6qc/3toh7ib9biwXsjUYVd+DWEUQ7mx n6IfIrjU8nXy9QEwwxdM3zype2Umo0fbdzeDdp71eoTs73UCkcDvrdrEN7a18NVFHP D9HuX5VrVwT2cqTorZR0HKYRRCyz4wpmhpFRLcjNAo5cpNjET2sEV7CXXE6LBwFsUs 6rATZwfshQLBdfoaMSLMflPaK9S2DqzGus3Z/hBipjcgRLLGejEkOn9HMUfvKuyF31 sblJ6nyM5uiAQ== From: Raghav Gururajan Message-ID: <20200502045017.2b8d2530.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 aa93196383df77cac84d4246cbd88f64685d110b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 04:44:03 -0400 Subject: [PATCH 5/5] gnu: zathura-pdf-mupdf: 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 openssl as input. Updated synopsis and description. Made some cosmetic changes in the definition. * gnu/packages/pdf.scm (zathura-pdf-mupdf): Remove variable. * gnu/packages/pwmt.scm (zathura-pdf-mupdf): Add variable. --- gnu/packages/pdf.scm | 44 ---------------------------------- gnu/packages/pwmt.scm | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 44 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0aca1e707a..30a8ec20e6 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -462,50 +462,6 @@ using libarchive.") using the DjVuLibre library.") (license license:zlib))) -(define-public zathura-pdf-mupdf - (package - (name "zathura-pdf-mupdf") - (version "0.3.5") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-pdf-mupdf" - "/download/zathura-pdf-mupdf-" version ".tar.xz")) - (sha256 - (base32 - "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs - `(("jbig2dec" ,jbig2dec) - ("libjpeg" ,libjpeg) - ("mujs" ,mujs) - ("mupdf" ,mupdf) - ("openjpeg" ,openjpeg) - ("openssl" ,openssl) - ("zathura" ,zathura))) - (build-system meson-build-system) - (arguments - `(#:tests? #f ; package does not contain tests - #:configure-flags (list (string-append "-Dplugindir=" - (assoc-ref %outputs "out") - "/lib/zathura") - "-Dlink-external=true") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'add-mujs-to-dependencies - (lambda _ - ;; Add mujs to the 'build_dependencies'. - (substitute* "meson.build" - (("^ libopenjp2 = dependency.*" x) - (string-append x " mujs = cc.find_library('mujs')\n")) - (("^ libopenjp2") - " libopenjp2, mujs"))))))) - (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/") - (synopsis "PDF support for zathura (mupdf backend)") - (description "The zathura-pdf-mupdf plugin adds PDF support to zathura -by using the @code{mupdf} rendering library.") - (license license:zlib))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index fa973cea17..c2c53ca8ec 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -33,6 +33,8 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages javascript) #:use-module (gnu packages linux) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) @@ -261,3 +263,57 @@ using the libspectre library.") using the poppler rendering library.") (home-page "https://pwmt.org/projects/zathura-pdf-poppler/") (license license:zlib))) + +(define-public zathura-pdf-mupdf + (package + (name "zathura-pdf-mupdf") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq")))) + (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") + "-Dlink-external=true") ; For MuPDF external libraries + #:phases + (modify-phases %standard-phases + (add-before 'configure 'add-mujs-to-dependencies + (lambda _ + ;; Add mujs to the 'build_dependencies'. + (substitute* "meson.build" + (("^ libopenjp2 = dependency.*" x) + (string-append x " mujs = cc.find_library('mujs')\n")) + (("^ libopenjp2") + " libopenjp2, mujs"))))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("jbig2dec" ,jbig2dec) + ("json-c" ,json-c) ; For configuration dumping support + ("libjpeg" ,libjpeg) + ("libnotify" ,libnotify) ; For notification support + ("mujs" ,mujs) + ("mupdf" ,mupdf) + ("openjpeg" ,openjpeg) + ("zathura" ,zathura))) + (synopsis "PDF support (mupdf backend) for zathura") + (description "The zathura-pdf-mupdf plugin adds PDF support to zathura by +using the mupdf rendering library.") + (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/") + (license license:zlib))) -- 2.26.2