* [bug#40994] 1-girara-v1
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
@ 2020-05-01 13:49 ` Raghav Gururajan
2020-05-01 13:50 ` [bug#40994] 2-zathura-v1 Raghav Gururajan
` (8 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-01 13:49 UTC (permalink / raw)
To: 40994
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 1-giara-v1.patch --]
[-- Type: text/x-patch, Size: 8089 bytes --]
From 4f73a7fbd82838e99680e8043b78e9d7009284eb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Fri, 1 May 2020 07:26:49 -0400
Subject: [PATCH 1/2] gnu: girara: Move to pwmt module.
Moved variable from gtk.scm to pwmt.scm, for being part of pwmt project.
Added extra dependencies and arguments for additional features.
Changed source-origin from git to release files.
Made some cosmetic changes in the definition.
* gnu/packages/gtk.scm (girara): Remove variable.
* gnu/packages/pwmt.scm (girara): Add variable.
---
gnu/packages/gtk.scm | 49 --------------------
gnu/packages/pwmt.scm | 101 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 101 insertions(+), 49 deletions(-)
create mode 100644 gnu/packages/pwmt.scm
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bea4850d15..4d093a0e0a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1445,55 +1445,6 @@ In addition to the low level layout rendering routines, Pango includes
and routines to assist in editing internationalized text.")
(license license:lgpl2.1+)))
-(define-public girara
- (package
- (name "girara")
- (version "0.3.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.pwmt.org/pwmt/girara")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("check" ,check)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-for-tests)))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs `(("gtk+" ,gtk+)))
- (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 " &")))))))))
- (build-system meson-build-system)
- (home-page "https://pwmt.org/projects/girara/")
- (synopsis "Library for minimalistic gtk+3 user interfaces")
- (description "Girara is a library that implements a user interface that
-focuses on simplicity and minimalism. Currently based on GTK+, a
-cross-platform widget toolkit, it provides an interface that focuses on three
-main components: a so-called view widget that represents the actual
-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 gtk-doc
(package
(name "gtk-doc")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
new file mode 100644
index 0000000000..3e986c3656
--- /dev/null
+++ b/gnu/packages/pwmt.scm
@@ -0,0 +1,101 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2017 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2018 2019 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages pwmt)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages documentation)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages web)
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages xdisorg)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson))
+
+(define-public girara
+ (package
+ (name "girara")
+ (version "0.3.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/" name "/download/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "0cmjdismdsx9a5l7zx54zkd33mgg3mx4ckpvc7aap3x6a1ddmz2i"))))
+ (arguments
+ `(#:glib-or-gtk? #t ; To compile schemas
+ #:configure-flags
+ (list
+ "-Dnotify=enabled") ; For notification support
+ #: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 " &")))))))))
+ (build-system meson-build-system)
+ (native-inputs
+ `(("check" ,check) ; For tests
+ ("doxygen" ,doxygen) ; For docs
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("pkg-config" ,pkg-config)
+ ("xorg-server" ,xorg-server-for-tests))) ; For tests
+ (inputs
+ `(("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; For configuration dumping support
+ ("libnotify" ,libnotify) ; For notification support
+ ("pango" ,pango)))
+ (home-page "https://pwmt.org/projects/girara/")
+ (synopsis "Library for minimalistic gtk+3 user interfaces")
+ (description "Girara is a library that implements a user interface that
+focuses on simplicity and minimalism. Currently based on GTK+, a
+cross-platform widget toolkit, it provides an interface that focuses on three
+main components: a so-called view widget that represents the actual
+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)))
--
2.26.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] 2-zathura-v1
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
2020-05-01 13:49 ` [bug#40994] 1-girara-v1 Raghav Gururajan
@ 2020-05-01 13:50 ` Raghav Gururajan
2020-05-01 17:48 ` [bug#40994] 3-zathura-ps-v1 Raghav Gururajan
` (7 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-01 13:50 UTC (permalink / raw)
To: 40994
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 2-zathura-v1.patch --]
[-- Type: text/x-patch, Size: 7574 bytes --]
From c8951b36cd04df279fdeaabdd29b87929fbb6fbc Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] 3-zathura-ps-v1
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
2020-05-01 13:49 ` [bug#40994] 1-girara-v1 Raghav Gururajan
2020-05-01 13:50 ` [bug#40994] 2-zathura-v1 Raghav Gururajan
@ 2020-05-01 17:48 ` Raghav Gururajan
2020-05-02 8:17 ` [bug#40994] 4-zathura-pdf-poppler-v1 Raghav Gururajan
` (6 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-01 17:48 UTC (permalink / raw)
To: 40994
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 3-zathura-ps-v1.patch --]
[-- Type: text/x-patch, Size: 4917 bytes --]
From f399f61f261bbd3ab828ca27fc1d31f0e49d0d45 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] 4-zathura-pdf-poppler-v1
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
` (2 preceding siblings ...)
2020-05-01 17:48 ` [bug#40994] 3-zathura-ps-v1 Raghav Gururajan
@ 2020-05-02 8:17 ` Raghav Gururajan
2020-05-02 8:50 ` [bug#40994] 5-zathura-pdf-mupdf-v1 Raghav Gururajan
` (5 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-02 8:17 UTC (permalink / raw)
To: 40994
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 4-zathura-pdf-poppler-v1.patch --]
[-- Type: text/x-patch, Size: 4560 bytes --]
From e857c3eb891831dd3916e2103652416f5fabb2ef Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 04:11:49 -0400
Subject: [PATCH 4/4] gnu: zathura-pdf-poppler: 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-pdf-poppler): Remove variable.
* gnu/packages/pwmt.scm (zathura-pdf-poppler): Add variable.
---
gnu/packages/pdf.scm | 36 ------------------------------------
gnu/packages/pwmt.scm | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c5539c7df5..0aca1e707a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -506,42 +506,6 @@ using the DjVuLibre library.")
by using the @code{mupdf} rendering library.")
(license license:zlib)))
-(define-public zathura-pdf-poppler
- (package
- (name "zathura-pdf-poppler")
- (version "0.3.0")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
- version ".tar.xz"))
- (sha256
- (base32
- "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs
- `(("poppler" ,poppler)
- ("zathura" ,zathura)))
- (build-system meson-build-system)
- (arguments
- `(#:tests? #f ; package does not include tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-plugin-directory
- ;; Something of a regression in 0.2.9: 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-pdf-poppler/")
- (synopsis "PDF support for zathura (poppler backend)")
- (description "The zathura-pdf-poppler plugin adds PDF support to zathura
-by using the poppler rendering engine.")
- (license license:zlib)))
-
(define-public podofo
(package
(name "podofo")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 8b177e3e7a..fa973cea17 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -34,6 +34,7 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages linux)
+ #:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
@@ -224,3 +225,39 @@ DjVu and ComicBook) via plugins.")
using the libspectre library.")
(home-page "https://pwmt.org/projects/zathura-ps/")
(license license:zlib)))
+
+(define-public zathura-pdf-poppler
+ (package
+ (name "zathura-pdf-poppler")
+ (version "0.3.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/" name "/download/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
+ (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)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("poppler" ,poppler)
+ ("zathura" ,zathura)))
+ (synopsis "PDF support (poppler backend) for zathura")
+ (description "The zathura-pdf-poppler plugin adds PDF support to zathura by
+using the poppler rendering library.")
+ (home-page "https://pwmt.org/projects/zathura-pdf-poppler/")
+ (license license:zlib)))
--
2.26.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] 5-zathura-pdf-mupdf-v1
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
` (3 preceding siblings ...)
2020-05-02 8:17 ` [bug#40994] 4-zathura-pdf-poppler-v1 Raghav Gururajan
@ 2020-05-02 8:50 ` Raghav Gururajan
2020-05-02 9:16 ` [bug#40994] 6-zathura-djvu-v1 Raghav Gururajan
` (4 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-02 8:50 UTC (permalink / raw)
To: 40994
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 5-zathura-pdf-mupdf-v1.patch --]
[-- Type: text/x-patch, Size: 5596 bytes --]
From aa93196383df77cac84d4246cbd88f64685d110b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] 6-zathura-djvu-v1
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
` (4 preceding siblings ...)
2020-05-02 8:50 ` [bug#40994] 5-zathura-pdf-mupdf-v1 Raghav Gururajan
@ 2020-05-02 9:16 ` Raghav Gururajan
2020-05-02 9:58 ` [bug#40994] 7-zathura-cb-v1 Raghav Gururajan
` (3 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-02 9:16 UTC (permalink / raw)
To: 40994
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 6-zathura-djvu-v1.patch --]
[-- Type: text/x-patch, Size: 4601 bytes --]
From e2dde54a224777bcb2b050cb828db1a9fe6da532 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] 7-zathura-cb-v1
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
` (5 preceding siblings ...)
2020-05-02 9:16 ` [bug#40994] 6-zathura-djvu-v1 Raghav Gururajan
@ 2020-05-02 9:58 ` Raghav Gururajan
2020-05-02 13:24 ` [bug#40994] patch#40994 Programs With Movie Titles (PWMT) Brice Waegeneire
` (2 subsequent siblings)
9 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-02 9:58 UTC (permalink / raw)
To: 40994
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 7-zathura-cb-v1.patch --]
[-- Type: text/x-patch, Size: 4866 bytes --]
From 60c6f623546f09070e0397395cc2b44920d99549 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
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
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] patch#40994 Programs With Movie Titles (PWMT)
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
` (6 preceding siblings ...)
2020-05-02 9:58 ` [bug#40994] 7-zathura-cb-v1 Raghav Gururajan
@ 2020-05-02 13:24 ` Brice Waegeneire
2020-05-02 16:09 ` Raghav Gururajan
2020-05-06 9:41 ` [bug#40994] All patches attached Raghav Gururajan
2020-05-08 3:24 ` [bug#40994] Updated patch-set Raghav Gururajan
9 siblings, 1 reply; 17+ messages in thread
From: Brice Waegeneire @ 2020-05-02 13:24 UTC (permalink / raw)
To: 40994, raghavgururajan
Hello Raghav,
> I am starting this thread for my patches regarding programs that belong
> to
> PWMT Project (pwmt.org). The programs are Girara, Jumanji and Zathura.
I don't see a patch related to jumanji, is it voluntary?
> I will be creating a new module, named, pwmt.scm. This is to put all
> PWMT
> packages together. The concept here is similar to suckless.scm.
>
> I will be sending patches one-by-one in this thread; with numbered
> prefix [N].
> These patches are to be pushed in ascending order.
Could you take example on a commit like
aff0cce9175aaf836dd78941eb17549e3bfa7188 (there must be others like it)
which move packages to a separate module. In particular create a commit
that just move the packages in the new module and adjust the modules
that
depend on them (if any). Then add your modifications to the packages in
separate commits to the one moving them with the git messages correctly
formatted, ie. not in a free form style. Otherwise it's difficult to
understand what your package modifications are related to just moving
them
elsewhere,since it's just a big diff.
- Brice.
^ permalink raw reply [flat|nested] 17+ messages in thread* [bug#40994] patch#40994 Programs With Movie Titles (PWMT)
2020-05-02 13:24 ` [bug#40994] patch#40994 Programs With Movie Titles (PWMT) Brice Waegeneire
@ 2020-05-02 16:09 ` Raghav Gururajan
2020-05-03 4:22 ` Raghav Gururajan
2020-05-06 19:29 ` Marius Bakke
0 siblings, 2 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-02 16:09 UTC (permalink / raw)
To: Brice Waegeneire; +Cc: 40994
[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]
Hi Brice!
> I don't see a patch related to jumanji, is it voluntary?
I tried packaging Jumanji, but it is ported to new versions of webkitgtk. We do
not have older versions of webkitgtk in guix.
> Could you take example on a commit like
> aff0cce9175aaf836dd78941eb17549e3bfa7188 (there must be others like it)
> which move packages to a separate module. In particular create a commit
> that just move the packages in the new module and adjust the modules
> that
> depend on them (if any). Then add your modifications to the packages in
> separate commits to the one moving them with the git messages correctly
> formatted, ie. not in a free form style. Otherwise it's difficult to
> understand what your package modifications are related to just moving
> them
> elsewhere,since it's just a big diff.
Thanks for the feedback. Sure thing!
Please find the attachments with this email, for moving stuffs. All the moved
packages only refer to each other. So no need of altering any other package
definitions.
I will send another set of patches for modifying stuffs,
Thank you!
Regards,
RG.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Move-girara-from-gtk.scm-to-pwmt.scm.patch --]
[-- Type: text/x-patch, Size: 7675 bytes --]
From a05c5d174a9ee40e433a64c50f19c7f106381903 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 11:16:04 -0400
Subject: [PATCH 1/7] gnu: Move girara from gtk.scm to pwmt.scm.
* gnu/packages/gtk.scm (girara): Move to [...]
* gnu/packages/pwmt.scm (girara): [...] here.
---
gnu/packages/gtk.scm | 49 -----------------------
gnu/packages/pwmt.scm | 91 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 91 insertions(+), 49 deletions(-)
create mode 100644 gnu/packages/pwmt.scm
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bea4850d15..4d093a0e0a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1445,55 +1445,6 @@ In addition to the low level layout rendering routines, Pango includes
and routines to assist in editing internationalized text.")
(license license:lgpl2.1+)))
-(define-public girara
- (package
- (name "girara")
- (version "0.3.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.pwmt.org/pwmt/girara")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("check" ,check)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-for-tests)))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs `(("gtk+" ,gtk+)))
- (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 " &")))))))))
- (build-system meson-build-system)
- (home-page "https://pwmt.org/projects/girara/")
- (synopsis "Library for minimalistic gtk+3 user interfaces")
- (description "Girara is a library that implements a user interface that
-focuses on simplicity and minimalism. Currently based on GTK+, a
-cross-platform widget toolkit, it provides an interface that focuses on three
-main components: a so-called view widget that represents the actual
-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 gtk-doc
(package
(name "gtk-doc")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
new file mode 100644
index 0000000000..8185cc40d9
--- /dev/null
+++ b/gnu/packages/pwmt.scm
@@ -0,0 +1,91 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2017 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2018 2019 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages pwmt)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages documentation)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages web)
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages xdisorg)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson))
+
+(define-public girara
+ (package
+ (name "girara")
+ (version "0.3.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.pwmt.org/pwmt/girara")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("check" ,check)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("xorg-server" ,xorg-server-for-tests)))
+ ;; Listed in 'Requires.private' of 'girara.pc'.
+ (propagated-inputs `(("gtk+" ,gtk+)))
+ (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 " &")))))))))
+ (build-system meson-build-system)
+ (home-page "https://pwmt.org/projects/girara/")
+ (synopsis "Library for minimalistic gtk+3 user interfaces")
+ (description "Girara is a library that implements a user interface that
+focuses on simplicity and minimalism. Currently based on GTK+, a
+cross-platform widget toolkit, it provides an interface that focuses on three
+main components: a so-called view widget that represents the actual
+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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #3: 0002-gnu-Move-zathura-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: text/x-patch, Size: 6604 bytes --]
From 1b3a17d3d1fba5363f0f4357fb36a0366337c1e0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 11:22:50 -0400
Subject: [PATCH 2/7] gnu: Move zathura from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura): Move to [...]
* gnu/packages/pwmt.scm (zathura): [...] here.
---
gnu/packages/pdf.scm | 58 -----------------------------------------
gnu/packages/pwmt.scm | 60 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 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 8185cc40d9..5702041f72 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -31,6 +31,8 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages pkg-config)
+ #: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)
@@ -88,4 +90,62 @@ main components: a so-called view widget that represents the actual
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/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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #4: 0003-gnu-Move-zathura-ps-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: text/x-patch, Size: 4498 bytes --]
From 0096754a6564ea8dfa7826aeb897fbce28bd7016 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 11:27:02 -0400
Subject: [PATCH 3/7] gnu: Move zathura-ps from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-ps): Move to [...]
* gnu/packages/pwmt.scm (zathura-ps): [...] here.
---
gnu/packages/pdf.scm | 35 -----------------------------------
gnu/packages/pwmt.scm | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 36 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 5702041f72..5881cf5c80 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -27,6 +27,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages documentation)
#: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)
@@ -148,4 +149,39 @@ information.")
(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 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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #5: 0004-gnu-Move-zathura-pdf-poppler-from-pdf.scm-to-pwmt.sc.patch --]
[-- Type: text/x-patch, Size: 4636 bytes --]
From 47fc6ed3548bba6d65cf1d7c789d56e42cb5c106 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 11:53:48 -0400
Subject: [PATCH 4/7] gnu: Move zathura-pdf-poppler from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-pdf-poppler): Move to [...]
* gnu/packages/pwmt.scm (zathura-pdf-poppler): [...] here.
---
gnu/packages/pdf.scm | 36 ------------------------------------
gnu/packages/pwmt.scm | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c5539c7df5..0aca1e707a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -506,42 +506,6 @@ using the DjVuLibre library.")
by using the @code{mupdf} rendering library.")
(license license:zlib)))
-(define-public zathura-pdf-poppler
- (package
- (name "zathura-pdf-poppler")
- (version "0.3.0")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
- version ".tar.xz"))
- (sha256
- (base32
- "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs
- `(("poppler" ,poppler)
- ("zathura" ,zathura)))
- (build-system meson-build-system)
- (arguments
- `(#:tests? #f ; package does not include tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-plugin-directory
- ;; Something of a regression in 0.2.9: 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-pdf-poppler/")
- (synopsis "PDF support for zathura (poppler backend)")
- (description "The zathura-pdf-poppler plugin adds PDF support to zathura
-by using the poppler rendering engine.")
- (license license:zlib)))
-
(define-public podofo
(package
(name "podofo")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 5881cf5c80..459281a0aa 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -31,6 +31,7 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
@@ -184,4 +185,40 @@ interaction.")
(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-pdf-poppler
+ (package
+ (name "zathura-pdf-poppler")
+ (version "0.3.0")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("poppler" ,poppler)
+ ("zathura" ,zathura)))
+ (build-system meson-build-system)
+ (arguments
+ `(#:tests? #f ; package does not include tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-plugin-directory
+ ;; Something of a regression in 0.2.9: 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-pdf-poppler/")
+ (synopsis "PDF support for zathura (poppler backend)")
+ (description "The zathura-pdf-poppler plugin adds PDF support to zathura
+by using the poppler rendering engine.")
(license license:zlib)))
\ No newline at end of file
--
2.26.2
[-- Attachment #6: 0005-gnu-Move-zathura-pdf-mupdf-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: text/x-patch, Size: 5457 bytes --]
From dc3d3b63f1c4beaeca29205cbb2ae29c7dd4654a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 11:57:05 -0400
Subject: [PATCH 5/7] gnu: Move zathura-pdf-mupdf from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-pdf-mupdf): Move to [...]
* gnu/packages/pwmt.scm (zathura-pdf-mupdf): [...] here.
---
gnu/packages/pdf.scm | 44 ----------------------------------------
gnu/packages/pwmt.scm | 47 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 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 459281a0aa..1399c137a7 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -31,10 +31,13 @@
#: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 pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
+ #:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
@@ -221,4 +224,48 @@ using libspectre.")
(synopsis "PDF support for zathura (poppler backend)")
(description "The zathura-pdf-poppler plugin adds PDF support to zathura
by using the poppler rendering engine.")
+ (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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #7: 0006-gnu-Move-zathura-djvu-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: text/x-patch, Size: 4577 bytes --]
From 01abedd8f26bcc9df7b27d9905f0afa3a399a378 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 12:00:08 -0400
Subject: [PATCH 6/7] gnu: Move zathura-djvu from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-djvu): Move to [...]
* gnu/packages/pwmt.scm (zathura-djvu): [...] here.
---
gnu/packages/pdf.scm | 36 ------------------------------------
gnu/packages/pwmt.scm | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 37 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 1399c137a7..1662ee6d45 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 gettext)
#:use-module (gnu packages ghostscript)
@@ -268,4 +269,40 @@ by using the poppler rendering engine.")
(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 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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #8: 0007-gnu-Move-zathura-cb-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: text/x-patch, Size: 4565 bytes --]
From a9f155ad914c4f83a8d4220249d3cbf4fab096ac Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 12:01:58 -0400
Subject: [PATCH 7/7] gnu: Move zathura-cb from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-cb): Move to [...]
* gnu/packages/pwmt.scm (zathura-cb): [...] here.
---
gnu/packages/pdf.scm | 35 -----------------------------------
gnu/packages/pwmt.scm | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 36 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 1662ee6d45..2516c62485 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)
@@ -305,4 +306,39 @@ by using the @code{mupdf} rendering library.")
(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 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)))
\ No newline at end of file
--
2.26.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] patch#40994 Programs With Movie Titles (PWMT)
2020-05-02 16:09 ` Raghav Gururajan
@ 2020-05-03 4:22 ` Raghav Gururajan
2020-05-06 19:50 ` Marius Bakke
2020-05-06 19:29 ` Marius Bakke
1 sibling, 1 reply; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-03 4:22 UTC (permalink / raw)
To: Brice Waegeneire; +Cc: 40994
[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]
Hi Brice!
> > I don't see a patch related to jumanji, is it voluntary?
>
> I tried packaging Jumanji, but it is ported to new versions of webkitgtk. We
> do not have older versions of webkitgtk in guix.
>
> > Could you take example on a commit like
> > aff0cce9175aaf836dd78941eb17549e3bfa7188 (there must be others like it)
> > which move packages to a separate module. In particular create a commit
> > that just move the packages in the new module and adjust the modules
> > that
> > depend on them (if any). Then add your modifications to the packages in
> > separate commits to the one moving them with the git messages correctly
> > formatted, ie. not in a free form style. Otherwise it's difficult to
> > understand what your package modifications are related to just moving
> > them
> > elsewhere,since it's just a big diff.
>
> Thanks for the feedback. Sure thing!
>
> Please find the attachments with this email, for moving stuffs. All the moved
> packages only refer to each other. So no need of altering any other package
> definitions.
>
> I will send another set of patches for modifying stuffs,
>
Here, I have attached another patch-set for modifying stuffs. :-)
Regards,
RG.
[-- Attachment #2: 0008-gnu-girara-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4787 bytes --]
From 30042d73a58f90971cd6c37bf56269bd3abb2533 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 22:28:44 -0400
Subject: [PATCH 08/14] gnu: girara: Update package definition.
* gnu/packages/pwmt.scm (girara):
[source]<origin>[method]: Changed from git-fetch to url-fetch; and
remove file-name field.
[arguments]<#:glib-or-gtk?>: New argument.
[arguments]<#:configure-flags>[-Dnotify]: New flag.
[native-inputs]<doxygen>: New input.
[inputs]<glib,gtk+,json-c,libnotify,pango>: New inputs.
[propagated-inputs]<gtk+>: Removed.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 73 +++++++++++++++++++++++++------------------
1 file changed, 42 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 2516c62485..69007bde9a 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -56,38 +56,49 @@
(version "0.3.4")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.pwmt.org/pwmt/girara")
- (commit version)))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/girara/download/girara-"
+ version ".tar.xz"))
(sha256
- (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("check" ,check)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-for-tests)))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs `(("gtk+" ,gtk+)))
- (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 " &")))))))))
+ (base32 "0cmjdismdsx9a5l7zx54zkd33mgg3mx4ckpvc7aap3x6a1ddmz2i"))))
(build-system meson-build-system)
+ (arguments
+ `(#:glib-or-gtk? #t ; To compile schemas
+ #:configure-flags
+ (list
+ "-Dnotify=enabled") ; For notification support
+ #: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
+ ("doxygen" ,doxygen) ; For docs
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("pkg-config" ,pkg-config)
+ ("xorg-server" ,xorg-server-for-tests))) ; For tests
+ (inputs
+ `(("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; For configuration dumping support
+ ("libnotify" ,libnotify) ; For notification support
+ ("pango" ,pango)))
(home-page "https://pwmt.org/projects/girara/")
(synopsis "Library for minimalistic gtk+3 user interfaces")
(description "Girara is a library that implements a user interface that
@@ -341,4 +352,4 @@ using the DjVuLibre library.")
(synopsis "Comic book support for zathura (libarchive backend)")
(description "The zathura-cb plugin adds comic book support to zathura
using libarchive.")
- (license license:zlib)))
\ No newline at end of file
+ (license license:zlib)))
--
2.26.2
[-- Attachment #3: 0009-gnu-zathura-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 6717 bytes --]
From 7e3558dda412d33fffb7bb0668886f1ede3d14c8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 23:29:28 -0400
Subject: [PATCH 09/14] gnu: zathura: Update package definition.
* gnu/packages/pwmt.scm (zathura):
[arguments]<#:glib-or-gtk?>: New argument.
[native-inputs]<desktop-fileutils,doxygen,python-breathe,python-
sphinx-rtd-theme>: New inputs.
[inputs]<appstream-glib,cairo,file,girara,glib,json-c,gtk+,libnotify,
libseccomp>: New inputs.
[propagated-inputs]<cairo,girara>: Removed.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 113 ++++++++++++++++++++++++------------------
1 file changed, 64 insertions(+), 49 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 69007bde9a..16173ffa60 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -28,6 +28,8 @@
#: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)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
@@ -35,6 +37,7 @@
#: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)
#:use-module (gnu packages sphinx)
@@ -114,58 +117,70 @@ information.")
(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")))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura/download/zathura-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c"))))
(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 " &")))))))))
+ `(#: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
+ ("girara" ,girara)
+ ("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
+ (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/")
- (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 zathura-ps
--
2.26.2
[-- Attachment #4: 0010-gnu-zathura-ps-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3315 bytes --]
From 345a2b2ffc04c99fdfc3785ac6d19f053afd1b90 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 23:42:49 -0400
Subject: [PATCH 10/14] gnu: zathura-ps: Update package definition.
* gnu/packages/pwmt.scm (zathura-ps):
[arguments]<#:glib-or-gtk?>: New argument.
[inputs]<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 44 ++++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 16173ffa60..dcf041daa3 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -187,35 +187,45 @@ DjVu and ComicBook) via plugins.")
(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)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-ps/download/"
+ "zathura-ps-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; package does not contain tests
+ `(#:tests? #f ; No target
+ #:glib-or-gtk? #t ; To compile schemas
#: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.
+ ;; 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
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("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/")
- (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-pdf-poppler
--
2.26.2
[-- Attachment #5: 0011-gnu-zathura-pdf-poppler-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3369 bytes --]
From 22da4d2b51929e18bbf656e3c29f4bc06ef17f48 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 23:50:03 -0400
Subject: [PATCH 11/14] gnu: zathura-pdf-poppler: Update package definition.
* gnu/packages/pwmt.scm (zathura-pdf-poppler):
[arguments]<#:glib-or-gtk?>: New argument.
[arguments]<#phases>['patch-plugin-directory]: Removed.
[arguments]<#:configure-flags>[-Dplugindir]: New flag.
[inputs]<cairo,giara,glib>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 53 +++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index dcf041daa3..e9d97bbc89 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -232,36 +232,35 @@ using the libspectre library.")
(package
(name "zathura-pdf-poppler")
(version "0.3.0")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
- version ".tar.xz"))
- (sha256
- (base32
- "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs
- `(("poppler" ,poppler)
- ("zathura" ,zathura)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/"
+ "zathura-pdf-poppler-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; package does not include tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-plugin-directory
- ;; Something of a regression in 0.2.9: 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)))))
+ `(#: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
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("poppler" ,poppler)
+ ("zathura" ,zathura)))
+ (synopsis "PDF support (poppler backend) for zathura")
+ (description "The zathura-pdf-poppler plugin adds PDF support to zathura by
+using the poppler rendering library.")
(home-page "https://pwmt.org/projects/zathura-pdf-poppler/")
- (synopsis "PDF support for zathura (poppler backend)")
- (description "The zathura-pdf-poppler plugin adds PDF support to zathura
-by using the poppler rendering engine.")
(license license:zlib)))
(define-public zathura-pdf-mupdf
--
2.26.2
[-- Attachment #6: 0012-gnu-zathura-pdf-mupdf-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3820 bytes --]
From ee00e7e7e931d39a9afad36a203f7f28a39647cf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 3 May 2020 00:01:56 -0400
Subject: [PATCH 12/14] gnu: zathura-pdf-mupdf: Update package definition.
* gnu/packages/pwmt.scm (zathura-pdf-mupdf):
[arguments]<#:glib-or-gtk?>: New argument.
[inputs]<openssl>: Removed.
<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 59 +++++++++++++++++++++++++------------------
1 file changed, 34 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index e9d97bbc89..7c734c2111 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -267,30 +267,24 @@ using the poppler rendering library.")
(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)))
+ (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"))))
(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")
+ `(#: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
@@ -301,10 +295,25 @@ using the poppler rendering library.")
(string-append x " mujs = cc.find_library('mujs')\n"))
(("^ libopenjp2")
" libopenjp2, mujs")))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("jbig2dec" ,jbig2dec)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libjpeg" ,libjpeg)
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("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/")
- (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 zathura-djvu
--
2.26.2
[-- Attachment #7: 0013-gnu-zathura-djvu-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3423 bytes --]
From 806ae5789545cda66ff544e2c5e943fc1bb9fa28 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 3 May 2020 00:11:35 -0400
Subject: [PATCH 13/14] gnu: zathura-djvu: Update package definition.
* gnu/packages/pwmt.scm (zathura-djvu):
[arguments]<#:glib-or-gtk?>: New argument.
<#:phases>['patch-plugin-directory]: Removed.
<#:configure-flags>[-Dplugindir]: New flag.
[inputs]<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 56 ++++++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 7c734c2111..5ad4cbe7f7 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -320,36 +320,38 @@ using the mupdf rendering library.")
(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)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-djvu/download/"
+ "zathura-djvu-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"))))
(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)")
+ `(#: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
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("djvulibre" ,djvulibre)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("zathura" ,zathura)))
+ (synopsis "DjVu support for zathura")
(description "The zathura-djvu plugin adds DjVu support to zathura
-using the DjVuLibre library.")
+using the DjVu library.")
+ (home-page "https://pwmt.org/projects/zathura-djvu/")
(license license:zlib)))
(define-public zathura-cb
--
2.26.2
[-- Attachment #8: 0014-gnu-zathura-cb-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3251 bytes --]
From 6b4e210a1bc4282f0ff07a6279f55a8f42706a86 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 3 May 2020 00:18:21 -0400
Subject: [PATCH 14/14] gnu: zathura-cb: Update package definition.
* gnu/packages/pwmt.scm (zathura-cb):
[arguments]<#:glib-or-gtk?>: New argument.
[inputs]<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 5ad4cbe7f7..f361c91c00 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -358,33 +358,42 @@ using the DjVu library.")
(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)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-cb/download/"
+ "zathura-cb-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; package does not contain tests
+ `(#:tests? #f ; No target
+ #:glib-or-gtk? #t ; To compile schemas
#: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.
+ ;; 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
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libarchive" ,libarchive)
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("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/")
- (synopsis "Comic book support for zathura (libarchive backend)")
- (description "The zathura-cb plugin adds comic book support to zathura
-using libarchive.")
(license license:zlib)))
--
2.26.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] patch#40994 Programs With Movie Titles (PWMT)
2020-05-03 4:22 ` Raghav Gururajan
@ 2020-05-06 19:50 ` Marius Bakke
2020-05-08 3:37 ` Raghav Gururajan
0 siblings, 1 reply; 17+ messages in thread
From: Marius Bakke @ 2020-05-06 19:50 UTC (permalink / raw)
To: Raghav Gururajan, Brice Waegeneire; +Cc: 40994
[-- Attachment #1: Type: text/plain, Size: 3182 bytes --]
Hi!
Raghav Gururajan <raghavgururajan@disroot.org> writes:
> Here, I have attached another patch-set for modifying stuffs. :-)
I have added another set of nit-picks! :-)
> From 30042d73a58f90971cd6c37bf56269bd3abb2533 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Sat, 2 May 2020 22:28:44 -0400
> Subject: [PATCH 08/14] gnu: girara: Update package definition.
>
> * gnu/packages/pwmt.scm (girara):
> [source]<origin>[method]: Changed from git-fetch to url-fetch; and
> remove file-name field.
> [arguments]<#:glib-or-gtk?>: New argument.
> [arguments]<#:configure-flags>[-Dnotify]: New flag.
> [native-inputs]<doxygen>: New input.
> [inputs]<glib,gtk+,json-c,libnotify,pango>: New inputs.
> [propagated-inputs]<gtk+>: Removed.
> [synopsis]: Updated.
> [description]: Updated.
I know it's a lot to ask, but it would be great if you could split this
up in multiple patches, one per logical change. I.e. this one patch
would be better as a series like:
Raghav Gururajan (7):
gnu: girara: Download tarball instead of git source.
gnu: girara: Wrap with Glib variables.
gnu: girara: Add notification support.
gnu: girara: Build and install documentation.
gnu: girara: Do not propagate GTK+.
gnu: girara: Enable more features.
gnu: girara: Update synopsis & description.
That makes it possible to revert some of these changes in case of
problems without undoing the whole thing, and also makes reviewing
easier.
I'm also skeptical about some of these (why is #:glib-or-gtk? necessary
for this library, why does GTK+ no longer need to be propagated, and
what are all those new inputs for?). By lumping everything together
it's difficult to reason about these changes.
> From 7e3558dda412d33fffb7bb0668886f1ede3d14c8 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Sat, 2 May 2020 23:29:28 -0400
> Subject: [PATCH 09/14] gnu: zathura: Update package definition.
>
> * gnu/packages/pwmt.scm (zathura):
> [arguments]<#:glib-or-gtk?>: New argument.
> [native-inputs]<desktop-fileutils,doxygen,python-breathe,python-
> sphinx-rtd-theme>: New inputs.
Same here, what do these inputs do?
> [inputs]<appstream-glib,cairo,file,girara,glib,json-c,gtk+,libnotify,
> libseccomp>: New inputs.
And these?
> [propagated-inputs]<cairo,girara>: Removed.
> [synopsis]: Updated.
> [description]: Updated.
ISTM this could be split into at least four different patches.
> From 345a2b2ffc04c99fdfc3785ac6d19f053afd1b90 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Sat, 2 May 2020 23:42:49 -0400
> Subject: [PATCH 10/14] gnu: zathura-ps: Update package definition.
>
> * gnu/packages/pwmt.scm (zathura-ps):
> [arguments]<#:glib-or-gtk?>: New argument.
Why does this plugin package need #:glib-or-gtk?.
> [inputs]<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
It's strange that all of these packages require almost the exact same
set of inputs. Perhaps they should be propagated somewhere?
> [synopsis]: Updated.
> [description]: Updated.
This should also be a separate patch.
I think you catch my drift here, can you send an updated series?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#40994] patch#40994 Programs With Movie Titles (PWMT)
2020-05-06 19:50 ` Marius Bakke
@ 2020-05-08 3:37 ` Raghav Gururajan
0 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-08 3:37 UTC (permalink / raw)
To: Marius Bakke; +Cc: 40994, Brice Waegeneire
Hi Marius!
> I know it's a lot to ask, but it would be great if you could split this
> up in multiple patches, one per logical change. I.e. this one patch
> would be better as a series like:
>
> Raghav Gururajan (7):
> gnu: girara: Download tarball instead of git source.
> gnu: girara: Wrap with Glib variables.
> gnu: girara: Add notification support.
> gnu: girara: Build and install documentation.
> gnu: girara: Do not propagate GTK+.
> gnu: girara: Enable more features.
> gnu: girara: Update synopsis & description.
Oh yeah, this is lot and I cannot do at this time. But I have sent updated
patch-set that splits some changes. :-)
Anyway, this suggestion is very useful, so that I can use it moving forward.
> I'm also skeptical about some of these (why is #:glib-or-gtk? necessary
> for this library, why does GTK+ no longer need to be propagated, and
> what are all those new inputs for?). By lumping everything together
> it's difficult to reason about these changes.
>
> Same here, what do these inputs do?
>
> > [inputs]<appstream-glib,cairo,file,girara,glib,json-c,gtk+,libnotify,
> > libseccomp>: New inputs.
>
> And these?
I have used comments in the package definition. :-)
> Why does this plugin package need #:glib-or-gtk?.
That was a mistake. I removed it in the new patch-set.
> > [inputs]<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
>
> It's strange that all of these packages require almost the exact same
> set of inputs. Perhaps they should be propagated somewhere?
That's correct. cairo and girara are effect of removing propagation in zathura.
I think it is better not to propagate things, unless it is absolutely
necessary. Other inputs are simply required to generate 'cargs'.
> I think you catch my drift here, can you send an updated series?
I have sent an updated patch-set to the thread, with changes I could do at this
time. :-)
Regards,
RG.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#40994] patch#40994 Programs With Movie Titles (PWMT)
2020-05-02 16:09 ` Raghav Gururajan
2020-05-03 4:22 ` Raghav Gururajan
@ 2020-05-06 19:29 ` Marius Bakke
2020-05-08 3:28 ` Raghav Gururajan
1 sibling, 1 reply; 17+ messages in thread
From: Marius Bakke @ 2020-05-06 19:29 UTC (permalink / raw)
To: Raghav Gururajan, Brice Waegeneire; +Cc: 40994
[-- Attachment #1: Type: text/plain, Size: 8288 bytes --]
Hi Raghav,
Raghav Gururajan <raghavgururajan@disroot.org> writes:
> Please find the attachments with this email, for moving stuffs. All the moved
> packages only refer to each other. So no need of altering any other package
> definitions.
I'm not convinced that moving these packages are worth the effort,
though I'm not opposed to it either. What is the rationale?
I do have a few nits to pick though :-)
> From a05c5d174a9ee40e433a64c50f19c7f106381903 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Sat, 2 May 2020 11:16:04 -0400
> Subject: [PATCH 1/7] gnu: Move girara from gtk.scm to pwmt.scm.
>
> * gnu/packages/gtk.scm (girara): Move to [...]
> * gnu/packages/pwmt.scm (girara): [...] here.
> ---
> gnu/packages/gtk.scm | 49 -----------------------
> gnu/packages/pwmt.scm | 91 +++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 91 insertions(+), 49 deletions(-)
> create mode 100644 gnu/packages/pwmt.scm
>
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index bea4850d15..4d093a0e0a 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -1445,55 +1445,6 @@ In addition to the low level layout rendering routines, Pango includes
> and routines to assist in editing internationalized text.")
> (license license:lgpl2.1+)))
>
> -(define-public girara
> - (package
> - (name "girara")
> - (version "0.3.4")
> - (source
> - (origin
> - (method git-fetch)
> - (uri (git-reference
> - (url "https://git.pwmt.org/pwmt/girara")
> - (commit version)))
> - (file-name (git-file-name name version))
> - (sha256
> - (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
> - (native-inputs `(("pkg-config" ,pkg-config)
> - ("check" ,check)
> - ("gettext" ,gettext-minimal)
> - ("glib:bin" ,glib "bin")
> - ("xorg-server" ,xorg-server-for-tests)))
> - ;; Listed in 'Requires.private' of 'girara.pc'.
> - (propagated-inputs `(("gtk+" ,gtk+)))
> - (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 " &")))))))))
> - (build-system meson-build-system)
> - (home-page "https://pwmt.org/projects/girara/")
> - (synopsis "Library for minimalistic gtk+3 user interfaces")
> - (description "Girara is a library that implements a user interface that
> -focuses on simplicity and minimalism. Currently based on GTK+, a
> -cross-platform widget toolkit, it provides an interface that focuses on three
> -main components: a so-called view widget that represents the actual
> -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 gtk-doc
> (package
> (name "gtk-doc")
> diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
> new file mode 100644
> index 0000000000..8185cc40d9
> --- /dev/null
> +++ b/gnu/packages/pwmt.scm
> @@ -0,0 +1,91 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;;
> +;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
> +;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> +;;; Copyright © 2017 2018 Marius Bakke <mbakke@fastmail.com>
> +;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org>
> +;;; Copyright © 2018 2019 2020 Tobias Geerinckx-Rice <me@tobias.gr>
> +;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
For each patch, please include the copyright information for that
package only. I don't think all of these people worked on girara.
That makes it easier to track when someone decides to move these
packages to gtk.scm and pdf.scm in the future. ;-)
> +(define-module (gnu packages pwmt)
> + #:use-module (gnu packages)
> + #:use-module (gnu packages check)
> + #:use-module (gnu packages documentation)
> + #:use-module (gnu packages gettext)
> + #:use-module (gnu packages glib)
> + #:use-module (gnu packages gnome)
> + #:use-module (gnu packages gtk)
> + #:use-module (gnu packages pkg-config)
> + #:use-module (gnu packages web)
> + #:use-module (gnu packages xorg)
> + #:use-module (gnu packages xdisorg)
Likewise for modules: gnome, web, xorg and xdisorg seems unused for
girara.
> + #:use-module ((guix licenses) #:prefix license:)
> + #:use-module (guix packages)
> + #:use-module (guix download)
And (guix download).
> + #:use-module (guix git-download)
> + #:use-module (guix build-system gnu)
And gnu-build-system.
> + #:use-module (guix build-system meson))
> +
> +(define-public girara
> + (package
> + (name "girara")
> + (version "0.3.4")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://git.pwmt.org/pwmt/girara")
> + (commit version)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
> + (native-inputs `(("pkg-config" ,pkg-config)
> + ("check" ,check)
> + ("gettext" ,gettext-minimal)
> + ("glib:bin" ,glib "bin")
> + ("xorg-server" ,xorg-server-for-tests)))
> + ;; Listed in 'Requires.private' of 'girara.pc'.
> + (propagated-inputs `(("gtk+" ,gtk+)))
> + (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 " &")))))))))
> + (build-system meson-build-system)
> + (home-page "https://pwmt.org/projects/girara/")
> + (synopsis "Library for minimalistic gtk+3 user interfaces")
> + (description "Girara is a library that implements a user interface that
> +focuses on simplicity and minimalism. Currently based on GTK+, a
> +cross-platform widget toolkit, it provides an interface that focuses on three
> +main components: a so-called view widget that represents the actual
> +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)))
> \ No newline at end of file
Also make sure that the files end with a newline, like all other files
in Guix.
For the remainder in this series, please also check whether module
imports can be removed from pdf.scm (that makes it worth it IMO).
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* [bug#40994] patch#40994 Programs With Movie Titles (PWMT)
2020-05-06 19:29 ` Marius Bakke
@ 2020-05-08 3:28 ` Raghav Gururajan
0 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-08 3:28 UTC (permalink / raw)
To: Marius Bakke; +Cc: 40994, Brice Waegeneire
Hi Marius!
> I'm not convinced that moving these packages are worth the effort,
> though I'm not opposed to it either. What is the rationale?
The idea is to put together the packages of PWMT project. The concept is
similar to suckless.scm.
> For each patch, please include the copyright information for that
> package only. I don't think all of these people worked on girara.
Yes, they have. I checked with git log. :-)
> Likewise for modules: gnome, web, xorg and xdisorg seems unused for
> girara.
>
> And (guix download).
>
> And gnu-build-system.
>
> Also make sure that the files end with a newline, like all other files
> in Guix.
I have made these changes and sent updated patch to the thread.
Regards,
RG.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [bug#40994] All patches attached
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
` (7 preceding siblings ...)
2020-05-02 13:24 ` [bug#40994] patch#40994 Programs With Movie Titles (PWMT) Brice Waegeneire
@ 2020-05-06 9:41 ` Raghav Gururajan
2020-05-08 3:24 ` [bug#40994] Updated patch-set Raghav Gururajan
9 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-06 9:41 UTC (permalink / raw)
To: 40994
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 1.patch --]
[-- Type: text/x-patch, Size: 8106 bytes --]
From cf63b0c81a49c1d7649d7ce812aa6f116754d195 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 6 May 2020 05:38:38 -0400
Subject: [PATCH] gnu: Move girara from gtk.scm to pwmt.scm.
* gnu/packages/gtk.scm (girara): Move to [...]
* gnu/packages/pwmt.scm (girara): [...] here.
---
gnu/local.mk | 1 +
gnu/packages/gtk.scm | 49 -----------------------
gnu/packages/pwmt.scm | 91 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+), 49 deletions(-)
create mode 100644 gnu/packages/pwmt.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 3c9a10b6bc..d73f6be33d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -430,6 +430,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/protobuf.scm \
%D%/packages/pure.scm \
%D%/packages/pv.scm \
+ %D%/packages/pwmt.scm \
%D%/packages/python.scm \
%D%/packages/python-check.scm \
%D%/packages/python-compression.scm \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bea4850d15..4d093a0e0a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1445,55 +1445,6 @@ In addition to the low level layout rendering routines, Pango includes
and routines to assist in editing internationalized text.")
(license license:lgpl2.1+)))
-(define-public girara
- (package
- (name "girara")
- (version "0.3.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.pwmt.org/pwmt/girara")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("check" ,check)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-for-tests)))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs `(("gtk+" ,gtk+)))
- (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 " &")))))))))
- (build-system meson-build-system)
- (home-page "https://pwmt.org/projects/girara/")
- (synopsis "Library for minimalistic gtk+3 user interfaces")
- (description "Girara is a library that implements a user interface that
-focuses on simplicity and minimalism. Currently based on GTK+, a
-cross-platform widget toolkit, it provides an interface that focuses on three
-main components: a so-called view widget that represents the actual
-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 gtk-doc
(package
(name "gtk-doc")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
new file mode 100644
index 0000000000..8185cc40d9
--- /dev/null
+++ b/gnu/packages/pwmt.scm
@@ -0,0 +1,91 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2017 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2018 2019 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages pwmt)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages documentation)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages web)
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages xdisorg)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson))
+
+(define-public girara
+ (package
+ (name "girara")
+ (version "0.3.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.pwmt.org/pwmt/girara")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("check" ,check)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("xorg-server" ,xorg-server-for-tests)))
+ ;; Listed in 'Requires.private' of 'girara.pc'.
+ (propagated-inputs `(("gtk+" ,gtk+)))
+ (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 " &")))))))))
+ (build-system meson-build-system)
+ (home-page "https://pwmt.org/projects/girara/")
+ (synopsis "Library for minimalistic gtk+3 user interfaces")
+ (description "Girara is a library that implements a user interface that
+focuses on simplicity and minimalism. Currently based on GTK+, a
+cross-platform widget toolkit, it provides an interface that focuses on three
+main components: a so-called view widget that represents the actual
+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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #3: 2.patch --]
[-- Type: text/x-patch, Size: 6606 bytes --]
From 1b3a17d3d1fba5363f0f4357fb36a0366337c1e0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 11:22:50 -0400
Subject: [PATCH 02/14] gnu: Move zathura from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura): Move to [...]
* gnu/packages/pwmt.scm (zathura): [...] here.
---
gnu/packages/pdf.scm | 58 -----------------------------------------
gnu/packages/pwmt.scm | 60 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 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 8185cc40d9..5702041f72 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -31,6 +31,8 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages pkg-config)
+ #: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)
@@ -88,4 +90,62 @@ main components: a so-called view widget that represents the actual
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/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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #4: 3.patch --]
[-- Type: text/x-patch, Size: 4500 bytes --]
From 0096754a6564ea8dfa7826aeb897fbce28bd7016 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 11:27:02 -0400
Subject: [PATCH 03/14] gnu: Move zathura-ps from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-ps): Move to [...]
* gnu/packages/pwmt.scm (zathura-ps): [...] here.
---
gnu/packages/pdf.scm | 35 -----------------------------------
gnu/packages/pwmt.scm | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 36 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 5702041f72..5881cf5c80 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -27,6 +27,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages documentation)
#: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)
@@ -148,4 +149,39 @@ information.")
(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 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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #5: 4.patch --]
[-- Type: text/x-patch, Size: 4638 bytes --]
From 47fc6ed3548bba6d65cf1d7c789d56e42cb5c106 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 11:53:48 -0400
Subject: [PATCH 04/14] gnu: Move zathura-pdf-poppler from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-pdf-poppler): Move to [...]
* gnu/packages/pwmt.scm (zathura-pdf-poppler): [...] here.
---
gnu/packages/pdf.scm | 36 ------------------------------------
gnu/packages/pwmt.scm | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c5539c7df5..0aca1e707a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -506,42 +506,6 @@ using the DjVuLibre library.")
by using the @code{mupdf} rendering library.")
(license license:zlib)))
-(define-public zathura-pdf-poppler
- (package
- (name "zathura-pdf-poppler")
- (version "0.3.0")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
- version ".tar.xz"))
- (sha256
- (base32
- "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs
- `(("poppler" ,poppler)
- ("zathura" ,zathura)))
- (build-system meson-build-system)
- (arguments
- `(#:tests? #f ; package does not include tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-plugin-directory
- ;; Something of a regression in 0.2.9: 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-pdf-poppler/")
- (synopsis "PDF support for zathura (poppler backend)")
- (description "The zathura-pdf-poppler plugin adds PDF support to zathura
-by using the poppler rendering engine.")
- (license license:zlib)))
-
(define-public podofo
(package
(name "podofo")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 5881cf5c80..459281a0aa 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -31,6 +31,7 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
@@ -184,4 +185,40 @@ interaction.")
(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-pdf-poppler
+ (package
+ (name "zathura-pdf-poppler")
+ (version "0.3.0")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("poppler" ,poppler)
+ ("zathura" ,zathura)))
+ (build-system meson-build-system)
+ (arguments
+ `(#:tests? #f ; package does not include tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-plugin-directory
+ ;; Something of a regression in 0.2.9: 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-pdf-poppler/")
+ (synopsis "PDF support for zathura (poppler backend)")
+ (description "The zathura-pdf-poppler plugin adds PDF support to zathura
+by using the poppler rendering engine.")
(license license:zlib)))
\ No newline at end of file
--
2.26.2
[-- Attachment #6: 5.patch --]
[-- Type: text/x-patch, Size: 5459 bytes --]
From dc3d3b63f1c4beaeca29205cbb2ae29c7dd4654a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 11:57:05 -0400
Subject: [PATCH 05/14] gnu: Move zathura-pdf-mupdf from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-pdf-mupdf): Move to [...]
* gnu/packages/pwmt.scm (zathura-pdf-mupdf): [...] here.
---
gnu/packages/pdf.scm | 44 ----------------------------------------
gnu/packages/pwmt.scm | 47 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 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 459281a0aa..1399c137a7 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -31,10 +31,13 @@
#: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 pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
+ #:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
@@ -221,4 +224,48 @@ using libspectre.")
(synopsis "PDF support for zathura (poppler backend)")
(description "The zathura-pdf-poppler plugin adds PDF support to zathura
by using the poppler rendering engine.")
+ (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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #7: 6.patch --]
[-- Type: text/x-patch, Size: 4579 bytes --]
From 01abedd8f26bcc9df7b27d9905f0afa3a399a378 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 12:00:08 -0400
Subject: [PATCH 06/14] gnu: Move zathura-djvu from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-djvu): Move to [...]
* gnu/packages/pwmt.scm (zathura-djvu): [...] here.
---
gnu/packages/pdf.scm | 36 ------------------------------------
gnu/packages/pwmt.scm | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 37 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 1399c137a7..1662ee6d45 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 gettext)
#:use-module (gnu packages ghostscript)
@@ -268,4 +269,40 @@ by using the poppler rendering engine.")
(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 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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #8: 7.patch --]
[-- Type: text/x-patch, Size: 4567 bytes --]
From a9f155ad914c4f83a8d4220249d3cbf4fab096ac Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 12:01:58 -0400
Subject: [PATCH 07/14] gnu: Move zathura-cb from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-cb): Move to [...]
* gnu/packages/pwmt.scm (zathura-cb): [...] here.
---
gnu/packages/pdf.scm | 35 -----------------------------------
gnu/packages/pwmt.scm | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 36 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 1662ee6d45..2516c62485 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)
@@ -305,4 +306,39 @@ by using the @code{mupdf} rendering library.")
(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 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)))
\ No newline at end of file
--
2.26.2
[-- Attachment #9: 8.patch --]
[-- Type: text/x-patch, Size: 4787 bytes --]
From 30042d73a58f90971cd6c37bf56269bd3abb2533 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 22:28:44 -0400
Subject: [PATCH 08/14] gnu: girara: Update package definition.
* gnu/packages/pwmt.scm (girara):
[source]<origin>[method]: Changed from git-fetch to url-fetch; and
remove file-name field.
[arguments]<#:glib-or-gtk?>: New argument.
[arguments]<#:configure-flags>[-Dnotify]: New flag.
[native-inputs]<doxygen>: New input.
[inputs]<glib,gtk+,json-c,libnotify,pango>: New inputs.
[propagated-inputs]<gtk+>: Removed.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 73 +++++++++++++++++++++++++------------------
1 file changed, 42 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 2516c62485..69007bde9a 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -56,38 +56,49 @@
(version "0.3.4")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.pwmt.org/pwmt/girara")
- (commit version)))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/girara/download/girara-"
+ version ".tar.xz"))
(sha256
- (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("check" ,check)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-for-tests)))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs `(("gtk+" ,gtk+)))
- (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 " &")))))))))
+ (base32 "0cmjdismdsx9a5l7zx54zkd33mgg3mx4ckpvc7aap3x6a1ddmz2i"))))
(build-system meson-build-system)
+ (arguments
+ `(#:glib-or-gtk? #t ; To compile schemas
+ #:configure-flags
+ (list
+ "-Dnotify=enabled") ; For notification support
+ #: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
+ ("doxygen" ,doxygen) ; For docs
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("pkg-config" ,pkg-config)
+ ("xorg-server" ,xorg-server-for-tests))) ; For tests
+ (inputs
+ `(("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; For configuration dumping support
+ ("libnotify" ,libnotify) ; For notification support
+ ("pango" ,pango)))
(home-page "https://pwmt.org/projects/girara/")
(synopsis "Library for minimalistic gtk+3 user interfaces")
(description "Girara is a library that implements a user interface that
@@ -341,4 +352,4 @@ using the DjVuLibre library.")
(synopsis "Comic book support for zathura (libarchive backend)")
(description "The zathura-cb plugin adds comic book support to zathura
using libarchive.")
- (license license:zlib)))
\ No newline at end of file
+ (license license:zlib)))
--
2.26.2
[-- Attachment #10: 9.patch --]
[-- Type: text/x-patch, Size: 6717 bytes --]
From 7e3558dda412d33fffb7bb0668886f1ede3d14c8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 23:29:28 -0400
Subject: [PATCH 09/14] gnu: zathura: Update package definition.
* gnu/packages/pwmt.scm (zathura):
[arguments]<#:glib-or-gtk?>: New argument.
[native-inputs]<desktop-fileutils,doxygen,python-breathe,python-
sphinx-rtd-theme>: New inputs.
[inputs]<appstream-glib,cairo,file,girara,glib,json-c,gtk+,libnotify,
libseccomp>: New inputs.
[propagated-inputs]<cairo,girara>: Removed.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 113 ++++++++++++++++++++++++------------------
1 file changed, 64 insertions(+), 49 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 69007bde9a..16173ffa60 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -28,6 +28,8 @@
#: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)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
@@ -35,6 +37,7 @@
#: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)
#:use-module (gnu packages sphinx)
@@ -114,58 +117,70 @@ information.")
(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")))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura/download/zathura-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c"))))
(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 " &")))))))))
+ `(#: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
+ ("girara" ,girara)
+ ("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
+ (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/")
- (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 zathura-ps
--
2.26.2
[-- Attachment #11: 10.patch --]
[-- Type: text/x-patch, Size: 3315 bytes --]
From 345a2b2ffc04c99fdfc3785ac6d19f053afd1b90 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 23:42:49 -0400
Subject: [PATCH 10/14] gnu: zathura-ps: Update package definition.
* gnu/packages/pwmt.scm (zathura-ps):
[arguments]<#:glib-or-gtk?>: New argument.
[inputs]<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 44 ++++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 16173ffa60..dcf041daa3 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -187,35 +187,45 @@ DjVu and ComicBook) via plugins.")
(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)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-ps/download/"
+ "zathura-ps-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; package does not contain tests
+ `(#:tests? #f ; No target
+ #:glib-or-gtk? #t ; To compile schemas
#: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.
+ ;; 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
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("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/")
- (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-pdf-poppler
--
2.26.2
[-- Attachment #12: 11.patch --]
[-- Type: text/x-patch, Size: 3369 bytes --]
From 22da4d2b51929e18bbf656e3c29f4bc06ef17f48 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 2 May 2020 23:50:03 -0400
Subject: [PATCH 11/14] gnu: zathura-pdf-poppler: Update package definition.
* gnu/packages/pwmt.scm (zathura-pdf-poppler):
[arguments]<#:glib-or-gtk?>: New argument.
[arguments]<#phases>['patch-plugin-directory]: Removed.
[arguments]<#:configure-flags>[-Dplugindir]: New flag.
[inputs]<cairo,giara,glib>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 53 +++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index dcf041daa3..e9d97bbc89 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -232,36 +232,35 @@ using the libspectre library.")
(package
(name "zathura-pdf-poppler")
(version "0.3.0")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
- version ".tar.xz"))
- (sha256
- (base32
- "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs
- `(("poppler" ,poppler)
- ("zathura" ,zathura)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/"
+ "zathura-pdf-poppler-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; package does not include tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-plugin-directory
- ;; Something of a regression in 0.2.9: 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)))))
+ `(#: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
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("poppler" ,poppler)
+ ("zathura" ,zathura)))
+ (synopsis "PDF support (poppler backend) for zathura")
+ (description "The zathura-pdf-poppler plugin adds PDF support to zathura by
+using the poppler rendering library.")
(home-page "https://pwmt.org/projects/zathura-pdf-poppler/")
- (synopsis "PDF support for zathura (poppler backend)")
- (description "The zathura-pdf-poppler plugin adds PDF support to zathura
-by using the poppler rendering engine.")
(license license:zlib)))
(define-public zathura-pdf-mupdf
--
2.26.2
[-- Attachment #13: 12.patch --]
[-- Type: text/x-patch, Size: 3820 bytes --]
From ee00e7e7e931d39a9afad36a203f7f28a39647cf Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 3 May 2020 00:01:56 -0400
Subject: [PATCH 12/14] gnu: zathura-pdf-mupdf: Update package definition.
* gnu/packages/pwmt.scm (zathura-pdf-mupdf):
[arguments]<#:glib-or-gtk?>: New argument.
[inputs]<openssl>: Removed.
<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 59 +++++++++++++++++++++++++------------------
1 file changed, 34 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index e9d97bbc89..7c734c2111 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -267,30 +267,24 @@ using the poppler rendering library.")
(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)))
+ (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"))))
(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")
+ `(#: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
@@ -301,10 +295,25 @@ using the poppler rendering library.")
(string-append x " mujs = cc.find_library('mujs')\n"))
(("^ libopenjp2")
" libopenjp2, mujs")))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("jbig2dec" ,jbig2dec)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libjpeg" ,libjpeg)
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("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/")
- (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 zathura-djvu
--
2.26.2
[-- Attachment #14: 13.patch --]
[-- Type: text/x-patch, Size: 3423 bytes --]
From 806ae5789545cda66ff544e2c5e943fc1bb9fa28 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 3 May 2020 00:11:35 -0400
Subject: [PATCH 13/14] gnu: zathura-djvu: Update package definition.
* gnu/packages/pwmt.scm (zathura-djvu):
[arguments]<#:glib-or-gtk?>: New argument.
<#:phases>['patch-plugin-directory]: Removed.
<#:configure-flags>[-Dplugindir]: New flag.
[inputs]<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 56 ++++++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 7c734c2111..5ad4cbe7f7 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -320,36 +320,38 @@ using the mupdf rendering library.")
(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)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-djvu/download/"
+ "zathura-djvu-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"))))
(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)")
+ `(#: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
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("djvulibre" ,djvulibre)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("zathura" ,zathura)))
+ (synopsis "DjVu support for zathura")
(description "The zathura-djvu plugin adds DjVu support to zathura
-using the DjVuLibre library.")
+using the DjVu library.")
+ (home-page "https://pwmt.org/projects/zathura-djvu/")
(license license:zlib)))
(define-public zathura-cb
--
2.26.2
[-- Attachment #15: 14.patch --]
[-- Type: text/x-patch, Size: 3251 bytes --]
From 6b4e210a1bc4282f0ff07a6279f55a8f42706a86 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 3 May 2020 00:18:21 -0400
Subject: [PATCH 14/14] gnu: zathura-cb: Update package definition.
* gnu/packages/pwmt.scm (zathura-cb):
[arguments]<#:glib-or-gtk?>: New argument.
[inputs]<cairo,girara,glib,gtk+,json-c,libnotify>: New inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 5ad4cbe7f7..f361c91c00 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -358,33 +358,42 @@ using the DjVu library.")
(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)))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-cb/download/"
+ "zathura-cb-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; package does not contain tests
+ `(#:tests? #f ; No target
+ #:glib-or-gtk? #t ; To compile schemas
#: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.
+ ;; 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
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libarchive" ,libarchive)
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("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/")
- (synopsis "Comic book support for zathura (libarchive backend)")
- (description "The zathura-cb plugin adds comic book support to zathura
-using libarchive.")
(license license:zlib)))
--
2.26.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [bug#40994] Updated patch-set.
2020-05-01 11:52 [bug#40994] Programs With Movie Titles (PWMT) Raghav Gururajan
` (8 preceding siblings ...)
2020-05-06 9:41 ` [bug#40994] All patches attached Raghav Gururajan
@ 2020-05-08 3:24 ` Raghav Gururajan
9 siblings, 0 replies; 17+ messages in thread
From: Raghav Gururajan @ 2020-05-08 3:24 UTC (permalink / raw)
To: 40994; +Cc: Marius Bakke, Brice Waegeneire
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-girara-Move-from-gtk.scm-to-pwmt.scm.patch --]
[-- Type: application/octet-stream, Size: 7716 bytes --]
From 50c7699323549d2e1ee538515e9e130d6269ec69 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 20:35:41 -0400
Subject: [PATCH 01/22] gnu: girara: Move from gtk.scm to pwmt.scm.
* gnu/packages/gtk.scm (girara): Move to [...]
* gnu/packages/pwmt.scm (girara): [...] here.
---
gnu/local.mk | 1 +
gnu/packages/gtk.scm | 49 ------------------------
gnu/packages/pwmt.scm | 86 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 87 insertions(+), 49 deletions(-)
create mode 100644 gnu/packages/pwmt.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 98bdf69c53..9d7b3bc81a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -431,6 +431,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/protobuf.scm \
%D%/packages/pure.scm \
%D%/packages/pv.scm \
+ %D%/packages/pwmt.scm \
%D%/packages/python.scm \
%D%/packages/python-check.scm \
%D%/packages/python-compression.scm \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bea4850d15..4d093a0e0a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1445,55 +1445,6 @@ In addition to the low level layout rendering routines, Pango includes
and routines to assist in editing internationalized text.")
(license license:lgpl2.1+)))
-(define-public girara
- (package
- (name "girara")
- (version "0.3.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.pwmt.org/pwmt/girara")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("check" ,check)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-for-tests)))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs `(("gtk+" ,gtk+)))
- (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 " &")))))))))
- (build-system meson-build-system)
- (home-page "https://pwmt.org/projects/girara/")
- (synopsis "Library for minimalistic gtk+3 user interfaces")
- (description "Girara is a library that implements a user interface that
-focuses on simplicity and minimalism. Currently based on GTK+, a
-cross-platform widget toolkit, it provides an interface that focuses on three
-main components: a so-called view widget that represents the actual
-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 gtk-doc
(package
(name "gtk-doc")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
new file mode 100644
index 0000000000..28af803a45
--- /dev/null
+++ b/gnu/packages/pwmt.scm
@@ -0,0 +1,86 @@
+;;; GNU Guix --- Functional package management for GNU
+;;;
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2017 2018 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2018 2019 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages pwmt)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages check)
+ #:use-module (gnu packages documentation)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages xorg)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix git-download)
+ #:use-module (guix build-system meson))
+
+(define-public girara
+ (package
+ (name "girara")
+ (version "0.3.4")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.pwmt.org/pwmt/girara")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("check" ,check)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("xorg-server" ,xorg-server-for-tests)))
+ ;; Listed in 'Requires.private' of 'girara.pc'.
+ (propagated-inputs `(("gtk+" ,gtk+)))
+ (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 " &")))))))))
+ (build-system meson-build-system)
+ (home-page "https://pwmt.org/projects/girara/")
+ (synopsis "Library for minimalistic gtk+3 user interfaces")
+ (description "Girara is a library that implements a user interface that
+focuses on simplicity and minimalism. Currently based on GTK+, a
+cross-platform widget toolkit, it provides an interface that focuses on three
+main components: a so-called view widget that represents the actual
+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)))
--
2.26.2
[-- Attachment #3: 0002-gnu-zathura-Move-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: application/octet-stream, Size: 6754 bytes --]
From e19fb88457f72a0441472b5cc7fcc3bb6bbdfa2f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 20:51:21 -0400
Subject: [PATCH 02/22] gnu: zathura: Move from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura): Move to [...]
* gnu/packages/pwmt.scm (zathura): [...] here.
---
gnu/packages/pdf.scm | 58 ----------------------------------------
gnu/packages/pwmt.scm | 62 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 62 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 28af803a45..de95190f09 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -28,11 +28,15 @@
#:use-module (gnu packages documentation)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages sphinx)
+ #:use-module (gnu packages sqlite)
#:use-module (gnu packages xorg)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
+ #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system meson))
@@ -84,3 +88,61 @@ 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/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)))
--
2.26.2
[-- Attachment #4: 0003-gnu-zathura-ps-Move-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: application/octet-stream, Size: 4396 bytes --]
From c2bda9c7e48a37b4c3627e2296e4beabbb92f5d0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 20:56:09 -0400
Subject: [PATCH 03/22] gnu: zathura-ps: Move from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-ps): Move to [...]
* gnu/packages/pwmt.scm (zathura-ps): [...] here.
---
gnu/packages/pdf.scm | 35 -----------------------------------
gnu/packages/pwmt.scm | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 36 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 de95190f09..32abe6d129 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -27,6 +27,7 @@
#:use-module (gnu packages check)
#:use-module (gnu packages documentation)
#: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)
@@ -146,3 +147,38 @@ information.")
minimalistic interface and an interface that mainly focuses on keyboard
interaction.")
(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)))
--
2.26.2
[-- Attachment #5: 0004-gnu-zathura-pdf-poppler-Move-from-pdf.scm-to-pwmt.sc.patch --]
[-- Type: application/octet-stream, Size: 4550 bytes --]
From 10b682191224841c7e3e8c45034de54d9d3e45b5 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 20:59:58 -0400
Subject: [PATCH 04/22] gnu: zathura-pdf-poppler: Move from pdf.scm to
pwmt.scm.
* gnu/packages/pdf.scm (zathura-pdf-poppler): Move to [...]
* gnu/packages/pwmt.scm (zathura-pdf-poppler): [...] here.
---
gnu/packages/pdf.scm | 36 ------------------------------------
gnu/packages/pwmt.scm | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c5539c7df5..0aca1e707a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -506,42 +506,6 @@ using the DjVuLibre library.")
by using the @code{mupdf} rendering library.")
(license license:zlib)))
-(define-public zathura-pdf-poppler
- (package
- (name "zathura-pdf-poppler")
- (version "0.3.0")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
- version ".tar.xz"))
- (sha256
- (base32
- "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs
- `(("poppler" ,poppler)
- ("zathura" ,zathura)))
- (build-system meson-build-system)
- (arguments
- `(#:tests? #f ; package does not include tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-plugin-directory
- ;; Something of a regression in 0.2.9: 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-pdf-poppler/")
- (synopsis "PDF support for zathura (poppler backend)")
- (description "The zathura-pdf-poppler plugin adds PDF support to zathura
-by using the poppler rendering engine.")
- (license license:zlib)))
-
(define-public podofo
(package
(name "podofo")
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 32abe6d129..f984f1b327 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -31,6 +31,7 @@
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
@@ -182,3 +183,39 @@ interaction.")
(description "The zathura-ps plugin adds PS support to zathura
using libspectre.")
(license license:zlib)))
+
+(define-public zathura-pdf-poppler
+ (package
+ (name "zathura-pdf-poppler")
+ (version "0.3.0")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("poppler" ,poppler)
+ ("zathura" ,zathura)))
+ (build-system meson-build-system)
+ (arguments
+ `(#:tests? #f ; package does not include tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-plugin-directory
+ ;; Something of a regression in 0.2.9: 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-pdf-poppler/")
+ (synopsis "PDF support for zathura (poppler backend)")
+ (description "The zathura-pdf-poppler plugin adds PDF support to zathura
+by using the poppler rendering engine.")
+ (license license:zlib)))
--
2.26.2
[-- Attachment #6: 0005-gnu-zathura-pdf-mupdf-Move-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: application/octet-stream, Size: 5382 bytes --]
From f693dbb7110691b923728693cc3fc9f3600d8624 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 21:05:15 -0400
Subject: [PATCH 05/22] gnu: zathura-pdf-mupdf: Move from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-pdf-mupdf): Move to [...]
* gnu/packages/pwmt.scm (zathura-pdf-mupdf): [...] here.
---
gnu/packages/pdf.scm | 44 ----------------------------------------
gnu/packages/pwmt.scm | 47 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 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 f984f1b327..3d3abe168d 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -31,10 +31,13 @@
#: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 pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
+ #:use-module (gnu packages tls)
#:use-module (gnu packages xorg)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
@@ -219,3 +222,47 @@ using libspectre.")
(description "The zathura-pdf-poppler plugin adds PDF support to zathura
by using the poppler rendering engine.")
(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)))
--
2.26.2
[-- Attachment #7: 0006-gnu-zathura-djvu-Move-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: application/octet-stream, Size: 4494 bytes --]
From a558212f428c847c536ae9752e7463b3775a2115 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 21:08:16 -0400
Subject: [PATCH 06/22] gnu: zathura-djvu: Move from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-djvu): Move to [...]
* gnu/packages/pwmt.scm (zathura-djvu): [...] here.
---
gnu/packages/pdf.scm | 36 ------------------------------------
gnu/packages/pwmt.scm | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 37 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 3d3abe168d..e535d09f06 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 gettext)
#:use-module (gnu packages ghostscript)
@@ -266,3 +267,39 @@ by using the poppler rendering engine.")
(description "The zathura-pdf-mupdf plugin adds PDF support to zathura
by using the @code{mupdf} rendering library.")
(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)))
--
2.26.2
[-- Attachment #8: 0007-gnu-zathura-cb-Move-from-pdf.scm-to-pwmt.scm.patch --]
[-- Type: application/octet-stream, Size: 4477 bytes --]
From 40d8b19ca091a642ea75fdb59ee4ffdfe64982d7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 21:14:13 -0400
Subject: [PATCH 07/22] gnu: zathura-cb: Move from pdf.scm to pwmt.scm.
* gnu/packages/pdf.scm (zathura-cb): Move to [...]
* gnu/packages/pwmt.scm (zathura-cb): [...] here.
---
gnu/packages/pdf.scm | 35 -----------------------------------
gnu/packages/pwmt.scm | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 36 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 e535d09f06..655dc39e26 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)
@@ -303,3 +304,38 @@ by using the @code{mupdf} rendering library.")
(description "The zathura-djvu plugin adds DjVu support to zathura
using the DjVuLibre library.")
(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/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)))
--
2.26.2
[-- Attachment #9: 0008-gnu-girara-Download-tarball-instead-of-git-source.patch --]
[-- Type: application/octet-stream, Size: 1294 bytes --]
From 1e8e96589d49f188946505c2826960fbe63a40ec Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 21:24:21 -0400
Subject: [PATCH 08/22] gnu: girara: Download tarball instead of git source.
* gnu/packages/pwmt.scm (girara): Change from git-fetch to url-fetch.
---
gnu/packages/pwmt.scm | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 655dc39e26..57f1847a39 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -53,13 +53,12 @@
(version "0.3.4")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.pwmt.org/pwmt/girara")
- (commit version)))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/girara/download/girara-"
+ version ".tar.xz"))
(sha256
- (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
+ (base32 "0cmjdismdsx9a5l7zx54zkd33mgg3mx4ckpvc7aap3x6a1ddmz2i"))))
(native-inputs `(("pkg-config" ,pkg-config)
("check" ,check)
("gettext" ,gettext-minimal)
--
2.26.2
[-- Attachment #10: 0009-gnu-girara-Rearrange-elements-of-package-definition.patch --]
[-- Type: application/octet-stream, Size: 2440 bytes --]
From d1e4cb56d148ff35aae1db09b94862bd659c4e2e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 21:31:55 -0400
Subject: [PATCH 09/22] gnu: girara: Rearrange elements of package definition.
* gnu/packages/pwmt.scm (girara): Reorder fields.
---
gnu/packages/pwmt.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 57f1847a39..977ba39ccc 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -59,13 +59,7 @@
version ".tar.xz"))
(sha256
(base32 "0cmjdismdsx9a5l7zx54zkd33mgg3mx4ckpvc7aap3x6a1ddmz2i"))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("check" ,check)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-for-tests)))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs `(("gtk+" ,gtk+)))
+ (build-system meson-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(add-before 'check 'start-xserver
@@ -83,8 +77,13 @@
(setenv "DBUS_FATAL_WARNINGS" "0")
(zero? (system (string-append xorg-server "/bin/Xvfb "
display " &")))))))))
- (build-system meson-build-system)
- (home-page "https://pwmt.org/projects/girara/")
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("check" ,check)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("xorg-server" ,xorg-server-for-tests)))
+ ;; Listed in 'Requires.private' of 'girara.pc'.
+ (propagated-inputs `(("gtk+" ,gtk+)))
(synopsis "Library for minimalistic gtk+3 user interfaces")
(description "Girara is a library that implements a user interface that
focuses on simplicity and minimalism. Currently based on GTK+, a
@@ -93,6 +92,7 @@ main components: a so-called view widget that represents the actual
application, an input bar that is used to execute commands of the
application and the status bar which provides the user with current
information.")
+ (home-page "https://pwmt.org/projects/girara/")
(license license:zlib)))
(define-public zathura
--
2.26.2
[-- Attachment #11: 0010-gnu-girara-Update-package-definition.patch --]
[-- Type: application/octet-stream, Size: 5012 bytes --]
From ac456959a14f112356051fc37b4b30b54d475f3d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 22:01:33 -0400
Subject: [PATCH 10/22] gnu: girara: Update package definition.
* gnu/packages/pwmt.scm (girara): Make changes to reflect particulars
in recent version of source code.
[arguments]: Add glib-or-gtk option.
[arguments]: Add notify configure-flag.
[native-inputs]: Add doxygen.
[inputs]: Add glib, json-c, libnotify and pango.
[propagated-inputs]: Move gtk+ to inputs.
[synopsis]: Update.
[description]: Update.
---
gnu/packages/pwmt.scm | 72 +++++++++++++++++++++++++------------------
1 file changed, 42 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 977ba39ccc..900826365f 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -40,6 +40,7 @@
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages web)
#:use-module (gnu packages xorg)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
@@ -61,37 +62,48 @@
(base32 "0cmjdismdsx9a5l7zx54zkd33mgg3mx4ckpvc7aap3x6a1ddmz2i"))))
(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 " &")))))))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("check" ,check)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-for-tests)))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs `(("gtk+" ,gtk+)))
- (synopsis "Library for minimalistic gtk+3 user interfaces")
+ `(#:glib-or-gtk? #t ; To compile schemas
+ #:configure-flags
+ (list
+ "-Dnotify=enabled") ; For notification support
+ #: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
+ ("doxygen" ,doxygen) ; For docs
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("pkg-config" ,pkg-config)
+ ("xorg-server" ,xorg-server-for-tests))) ; For tests
+ (inputs
+ `(("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; For configuration dumping support
+ ("libnotify" ,libnotify) ; For notification support
+ ("pango" ,pango)))
+ (synopsis "User interface library")
(description "Girara is a library that implements a user interface that
-focuses on simplicity and minimalism. Currently based on GTK+, a
-cross-platform widget toolkit, it provides an interface that focuses on three
-main components: a so-called view widget that represents the actual
-application, an input bar that is used to execute commands of the
-application and the status bar which provides the user with current
-information.")
+focuses on simplicity and minimalism. Currently based on GTK+, a cross-platform
+widget toolkit, it provides an interface that focuses on three main components:
+A so-called view widget that represents the actual application, an input bar
+that is used to execute commands of the application and the status bar which
+provides the user with current information.")
(home-page "https://pwmt.org/projects/girara/")
(license license:zlib)))
--
2.26.2
[-- Attachment #12: 0011-gnu-zathura-Rearrange-elements-of-package-definition.patch --]
[-- Type: application/octet-stream, Size: 3372 bytes --]
From d1d9a58d8ee36cbd2fe1a9bb46db8b6af0aa4e54 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 22:04:13 -0400
Subject: [PATCH 11/22] gnu: zathura: Rearrange elements of package definition.
* gnu/packages/pwmt.scm (zathura): Reorder fields.
---
gnu/packages/pwmt.scm | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 900826365f..1e01d00965 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -119,6 +119,24 @@ provides the user with current information.")
(sha256
(base32
"0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c"))))
+ (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 " &")))))))))
(native-inputs `(("pkg-config" ,pkg-config)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
@@ -140,29 +158,11 @@ provides the user with current information.")
(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.")
+ (home-page "https://pwmt.org/projects/zathura/")
(license license:zlib)))
(define-public zathura-ps
--
2.26.2
[-- Attachment #13: 0012-gnu-zathura-Update-package-definition.patch --]
[-- Type: application/octet-stream, Size: 6742 bytes --]
From c2e8a22d52410806502ca533825da90aef2ed83c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 22:21:25 -0400
Subject: [PATCH 12/22] gnu: zathura: Update package definition.
* gnu/packages/pwmt.scm (zathura): Make changes to reflect particulars
of recent source code.
[arguments]: Add glib-or-gtk option.
[native-inputs]: Add desktop-fileutils, doxygen, python-breathe and
python-sphinx-rtd-theme.
[inputs]: Add appstream-glib, file, glib, json-c, gtk+, libnotify and
libseccomp.
[propagated-inputs]: Move cairo and girara to inputs.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 111 ++++++++++++++++++++++++------------------
1 file changed, 63 insertions(+), 48 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 1e01d00965..f68baac083 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -28,6 +28,8 @@
#: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)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
@@ -35,6 +37,7 @@
#: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)
#:use-module (gnu packages sphinx)
@@ -111,57 +114,69 @@ provides the user with current information.")
(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"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura/download/zathura-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c"))))
(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 " &")))))))))
- (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)))
+ `(#: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
+ ("girara" ,girara)
+ ("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
(native-search-paths
- (list (search-path-specification
- (variable "ZATHURA_PLUGINS_PATH")
- (files '("lib/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.")
+ (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
[-- Attachment #14: 0013-gnu-zathura-ps-Rearrange-elements-of-package-definit.patch --]
[-- Type: application/octet-stream, Size: 1652 bytes --]
From 02e883348a304f0fd740bfb926f83ee05041eab3 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 22:33:05 -0400
Subject: [PATCH 13/22] gnu: zathura-ps: Rearrange elements of package
definition.
* gnu/packages/pwmt.scm (zathura-ps): Reorder fields.
---
gnu/packages/pwmt.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index f68baac083..45481ad53c 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -192,9 +192,6 @@ DjVu and ComicBook) via plugins.")
(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
@@ -209,10 +206,13 @@ DjVu and ComicBook) via plugins.")
(string-append key
"'" (assoc-ref outputs "out") "/lib/zathura'\n")))
#t)))))
- (home-page "https://pwmt.org/projects/zathura-ps/")
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs `(("libspectre" ,libspectre)
+ ("zathura" ,zathura)))
(synopsis "PS support for zathura (libspectre backend)")
(description "The zathura-ps plugin adds PS support to zathura
using libspectre.")
+ (home-page "https://pwmt.org/projects/zathura-ps/")
(license license:zlib)))
(define-public zathura-pdf-poppler
--
2.26.2
[-- Attachment #15: 0014-gnu-zathura-ps-Update-package-definition.patch --]
[-- Type: application/octet-stream, Size: 3230 bytes --]
From b3575ab6e69283d8e3eb2df9b2c4a41733d3b506 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 22:40:42 -0400
Subject: [PATCH 14/22] gnu: zathura-ps: Update package definition.
* gnu/packages/pwmt.scm (zathura-ps): Make changes to reflect particulars
of recent source code.
[inputs]: Add cairo, girara, glib, gtk+, json-c and libnotify.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 45481ad53c..2550de0a33 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -184,34 +184,43 @@ DjVu and ComicBook) via plugins.")
(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"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-ps/download/zathura-ps-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; package does not contain tests
+ `(#:tests? #f ; No target
#: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.
+ ;; 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 `(("pkg-config" ,pkg-config)))
- (inputs `(("libspectre" ,libspectre)
- ("zathura" ,zathura)))
- (synopsis "PS support for zathura (libspectre backend)")
- (description "The zathura-ps plugin adds PS support to zathura
-using libspectre.")
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("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
[-- Attachment #16: 0015-gnu-zathura-pdf-poppler-Rearrange-elements-of-packag.patch --]
[-- Type: application/octet-stream, Size: 1699 bytes --]
From 4d53ded8ab8191bd7efc72f72de2a3b2d11fc45d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 22:45:49 -0400
Subject: [PATCH 15/22] gnu: zathura-pdf-poppler: Rearrange elements of package
definition.
* gnu/packages/pwmt.scm (zathura-pdf-poppler): Reorder fields.
---
gnu/packages/pwmt.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 2550de0a33..67929fae89 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -236,10 +236,6 @@ using the libspectre library.")
(sha256
(base32
"1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs
- `(("poppler" ,poppler)
- ("zathura" ,zathura)))
(build-system meson-build-system)
(arguments
`(#:tests? #f ; package does not include tests
@@ -254,10 +250,14 @@ using the libspectre library.")
(string-append key
"'" (assoc-ref outputs "out") "/lib/zathura'\n")))
#t)))))
- (home-page "https://pwmt.org/projects/zathura-pdf-poppler/")
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("poppler" ,poppler)
+ ("zathura" ,zathura)))
(synopsis "PDF support for zathura (poppler backend)")
(description "The zathura-pdf-poppler plugin adds PDF support to zathura
by using the poppler rendering engine.")
+ (home-page "https://pwmt.org/projects/zathura-pdf-poppler/")
(license license:zlib)))
(define-public zathura-pdf-mupdf
--
2.26.2
[-- Attachment #17: 0016-gnu-zathura-pdf-poppler-Update-package-definition.patch --]
[-- Type: application/octet-stream, Size: 3225 bytes --]
From 997a068a5a4e5374897359b0b6419d4f2508173b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 22:54:25 -0400
Subject: [PATCH 16/22] gnu: zathura-pdf-poppler: Update package definition.
* gnu/packages/pwmt.scm (zathura-pdf-poppler): Make changes to reflect
particulars of recent source code.
[arguments]: Remove phase patch-plugin-directory.
[arguments]: Add plugindir configure-flag.
[inputs]: Add cairo, girara and glib.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 48 +++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 67929fae89..4a729d15ca 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -228,35 +228,33 @@ using the libspectre library.")
(package
(name "zathura-pdf-poppler")
(version "0.3.0")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
- version ".tar.xz"))
- (sha256
- (base32
- "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/"
+ "zathura-pdf-poppler-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; package does not include tests
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-plugin-directory
- ;; Something of a regression in 0.2.9: 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)))))
- (native-inputs `(("pkg-config" ,pkg-config)))
+ `(#:tests? #f ; No target
+ #:configure-flags
+ (list
+ (string-append "-Dplugindir="
+ (assoc-ref %outputs "out") "/lib/zathura"))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(inputs
- `(("poppler" ,poppler)
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("poppler" ,poppler)
("zathura" ,zathura)))
- (synopsis "PDF support for zathura (poppler backend)")
- (description "The zathura-pdf-poppler plugin adds PDF support to zathura
-by using the poppler rendering engine.")
+ (synopsis "PDF support (poppler backend) for zathura")
+ (description "The zathura-pdf-poppler plugin adds PDF support to zathura by
+using the poppler rendering library.")
(home-page "https://pwmt.org/projects/zathura-pdf-poppler/")
(license license:zlib)))
--
2.26.2
[-- Attachment #18: 0017-gnu-zathura-pdf-mupdf-Rearrange-elements-of-package-.patch --]
[-- Type: application/octet-stream, Size: 2008 bytes --]
From c6224b10fd3afecfdacb7d3060fb302e5b1fe00a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 23:00:02 -0400
Subject: [PATCH 17/22] gnu: zathura-pdf-mupdf: Rearrange elements of package
definition.
* gnu/packages/pwmt.scm (zathura-pdf-mupdf): Reorder fields.
---
gnu/packages/pwmt.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 4a729d15ca..e88fd4c0c4 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -270,15 +270,6 @@ using the poppler rendering library.")
(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
@@ -296,10 +287,19 @@ using the poppler rendering library.")
(string-append x " mujs = cc.find_library('mujs')\n"))
(("^ libopenjp2")
" libopenjp2, mujs")))))))
- (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/")
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("jbig2dec" ,jbig2dec)
+ ("libjpeg" ,libjpeg)
+ ("mujs" ,mujs)
+ ("mupdf" ,mupdf)
+ ("openjpeg" ,openjpeg)
+ ("openssl" ,openssl)
+ ("zathura" ,zathura)))
(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.")
+ (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/")
(license license:zlib)))
(define-public zathura-djvu
--
2.26.2
[-- Attachment #19: 0018-gnu-zathura-pdf-mupdf-Update-package-definition.patch --]
[-- Type: application/octet-stream, Size: 3581 bytes --]
From 5866a64844f924d9f2ecbcba19e4cd73ffdc0447 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 23:04:34 -0400
Subject: [PATCH 18/22] gnu: zathura-pdf-mupdf: Update package definition.
* gnu/packages/pwmt.scm (zathura-pdf-mupdf): Make changes to reflect
particulars of recent source code.
[inputs]: Add cairo, glib, gtk+, json-c and libnotify. Remove openssl.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 46 +++++++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index e88fd4c0c4..cc5e84759e 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -262,21 +262,23 @@ using the poppler rendering library.")
(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"))))
+ (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"))))
(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")
+ `(#:tests? #f ; No target
+ #: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
@@ -287,18 +289,24 @@ using the poppler rendering library.")
(string-append x " mujs = cc.find_library('mujs')\n"))
(("^ libopenjp2")
" libopenjp2, mujs")))))))
- (native-inputs `(("pkg-config" ,pkg-config)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(inputs
- `(("jbig2dec" ,jbig2dec)
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("jbig2dec" ,jbig2dec)
+ ("json-c" ,json-c) ; To generate cargs for zathura
("libjpeg" ,libjpeg)
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
("mujs" ,mujs)
("mupdf" ,mupdf)
("openjpeg" ,openjpeg)
- ("openssl" ,openssl)
("zathura" ,zathura)))
- (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.")
+ (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
[-- Attachment #20: 0019-gnu-zathura-djvu-Rearrange-elements-of-package-defin.patch --]
[-- Type: application/octet-stream, Size: 1669 bytes --]
From cea6124c9652e373ef816c3987df4aa39b475cee Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 23:07:44 -0400
Subject: [PATCH 19/22] gnu: zathura-djvu: Rearrange elements of package
definition.
* gnu/packages/pwmt.scm (zathura-djvu): Reorder fields.
---
gnu/packages/pwmt.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index cc5e84759e..3bf364c043 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -322,10 +322,6 @@ using the mupdf rendering library.")
(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
@@ -340,10 +336,14 @@ using the mupdf rendering library.")
(string-append key
"'" (assoc-ref outputs "out") "/lib/zathura'\n")))
#t)))))
- (home-page "https://pwmt.org/projects/zathura-djvu/")
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("djvulibre" ,djvulibre)
+ ("zathura" ,zathura)))
(synopsis "DjVu support for zathura (DjVuLibre backend)")
(description "The zathura-djvu plugin adds DjVu support to zathura
using the DjVuLibre library.")
+ (home-page "https://pwmt.org/projects/zathura-djvu/")
(license license:zlib)))
(define-public zathura-cb
--
2.26.2
[-- Attachment #21: 0020-gnu-zathura-djvu-Update-package-definition.patch --]
[-- Type: application/octet-stream, Size: 3174 bytes --]
From 3ffd0acce9c159df27004f2a5b0966c12955a651 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 23:12:46 -0400
Subject: [PATCH 20/22] gnu: zathura-djvu: Update package definition.
* gnu/packages/pwmt.scm (zathura-djvu): Make changes to reflect particulars
of recent package definition.
[arguments]: Remove phase patch-plugin-directory.
[arguments]: Add plugindir configure-flag.
[inputs]: Add cairo, girara, glib, gtk+, json-c and libnotify.
[synopsis]: Updated.
---
gnu/packages/pwmt.scm | 47 ++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 3bf364c043..a1f89d381a 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -314,33 +314,34 @@ using the mupdf rendering library.")
(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"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-djvu/download/"
+ "zathura-djvu-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"))))
(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)))))
- (native-inputs `(("pkg-config" ,pkg-config)))
+ `(#:tests? #f ; No target
+ #:configure-flags
+ (list
+ (string-append "-Dplugindir="
+ (assoc-ref %outputs "out") "/lib/zathura"))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(inputs
- `(("djvulibre" ,djvulibre)
+ `(("cairo" ,cairo)
+ ("djvulibre" ,djvulibre)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
("zathura" ,zathura)))
- (synopsis "DjVu support for zathura (DjVuLibre backend)")
+ (synopsis "DjVu support for zathura")
(description "The zathura-djvu plugin adds DjVu support to zathura
using the DjVuLibre library.")
(home-page "https://pwmt.org/projects/zathura-djvu/")
--
2.26.2
[-- Attachment #22: 0021-gnu-zathura-cb-Rearrange-elements-of-package-definit.patch --]
[-- Type: application/octet-stream, Size: 1681 bytes --]
From fb0523ffccdfb40a5dead02f56177fc2a1357583 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 23:15:57 -0400
Subject: [PATCH 21/22] gnu: zathura-cb: Rearrange elements of package
definition.
* gnu/packages/pwmt.scm (zathura-cb): Reorder fields.
---
gnu/packages/pwmt.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index a1f89d381a..c090deac91 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -359,10 +359,6 @@ using the DjVuLibre library.")
(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
@@ -376,8 +372,12 @@ using the DjVuLibre library.")
(string-append key
"'" (assoc-ref outputs "out") "/lib/zathura'\n")))
#t)))))
- (home-page "https://pwmt.org/projects/zathura-cb/")
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs `(("libarchive" ,libarchive)
+ ("zathura" ,zathura)))
+ (build-system meson-build-system)
(synopsis "Comic book support for zathura (libarchive backend)")
(description "The zathura-cb plugin adds comic book support to zathura
using libarchive.")
+ (home-page "https://pwmt.org/projects/zathura-cb/")
(license license:zlib)))
--
2.26.2
[-- Attachment #23: 0022-gnu-zathura-cb-Update-package-definition.patch --]
[-- Type: application/octet-stream, Size: 3246 bytes --]
From 2edfd4f9caf3d2ceaf9c382b400e422e78f4ed45 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 7 May 2020 23:20:47 -0400
Subject: [PATCH 22/22] gnu: zathura-cb: Update package definition.
* gnu/packages/pwmt.scm (zathura-cb): Make changes to reflect particulars
of recent source code.
[inputs]: Add cairo, girara, glib, gtk+, json-c and libnotify.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 44 +++++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index c090deac91..5a5130924c 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -351,33 +351,41 @@ using the DjVuLibre library.")
(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"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"))))
+ (build-system meson-build-system)
(arguments
- `(#:tests? #f ; package does not contain tests
+ `(#:tests? #f ; No target
#: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.
+ ;; 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 `(("pkg-config" ,pkg-config)))
- (inputs `(("libarchive" ,libarchive)
- ("zathura" ,zathura)))
- (build-system meson-build-system)
- (synopsis "Comic book support for zathura (libarchive backend)")
- (description "The zathura-cb plugin adds comic book support to zathura
-using libarchive.")
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("cairo" ,cairo)
+ ("girara" ,girara)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; To generate cargs for zathura
+ ("libarchive" ,libarchive)
+ ("libnotify" ,libnotify) ; To generate cargs for zathura
+ ("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
^ permalink raw reply related [flat|nested] 17+ messages in thread