From patchwork Fri May 1 13:50:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21791 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 8724727BBE4; Fri, 1 May 2020 14:53:01 +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 EA81627BBE1 for ; Fri, 1 May 2020 14:53:00 +0100 (BST) Received: from localhost ([::1]:34394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUW68-0004d2-HG for patchwork@mira.cbaines.net; Fri, 01 May 2020 09:53:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59784) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUW61-0004c5-Cq for guix-patches@gnu.org; Fri, 01 May 2020 09:52:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUW5C-0006MD-Mh for guix-patches@gnu.org; Fri, 01 May 2020 09:52:53 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUW5C-0006LL-9w for guix-patches@gnu.org; Fri, 01 May 2020 09:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUW5C-0007w2-8e for guix-patches@gnu.org; Fri, 01 May 2020 09:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40994] 2-zathura-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 13:52: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.158834107630417 (code B ref 40994); Fri, 01 May 2020 13:52:02 +0000 Received: (at 40994) by debbugs.gnu.org; 1 May 2020 13:51:16 +0000 Received: from localhost ([127.0.0.1]:48474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUW4R-0007uX-Qc for submit@debbugs.gnu.org; Fri, 01 May 2020 09:51:16 -0400 Received: from knopi.disroot.org ([178.21.23.139]:52292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUW4P-0007uO-OD for 40994@debbugs.gnu.org; Fri, 01 May 2020 09:51:14 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id F36132CAA9 for <40994@debbugs.gnu.org>; Fri, 1 May 2020 15:51:12 +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 6k6vOAnaeqlh for <40994@debbugs.gnu.org>; Fri, 1 May 2020 15:51:11 +0200 (CEST) Date: Fri, 1 May 2020 09:50:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588341071; bh=CUUtaEj8Nmrb2lIfSwvSZ6hAzt569GO7mOjhKEF/Ffc=; h=Date:From:To:Subject; b=eWKuZf/pU3l0vS4hXvT1N26w6pU4Fsv4xePmG+AUxVgzlxkHKwznjebsydsLe5e3b YFkWb569i6832Sef15lk+zeWWJvDKAh7k2Q7yOySCCl/nVONOBrz+QBOBBfFA8fr7h gRZpmU5ZRm1qJHsLASHWvUDh0lzKtAHoeX/GS6qTFfXDlOVXNaXqyNgEJmawe9ZxDH Sr5uk4A1DsR9cGwanrx7YCmLmgbQEw36hGv2QwgFAiDEyuOCYLr94BYNCdMPPVtNOM k8qH+IVA9WkfRS8asLKeC17SRlmVDyQdGxGsckc5Q8m1JvVI6tyYN8VwQ+vqMRISgW hldsJFO5sFOcw== From: Raghav Gururajan Message-ID: <20200501095049.114a6f3c.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 c8951b36cd04df279fdeaabdd29b87929fbb6fbc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 1 May 2020 09:36:57 -0400 Subject: [PATCH 2/2] gnu: zathura: 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): Remove variable. * gnu/packages/pwmt.scm (zathura): Add variable. --- gnu/packages/pdf.scm | 58 -------------------------------- gnu/packages/pwmt.scm | 78 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 58 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 71b8177582..ff75e1ed55 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -577,64 +577,6 @@ by using the @code{mupdf} rendering library.") by using the poppler rendering engine.") (license license:zlib))) -(define-public zathura - (package - (name "zathura") - (version "0.4.5") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura/download/zathura-" - version ".tar.xz")) - (sha256 - (base32 - "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c")))) - (native-inputs `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - - ;; For building documentation. - ("python-sphinx" ,python-sphinx) - - ;; For building icons. - ("librsvg" ,librsvg) - - ;; For tests. - ("check" ,check) - ("xorg-server" ,xorg-server-for-tests))) - (inputs `(("sqlite" ,sqlite))) - ;; Listed in 'Requires.private' of 'zathura.pc'. - (propagated-inputs `(("cairo" ,cairo) - ("girara" ,girara))) - (native-search-paths - (list (search-path-specification - (variable "ZATHURA_PLUGINS_PATH") - (files '("lib/zathura"))))) - (build-system meson-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xserver - ;; Tests require a running X server. - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (display ":1")) - (setenv "DISPLAY" display) - - ;; On busy machines, tests may take longer than - ;; the default of four seconds. - (setenv "CK_DEFAULT_TIMEOUT" "20") - - ;; Don't fail due to missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system (string-append xorg-server "/bin/Xvfb " - display " &"))))))))) - (home-page "https://pwmt.org/projects/zathura/") - (synopsis "Lightweight keyboard-driven PDF viewer") - (description "Zathura is a customizable document viewer. It provides a -minimalistic interface and an interface that mainly focuses on keyboard -interaction.") - (license license:zlib))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 3e986c3656..be9613bbf8 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -26,11 +26,18 @@ #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages documentation) + #:use-module (gnu packages file) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) #:use-module (gnu packages web) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) @@ -99,3 +106,74 @@ application, an input bar that is used to execute commands of the application and the status bar which provides the user with current information.") (license license:zlib))) + +(define-public zathura + (package + (name "zathura") + (version "0.4.5") + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t ; To compile schemas + #:phases + (modify-phases %standard-phases + (add-before 'check 'start-xserver + ;; Tests require a running X server. + (lambda* (#:key inputs #:allow-other-keys) + (let + ((xorg-server (assoc-ref inputs "xorg-server")) + (display ":1")) + (setenv "DISPLAY" display) + ;; On busy machines, tests may take longer than + ;; the default of four seconds. + (setenv "CK_DEFAULT_TIMEOUT" "20") + ;; Don't fail due to missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? + (system + (string-append xorg-server "/bin/Xvfb " + display " &"))))))))) + (native-inputs + `(("check" ,check) ; For tests + ("desktop-file-utils" ,desktop-file-utils) + ("doxygen" ,doxygen) ; For docs + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("librsvg" ,librsvg) ; For icons + ("pkg-config" ,pkg-config) + ("python-breathe" ,python-breathe) ; For docs + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ; For docs + ("python-sphinx" ,python-sphinx) ; For docs + ("xorg-server" ,xorg-server-for-tests))) ; For tests + (inputs + `(("appstream-glib" ,appstream-glib) + ("cairo" ,cairo) + ("file" ,file) ; For mime-type detection + ("glib" ,glib) + ("json-c" ,json-c) ; For configuration dumping support + ("gtk+" ,gtk+) + ("libnotify" ,libnotify) ; For notification support + ("libseccomp" ,libseccomp) ; For sandbox support + ("sqlite" ,sqlite))) ; For database backend + (propagated-inputs + `(("girara" ,girara))) + (native-search-paths + (list + (search-path-specification + (variable "ZATHURA_PLUGINS_PATH") + (files '("lib/zathura"))))) + (synopsis "Document Viewer") + (description "Zathura is a highly customizable and functional document +viewer based on the girara user interface library and several document +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))) -- 2.26.2