From: Raghav Gururajan <raghavgururajan@disroot.org>
To: Brice Waegeneire <brice@waegenei.re>
Cc: 40994@debbugs.gnu.org
Subject: [bug#40994] patch#40994 Programs With Movie Titles (PWMT)
Date: Sun, 3 May 2020 00:22:40 -0400 [thread overview]
Message-ID: <20200503002240.3c2bf6a3.raghavgururajan@disroot.org> (raw)
In-Reply-To: <20200502120901.36d80711.raghavgururajan@disroot.org>
[-- 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
next prev parent reply other threads:[~2020-05-03 4:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` [bug#40994] 3-zathura-ps-v1 Raghav Gururajan
2020-05-02 8:17 ` [bug#40994] 4-zathura-pdf-poppler-v1 Raghav Gururajan
2020-05-02 8:50 ` [bug#40994] 5-zathura-pdf-mupdf-v1 Raghav Gururajan
2020-05-02 9:16 ` [bug#40994] 6-zathura-djvu-v1 Raghav Gururajan
2020-05-02 9:58 ` [bug#40994] 7-zathura-cb-v1 Raghav Gururajan
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 [this message]
2020-05-06 19:50 ` Marius Bakke
2020-05-08 3:37 ` Raghav Gururajan
2020-05-06 19:29 ` Marius Bakke
2020-05-08 3:28 ` 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200503002240.3c2bf6a3.raghavgururajan@disroot.org \
--to=raghavgururajan@disroot.org \
--cc=40994@debbugs.gnu.org \
--cc=brice@waegenei.re \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).