GNU logs - #40994, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#40994] Programs With Movie Titles (PWMT)
Resent-From: Raghav Gururajan <raghavgururajan@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 01 May 2020 11:55:01 +0000
Resent-Message-ID: <handler.40994.B.158833408618126 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 40994 <at> debbugs.gnu.org
Date: Fri, 1 May 2020 07:52:53 -0400
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Message-ID: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Received-SPF: pass client-ip=178.21.23.139;
 envelope-from=raghavgururajan@HIDDEN; helo=knopi.disroot.org
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

Hello Guix!

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 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.

Thank you!

Regards,
RG.

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Raghav Gururajan <raghavgururajan@HIDDEN>
Subject: bug#40994: Acknowledgement (Programs With Movie Titles (PWMT))
Message-ID: <handler.40994.B.158833408618126.ack <at> debbugs.gnu.org>
References: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
X-Gnu-PR-Message: ack 40994
X-Gnu-PR-Package: guix-patches
Reply-To: 40994 <at> debbugs.gnu.org
Date: Fri, 01 May 2020 11:55:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 40994 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
40994: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D40994
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:

Subject: [bug#40994] 1-girara-v1
References: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
In-Reply-To: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
Resent-From: Raghav Gururajan <raghavgururajan@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 01 May 2020 13:51:01 +0000
Resent-Message-ID: <handler.40994.B40994.158834103030304 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 40994 <at> debbugs.gnu.org
Date: Fri, 1 May 2020 09:49:48 -0400
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Message-ID: <20200501094948.56033139.raghavgururajan@HIDDEN>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="MP_/7Bm+N6VVEd6V7LsgrN1mMt8"
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

--MP_/7Bm+N6VVEd6V7LsgrN1mMt8
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


--MP_/7Bm+N6VVEd6V7LsgrN1mMt8
Content-Type: text/x-patch
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=1-giara-v1.patch

=46rom 4f73a7fbd82838e99680e8043b78e9d7009284eb Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
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 routin=
es, Pango includes
 and routines to assist in editing internationalized text.")
     (license license:lgpl2.1+)))
=20
-(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/Xv=
fb "
-                                                      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 th=
ree
-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 =C2=A9 2015 Paul van der Walt <paul@HIDDEN>
+;;; Copyright =C2=A9 2016 ng0 <ng0@HIDDEN>
+;;; Copyright =C2=A9 2017 2018 Marius Bakke <mbakke@HIDDEN>
+;;; Copyright =C2=A9 2017 Kei Kebreau <kei@HIDDEN>
+;;; Copyright =C2=A9 2018 2019 2020 Tobias Geerinckx-Rice <me@HIDDEN>
+;;; Copyright =C2=A9 2020 Raghav Gururajan <raghavgururajan@HIDDEN>
+;;;
+;;; 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=3Denabled")             ; 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 th=
ree
+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)))
--=20
2.26.2


--MP_/7Bm+N6VVEd6V7LsgrN1mMt8--

Message sent to guix-patches@HIDDEN:

Subject: [bug#40994] 2-zathura-v1
References: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
In-Reply-To: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
Resent-From: Raghav Gururajan <raghavgururajan@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 01 May 2020 13:52:02 +0000
Resent-Message-ID: <handler.40994.B40994.158834107630417 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 40994 <at> debbugs.gnu.org
Date: Fri, 1 May 2020 09:50:49 -0400
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Message-ID: <20200501095049.114a6f3c.raghavgururajan@HIDDEN>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="MP_/nfb=z4Dss2x/40Km=0KpgPb"
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

--MP_/nfb=z4Dss2x/40Km=0KpgPb
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


--MP_/nfb=z4Dss2x/40Km=0KpgPb
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=2-zathura-v1.patch

From c8951b36cd04df279fdeaabdd29b87929fbb6fbc Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
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


--MP_/nfb=z4Dss2x/40Km=0KpgPb--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#40994] 3-zathura-ps-v1
References: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
In-Reply-To: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
Resent-From: Raghav Gururajan <raghavgururajan@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 01 May 2020 17:50:02 +0000
Resent-Message-ID: <handler.40994.B40994.158835535231802 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40994
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: 40994 <at> debbugs.gnu.org
Received: via spool by 40994-submit <at> debbugs.gnu.org id=B40994.158835535231802
          (code B ref 40994); Fri, 01 May 2020 17:50:02 +0000
Received: (at 40994) by debbugs.gnu.org; 1 May 2020 17:49:12 +0000
Received: from localhost ([127.0.0.1]:50601 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jUZmi-0008Gr-08
	for submit <at> debbugs.gnu.org; Fri, 01 May 2020 13:49:12 -0400
Received: from knopi.disroot.org ([178.21.23.139]:34612)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1jUZmf-0008Gh-E6
 for 40994 <at> debbugs.gnu.org; Fri, 01 May 2020 13:49:10 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 90354217EB
 for <40994 <at> debbugs.gnu.org>; Fri,  1 May 2020 19:49:07 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id sBqhPD54hOV8 for <40994 <at> debbugs.gnu.org>;
 Fri,  1 May 2020 19:49:05 +0200 (CEST)
Date: Fri, 1 May 2020 13:48:42 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1588355345; bh=5Y2NGWhoHu0E64Zp5urLnPoJhYHYHOM+1pHnwrSOUhk=;
 h=Date:From:To:Subject;
 b=Bg994zRwG+g77j2Gj8bwxv/wjSDkrQiySPXW7M5UY54VfpRws0yQD70LfzEovgN2B
 kUfLhSAmHgedEI3lIySGRe83wR1nlEhUAbSroMm66Yx4KEcb3dt44XTp54vGPwEVHk
 MlT3cQc/r0Wqo/OKfsgkIwICiue48/kex/iaDiAb2uRPruJnrE/EYVoC/JeZBE+R3v
 MbhUIQuheuX620no1VyrrGiR36ox66PrTY5ZtzZfobk7tnOvVoYADkcVvi+h5Y703+
 +1GNJ2w+TrJ+PWgxzEMzRoV8n/BaC7UfUP4IFajQczdgunp5Xg/KnP2nAI5BHej9fl
 5thBtkxevDPWw==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Message-ID: <20200501134842.5819e428.raghavgururajan@HIDDEN>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="MP_/EZLtsQf4.gprw1ytyUXV3.K"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--MP_/EZLtsQf4.gprw1ytyUXV3.K
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


--MP_/EZLtsQf4.gprw1ytyUXV3.K
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=3-zathura-ps-v1.patch

From f399f61f261bbd3ab828ca27fc1d31f0e49d0d45 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
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


--MP_/EZLtsQf4.gprw1ytyUXV3.K--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#40994] 4-zathura-pdf-poppler-v1
References: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
In-Reply-To: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
Resent-From: Raghav Gururajan <raghavgururajan@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 02 May 2020 08:19:02 +0000
Resent-Message-ID: <handler.40994.B40994.15884075054530 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40994
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: 40994 <at> debbugs.gnu.org
Received: via spool by 40994-submit <at> debbugs.gnu.org id=B40994.15884075054530
          (code B ref 40994); Sat, 02 May 2020 08:19:02 +0000
Received: (at 40994) by debbugs.gnu.org; 2 May 2020 08:18:25 +0000
Received: from localhost ([127.0.0.1]:51161 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jUnLs-0001B0-O1
	for submit <at> debbugs.gnu.org; Sat, 02 May 2020 04:18:25 -0400
Received: from knopi.disroot.org ([178.21.23.139]:53908)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1jUnLp-0001Ao-HQ
 for 40994 <at> debbugs.gnu.org; Sat, 02 May 2020 04:18:24 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 1940325FF8
 for <40994 <at> debbugs.gnu.org>; Sat,  2 May 2020 10:18:20 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id FqwUJSO05W33 for <40994 <at> debbugs.gnu.org>;
 Sat,  2 May 2020 10:18:18 +0200 (CEST)
Date: Sat, 2 May 2020 04:17:55 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1588407498; bh=Opez37oeEaohp5FJbFHJjskwrgmpryvadP4N/ekMfhM=;
 h=Date:From:To:Subject;
 b=XtSo5SniFaq5EBWIUJQ8aelcAGxlJdp7HlHdX1QSebwfmMBUNPFscRZpczlI0TAKp
 BQTTexvacouOAAR2Y68Rt9XgAJz1h4m3+jlA/Sy4tSzCZZz/6ejrAgfmtsGHXwBC/k
 P7UduDAO6sc67QctW/fBPQqhnRfxs7SeOeMEhHhs/MK8zLBY619TY8S4vV/43/Hann
 7FfVWay790bEU3ii/c+PnVpk8hVSX5fekLSqseapmJjG3AGc78gxjU8/o0R2jHub6Q
 GEyc3ZtR9U5/JGfENZNx8beJWqrTV3qtOAge9oUAG+A2UTWvKEpJTwZ3KsjfU0PuIN
 kxAVOmQ5NvLbA==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Message-ID: <20200502041755.7e26f2a1.raghavgururajan@HIDDEN>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="MP_/KuFC_x1BIYVKceD7H.sDUd="
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--MP_/KuFC_x1BIYVKceD7H.sDUd=
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


--MP_/KuFC_x1BIYVKceD7H.sDUd=
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=4-zathura-pdf-poppler-v1.patch

From e857c3eb891831dd3916e2103652416f5fabb2ef Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
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


--MP_/KuFC_x1BIYVKceD7H.sDUd=--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#40994] 5-zathura-pdf-mupdf-v1
References: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
In-Reply-To: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
Resent-From: Raghav Gururajan <raghavgururajan@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 02 May 2020 08:51:02 +0000
Resent-Message-ID: <handler.40994.B40994.15884094437686 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40994
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: 40994 <at> debbugs.gnu.org
Received: via spool by 40994-submit <at> debbugs.gnu.org id=B40994.15884094437686
          (code B ref 40994); Sat, 02 May 2020 08:51:02 +0000
Received: (at 40994) by debbugs.gnu.org; 2 May 2020 08:50:43 +0000
Received: from localhost ([127.0.0.1]:51197 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jUnr8-0001zu-LM
	for submit <at> debbugs.gnu.org; Sat, 02 May 2020 04:50:42 -0400
Received: from knopi.disroot.org ([178.21.23.139]:58780)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1jUnr6-0001zl-Ia
 for 40994 <at> debbugs.gnu.org; Sat, 02 May 2020 04:50:42 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id F257C28458
 for <40994 <at> debbugs.gnu.org>; Sat,  2 May 2020 10:50:38 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id vv0HAXuXHDtj for <40994 <at> debbugs.gnu.org>;
 Sat,  2 May 2020 10:50:37 +0200 (CEST)
Date: Sat, 2 May 2020 04:50:17 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1588409437; bh=pJ0LDIlL7wATr/PnvT/5WpnJtdOruU18vpKh4ULaVew=;
 h=Date:From:To:Subject;
 b=VPx922HqAj4COd8RWU6+OOZp0/0MeMcQCLsHfI42M1qITYm4HHMadex8j+titq9+6
 XC8sGTuZ4kl2GZE4/oHNPfRytZ0TBezqnMq6qc/3toh7ib9biwXsjUYVd+DWEUQ7mx
 n6IfIrjU8nXy9QEwwxdM3zype2Umo0fbdzeDdp71eoTs73UCkcDvrdrEN7a18NVFHP
 D9HuX5VrVwT2cqTorZR0HKYRRCyz4wpmhpFRLcjNAo5cpNjET2sEV7CXXE6LBwFsUs
 6rATZwfshQLBdfoaMSLMflPaK9S2DqzGus3Z/hBipjcgRLLGejEkOn9HMUfvKuyF31
 sblJ6nyM5uiAQ==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Message-ID: <20200502045017.2b8d2530.raghavgururajan@HIDDEN>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="MP_/4CJ1pubE0YsevXn.15z0BFu"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--MP_/4CJ1pubE0YsevXn.15z0BFu
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


--MP_/4CJ1pubE0YsevXn.15z0BFu
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=5-zathura-pdf-mupdf-v1.patch

From aa93196383df77cac84d4246cbd88f64685d110b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
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


--MP_/4CJ1pubE0YsevXn.15z0BFu--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#40994] 6-zathura-djvu-v1
References: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
In-Reply-To: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
Resent-From: Raghav Gururajan <raghavgururajan@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 02 May 2020 09:17:01 +0000
Resent-Message-ID: <handler.40994.B40994.158841099210113 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40994
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: 40994 <at> debbugs.gnu.org
Received: via spool by 40994-submit <at> debbugs.gnu.org id=B40994.158841099210113
          (code B ref 40994); Sat, 02 May 2020 09:17:01 +0000
Received: (at 40994) by debbugs.gnu.org; 2 May 2020 09:16:32 +0000
Received: from localhost ([127.0.0.1]:51235 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jUoG7-0002d3-Uj
	for submit <at> debbugs.gnu.org; Sat, 02 May 2020 05:16:32 -0400
Received: from knopi.disroot.org ([178.21.23.139]:58616)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1jUoG6-0002ct-JG
 for 40994 <at> debbugs.gnu.org; Sat, 02 May 2020 05:16:31 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 1ABE927385
 for <40994 <at> debbugs.gnu.org>; Sat,  2 May 2020 11:16:29 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id EC9ad35dAucU for <40994 <at> debbugs.gnu.org>;
 Sat,  2 May 2020 11:16:27 +0200 (CEST)
Date: Sat, 2 May 2020 05:16:07 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1588410987; bh=N7l8tWWcwbpsBT66czTXdLIDorDw0wd9EuanKxfPSgQ=;
 h=Date:From:To:Subject;
 b=bPixExDW7/a42fSbyL5udS9dYBdyxHOcWk3FZ6lhjnnIhDUNCitTVAndn8nRTy+oN
 4U91BastsQkIpoLWalG5JM1Wy+fq57BZjqEfC4f6OLQ6tPGBOxeSF2f2ZRyrohMXXn
 xCPq23f5S96zU9wD/V2z4At8gePf+FGdTDSh7/ksgxyxUoGdZAqC+vEcAX7BjgQFK/
 oikQOF7lpTX4nC4Tlc/DU3pWnnY+gL3yFWeZzWgNvMhD6+kK2iPqXxk4gZ3EEL+T+n
 htmceRfNzO9menov8w5jv4Dz5+Wwz76jv5Fdijr7poTOBEqGrG/Z0kOtrt2tXFLu2/
 gs28L7f8pzQ/w==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Message-ID: <20200502051607.31a204b3.raghavgururajan@HIDDEN>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="MP_/ejUUs/H1_b6jS9GAbbraFOF"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--MP_/ejUUs/H1_b6jS9GAbbraFOF
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


--MP_/ejUUs/H1_b6jS9GAbbraFOF
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=6-zathura-djvu-v1.patch

From e2dde54a224777bcb2b050cb828db1a9fe6da532 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
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


--MP_/ejUUs/H1_b6jS9GAbbraFOF--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#40994] 7-zathura-cb-v1
References: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
In-Reply-To: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
Resent-From: Raghav Gururajan <raghavgururajan@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 02 May 2020 10:00:02 +0000
Resent-Message-ID: <handler.40994.B40994.158841356714156 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40994
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: 40994 <at> debbugs.gnu.org
Received: via spool by 40994-submit <at> debbugs.gnu.org id=B40994.158841356714156
          (code B ref 40994); Sat, 02 May 2020 10:00:02 +0000
Received: (at 40994) by debbugs.gnu.org; 2 May 2020 09:59:27 +0000
Received: from localhost ([127.0.0.1]:51295 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jUova-0003g4-2A
	for submit <at> debbugs.gnu.org; Sat, 02 May 2020 05:59:27 -0400
Received: from knopi.disroot.org ([178.21.23.139]:40178)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <raghavgururajan@HIDDEN>) id 1jUovY-0003fv-3O
 for 40994 <at> debbugs.gnu.org; Sat, 02 May 2020 05:59:21 -0400
Received: from localhost (localhost [127.0.0.1])
 by disroot.org (Postfix) with ESMTP id 686292CC85
 for <40994 <at> debbugs.gnu.org>; Sat,  2 May 2020 11:59:18 +0200 (CEST)
X-Virus-Scanned: Debian amavisd-new at disroot.org
Received: from knopi.disroot.org ([127.0.0.1])
 by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id n-0UcsAP2RkA for <40994 <at> debbugs.gnu.org>;
 Sat,  2 May 2020 11:59:16 +0200 (CEST)
Date: Sat, 2 May 2020 05:58:54 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
 t=1588413555; bh=4UXQyff/yaYKVH60wBjzYjeS3LRlxkPF4w7BtApJjfc=;
 h=Date:From:To:Subject;
 b=bCrsQWv9MNiBxp2ZAWthhDtOjgIK5HRIDbUXI0T6IDFFcErmqkBKK+weBvgqr7xt+
 9qnfdrr5Dc73tdpJ+4rFRVebi+hnTwZhR3Sl89ZNbFqwzb8Fnp0HTdELzfgQ9vNTlh
 s/t7GYZIj13HeCqKSpYu9wWQn61WFZ7iYX1lA7xb7khkIQVJ0XpG662a9KQmcBFBks
 yxGZFMkR35N2wtqlNP7ZCQv6xXr13taRVBI1fWmupGvPjCzpGJPxj4m4RhzpeFemYs
 a/TsLf3vjiGw7TS/o40+MZ9qtB+tmtOoacSiHabV7AKykkOdZiNvQzxDHifRGPC3t8
 6D8Wa3hdjaqEw==
From: Raghav Gururajan <raghavgururajan@HIDDEN>
Message-ID: <20200502055854.2016b98d.raghavgururajan@HIDDEN>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="MP_/77B6Y/sNcb9RuYgaBDgHaok"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--MP_/77B6Y/sNcb9RuYgaBDgHaok
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


--MP_/77B6Y/sNcb9RuYgaBDgHaok
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=7-zathura-cb-v1.patch

From 60c6f623546f09070e0397395cc2b44920d99549 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@HIDDEN>
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


--MP_/77B6Y/sNcb9RuYgaBDgHaok--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#40994] patch#40994 Programs With Movie Titles (PWMT)
References: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
In-Reply-To: <20200501075253.0c2c27d0.raghavgururajan@HIDDEN>
Resent-From: Brice Waegeneire <brice@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 02 May 2020 13:25:01 +0000
Resent-Message-ID: <handler.40994.B40994.15884258669663 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 40994
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: 
To: 40994 <at> debbugs.gnu.org, raghavgururajan@HIDDEN
Received: via spool by 40994-submit <at> debbugs.gnu.org id=B40994.15884258669663
          (code B ref 40994); Sat, 02 May 2020 13:25:01 +0000
Received: (at 40994) by debbugs.gnu.org; 2 May 2020 13:24:26 +0000
Received: from localhost ([127.0.0.1]:51563 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1jUs7p-0002Va-Ln
	for submit <at> debbugs.gnu.org; Sat, 02 May 2020 09:24:26 -0400
Received: from relay8-d.mail.gandi.net ([217.70.183.201]:49395)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <brice@HIDDEN>) id 1jUs7o-0002VH-6f
 for 40994 <at> debbugs.gnu.org; Sat, 02 May 2020 09:24:12 -0400
Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18])
 (Authenticated sender: brice@HIDDEN)
 by relay8-d.mail.gandi.net (Postfix) with ESMTPA id 7885B1BF205;
 Sat,  2 May 2020 13:24:05 +0000 (UTC)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII;
 format=flowed
Content-Transfer-Encoding: 7bit
Date: Sat, 02 May 2020 13:24:05 +0000
From: Brice Waegeneire <brice@HIDDEN>
Message-ID: <76c18088643dcab9d395a0f9760d3a74@HIDDEN>
X-Sender: brice@HIDDEN
User-Agent: Roundcube Webmail/1.3.8
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

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.

Last modified: Sat, 2 May 2020 13:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.