Package: guix-patches;
Reported by: Andrew Wong <wongandj <at> icloud.com>
Date: Fri, 21 Mar 2025 21:09:02 UTC
Severity: normal
Tags: patch
To reply to this bug, email your comments to 77159 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#77159; Package guix-patches.
(Fri, 21 Mar 2025 21:09:02 GMT) Full text and rfc822 format available.Andrew Wong <wongandj <at> icloud.com>:guix-patches <at> gnu.org.
(Fri, 21 Mar 2025 21:09:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Andrew Wong <wongandj <at> icloud.com> To: guix-patches <at> gnu.org Cc: Andrew Wong <wongandj <at> icloud.com> Subject: [PATCH 0/7] Update Zathura and plugins Date: Fri, 21 Mar 2025 17:08:18 -0400
This patch series updates Girara, Zathura, and its plugins. Andrew Wong (7): gnu: girara: Update to 0.4.5. gnu: zathura: Update to 0.5.11. gnu: zathura-pdf-poppler: Update to 0.3.3. gnu: zathura-pdf-mupdf: Update to 0.4.4. gnu: zathura-djvu: Update to 0.2.10. gnu: zathura-ps: Update to 0.2.8. gnu: zathura-cb: Update to 0.1.11. gnu/packages/gtk.scm | 55 ++++------ gnu/packages/pdf.scm | 248 ++++++++++++++++--------------------------- 2 files changed, 112 insertions(+), 191 deletions(-) base-commit: c10ca0d37a640000d09e42766123088041431e6c -- 2.48.1
liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, vivien <at> planete-kraus.eu, guix-patches <at> gnu.org:bug#77159; Package guix-patches.
(Fri, 21 Mar 2025 21:13:01 GMT) Full text and rfc822 format available.Message #8 received at 77159 <at> debbugs.gnu.org (full text, mbox):
From: Andrew Wong <wongandj <at> icloud.com> To: 77159 <at> debbugs.gnu.org Cc: Andrew Wong <wongandj <at> icloud.com> Subject: [PATCH 1/7] gnu: girara: Update to 0.4.5. Date: Fri, 21 Mar 2025 17:11:53 -0400
* gnu/packages/gtk.scm (girara): Update to 0.4.5.
[arguments] <#:phases>: Refactor.
[source]: Switch to url-fetch.
Change-Id: I8e7b512d7f398540855ac00813d71eba59044bb4
---
gnu/packages/gtk.scm | 55 ++++++++++++++++++--------------------------
1 file changed, 22 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 846103ff9e..ef2ec7ed84 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2261,45 +2261,34 @@ (define-public perl-pango
(define-public girara
;; TODO: Move propagated inputs to inputs after core-updates is merged (as
;; of 2024-03)
+ ;; N: Attempted, doing so causes failure to locate girara-gtk3 in packages
+ ;; that depend on it (as of 2025-03)
(package
(name "girara")
- (version "0.4.3")
+ (version "0.4.5")
(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 "0cbcs3810frgdmal5ia9pf3rk3k5h4xyzw1d2ia3rcg4nms5gcpx"))))
+ (base32 "14fspmblgqcc67dsn4lxc45pxbzsky3jnmrna16qb5i7z29pjzvb"))))
(arguments
- (list
- #: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
- (list pkg-config
- check
- gettext-minimal
- `(,glib "bin")
- xorg-server-for-tests))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs (list gtk+ json-glib))
+ (list #:phases #~(modify-phases %standard-phases
+ (add-before 'check 'start-xserver-for-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "DISPLAY" ":1")
+ ;; 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")
+ ((compose zero? system)
+ (string-append (assoc-ref inputs "xorg-server")
+ "/bin/Xvfb :1 &")))))))
+ (native-inputs (list pkg-config gettext-minimal `(,glib "bin") ; build
+ check xorg-server-for-tests)) ; test
+ (propagated-inputs (list gtk+ json-glib));See girara.pc 'Requires.private'
(build-system meson-build-system)
(home-page "https://pwmt.org/projects/girara/")
(synopsis "Library for minimalistic gtk+3 user interfaces")
--
2.48.1
guix-patches <at> gnu.org:bug#77159; Package guix-patches.
(Fri, 21 Mar 2025 21:13:02 GMT) Full text and rfc822 format available.Message #11 received at 77159 <at> debbugs.gnu.org (full text, mbox):
From: Andrew Wong <wongandj <at> icloud.com> To: 77159 <at> debbugs.gnu.org Cc: Andrew Wong <wongandj <at> icloud.com> Subject: [PATCH 2/7] gnu: zathura: Update to 0.5.11. Date: Fri, 21 Mar 2025 17:11:54 -0400
* gnu/packages/pdf.scm (zathura): Update to 0.5.11.
[arguments] <#:phases>: Refactor.
Change-Id: I343c46cb3787f19b5c6dfa531ced01d86b957883
---
gnu/packages/pdf.scm | 69 ++++++++++++++++----------------------------
1 file changed, 25 insertions(+), 44 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 23348e49d5..ce23c8bf7a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -693,56 +693,37 @@ (define-public zathura-pdf-poppler
(define-public zathura
(package
(name "zathura")
- (version "0.5.6")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura/download/zathura-"
- version ".tar.xz"))
- (sha256
- (base32
- "1nhhdww8z6i2cmj7n6qjgyh49dy4jf0xq4j13djpvrfchxgf6y5l"))))
+ (version "0.5.11")
+ (source
+ (origin (method url-fetch)
+ (uri (string-append "https://pwmt.org/projects/zathura"
+ "/download/zathura-" version ".tar.xz"))
+ (sha256
+ (base32 "0g5ms7rna8zkp34d5p461iwlpgkv2a0lm4rfxzxbh3xgk2cqlial"))))
(build-system meson-build-system)
(arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'check 'start-xserver
- ;; Tests require a running X server.
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((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
- (search-input-file inputs "/bin/Xvfb")
- " " display " &")))))))))
- (native-inputs
- (list pkg-config
- gettext-minimal
- (list glib "bin")
-
- ;; For building documentation.
- python-sphinx
-
- ;; For building icons.
- (librsvg-for-system)
-
- ;; For tests.
- check
- xorg-server-for-tests))
+ (list #:phases #~(modify-phases %standard-phases
+ (add-before 'check 'start-xserver-for-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "DISPLAY" ":1")
+ ;; 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")
+ ((compose zero? system)
+ (string-append (assoc-ref inputs "xorg-server")
+ "/bin/Xvfb :1 &")))))))
+ (native-inputs (list pkg-config gettext-minimal (list glib "bin")
+ python-sphinx ; For building documentation.
+ (librsvg-for-system) ; For building icons.
+ check xorg-server-for-tests)) ; For tests.
(inputs (list sqlite))
;; Listed in 'Requires.private' of 'zathura.pc'.
(propagated-inputs (list cairo girara))
(native-search-paths
- (list (search-path-specification
- (variable "ZATHURA_PLUGINS_PATH")
- (files '("lib/zathura")))))
+ (list (search-path-specification (variable "ZATHURA_PLUGINS_PATH")
+ (files '("lib/zathura")))))
(home-page "https://pwmt.org/projects/zathura/")
(synopsis "Lightweight keyboard-driven PDF viewer")
(description "Zathura is a customizable document viewer. It provides a
--
2.48.1
guix-patches <at> gnu.org:bug#77159; Package guix-patches.
(Fri, 21 Mar 2025 21:13:02 GMT) Full text and rfc822 format available.Message #14 received at 77159 <at> debbugs.gnu.org (full text, mbox):
From: Andrew Wong <wongandj <at> icloud.com> To: 77159 <at> debbugs.gnu.org Cc: Andrew Wong <wongandj <at> icloud.com> Subject: [PATCH 3/7] gnu: zathura-pdf-poppler: Update to 0.3.3. Date: Fri, 21 Mar 2025 17:11:55 -0400
* gnu/packages/pdf.scm (zathura-pdf-poppler): Update to 0.3.3.
Change-Id: Ie0a9f87617ebb79953a867abf35823f19be4e223
---
gnu/packages/pdf.scm | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index ce23c8bf7a..122ab4280a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -667,18 +667,16 @@ (define-public zathura-pdf-mupdf
(define-public zathura-pdf-poppler
(package
(name "zathura-pdf-poppler")
- (version "0.3.2")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-"
- version ".tar.xz"))
- (sha256
- (base32
- "049h8m9swxni7ar6fsbm0hb3fg4ffmjc3m6vyg78ilfi3kayxavi"))))
+ (version "0.3.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://pwmt.org/projects/zathura-pdf-poppler"
+ "/download/zathura-pdf-poppler-" version ".tar.xz"))
+ (sha256
+ (base32 "0da9lfdhzy8g5irjpxx97d7bl9dam4pc04sffcbdxmbg8ksg44n8"))))
(native-inputs (list pkg-config))
- (inputs
- (list poppler zathura))
+ (inputs (list poppler zathura))
(build-system meson-build-system)
(arguments
(list #:tests? #f ; package does not include tests
--
2.48.1
guix-patches <at> gnu.org:bug#77159; Package guix-patches.
(Fri, 21 Mar 2025 21:13:03 GMT) Full text and rfc822 format available.Message #17 received at 77159 <at> debbugs.gnu.org (full text, mbox):
From: Andrew Wong <wongandj <at> icloud.com> To: 77159 <at> debbugs.gnu.org Cc: Andrew Wong <wongandj <at> icloud.com> Subject: [PATCH 4/7] gnu: zathura-pdf-mupdf: Update to 0.4.4. Date: Fri, 21 Mar 2025 17:11:56 -0400
* gnu/packages/pdf.scm (zathura-pdf-mupdf): Update to 0.4.4.
[arguments] <#:phases>: Remove unneeded 'fix-mupdf-detection phase
Change-Id: I175d326c05eb71ed27fee38eae2294f98701a845
---
gnu/packages/pdf.scm | 63 ++++++++++++++++++--------------------------
1 file changed, 25 insertions(+), 38 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 122ab4280a..9335dc669b 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -617,47 +617,34 @@ (define-public zathura-djvu
(define-public zathura-pdf-mupdf
(package
(name "zathura-pdf-mupdf")
- (version "0.4.3")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-pdf-mupdf"
- "/download/zathura-pdf-mupdf-" version ".tar.xz"))
- (sha256
- (base32
- "0xk7fxgx5fiafczwqlpb3hkfmfhhq2ljabxvi272m9vy13p89kwc"))))
+ (version "0.4.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://pwmt.org/projects/zathura-pdf-mupdf"
+ "/download/zathura-pdf-mupdf-" version ".tar.xz"))
+ (sha256
+ (base32 "1z7ln6nmcy5gvy83ixcg08y34slngmpa859kwqpkmgna054n4981"))))
(native-inputs (list pkg-config))
- (inputs
- (list gumbo-parser
- jbig2dec
- libjpeg-turbo
- mujs
- mupdf
- openjpeg
- openssl
- tesseract-ocr
- zathura))
+ (inputs (list gumbo-parser
+ jbig2dec
+ libjpeg-turbo
+ mujs
+ mupdf
+ openjpeg
+ openssl
+ tesseract-ocr
+ 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"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'remove-libmupdfthird.a-requirement
- (lambda _
- ;; Ignore a missing (apparently superfluous) static library.
- (substitute* "meson.build"
- (("mupdfthird = .*")
- "")
- ((", mupdfthird")
- ""))))
- (add-after 'unpack 'fix-mupdf-detection
- (lambda _
- (substitute* "meson.build"
- (("dependency\\('mupdf', required: false\\)")
- "cc.find_library('mupdf')")))))))
+ (list #:tests? #f ; package does not contain tests
+ #:configure-flags
+ #~(list (string-append "-Dplugindir=" #$output "/lib/zathura"))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-unneeded-mupdfthird-req
+ (lambda _ (substitute* "meson.build"
+ (("mupdfthird = .*") "")
+ ((", mupdfthird") "")))))))
(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
--
2.48.1
guix-patches <at> gnu.org:bug#77159; Package guix-patches.
(Fri, 21 Mar 2025 21:13:03 GMT) Full text and rfc822 format available.Message #20 received at 77159 <at> debbugs.gnu.org (full text, mbox):
From: Andrew Wong <wongandj <at> icloud.com> To: 77159 <at> debbugs.gnu.org Cc: Andrew Wong <wongandj <at> icloud.com> Subject: [PATCH 5/7] gnu: zathura-djvu: Update to 0.2.10. Date: Fri, 21 Mar 2025 17:11:57 -0400
* gnu/packages/pdf.scm (zathura-djvu): Update to 0.2.10.
[arguments] <#:phases>: Remove unneeded 'patch-plugin-directory phase
Change-Id: I4be25dcafe02cbd94bae764054d1241d07a5a203
---
gnu/packages/pdf.scm | 34 +++++++++++-----------------------
1 file changed, 11 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 9335dc669b..cfdf8d9289 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -582,32 +582,20 @@ (define-public zathura-ps
(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"))))
+ (version "0.2.10")
+ (source
+ (origin (method url-fetch)
+ (uri (string-append "https://pwmt.org/projects/zathura-djvu"
+ "/download/zathura-djvu-" version ".tar.xz"))
+ (sha256
+ (base32 "15cd6ccizaizhk8x25vky7nspgb83129zxxszk9xfv5756cxis9j"))))
(native-inputs (list pkg-config))
- (inputs
- (list djvulibre zathura))
+ (inputs (list djvulibre 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)))))
+ (list #:tests? #f ; package does not contain tests
+ #:configure-flags
+ #~(list (string-append "-Dplugindir=" #$output "/lib/zathura"))))
(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
--
2.48.1
guix-patches <at> gnu.org:bug#77159; Package guix-patches.
(Fri, 21 Mar 2025 21:13:04 GMT) Full text and rfc822 format available.Message #23 received at 77159 <at> debbugs.gnu.org (full text, mbox):
From: Andrew Wong <wongandj <at> icloud.com> To: 77159 <at> debbugs.gnu.org Cc: Andrew Wong <wongandj <at> icloud.com> Subject: [PATCH 6/7] gnu: zathura-ps: Update to 0.2.8. Date: Fri, 21 Mar 2025 17:11:58 -0400
* gnu/packages/pdf.scm (zathura-ps): Update to 0.2.8.
[arguments] <#:phases>: Remove unneeded 'patch-plugin-directory phase
Change-Id: Ib05756b8fb2729c5bf996301440a90832220dd29
---
gnu/packages/pdf.scm | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index cfdf8d9289..4a32473f89 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -548,31 +548,20 @@ (define-public zathura-cb
(define-public zathura-ps
(package
(name "zathura-ps")
- (version "0.2.7")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-ps/download/zathura-ps-"
- version ".tar.xz"))
- (sha256
- (base32
- "0ilf63wxn1yzis9m3qs8mxbk316yxdzwxrrv86wpiygm9hhgk5sq"))))
+ (version "0.2.8")
+ (source
+ (origin (method url-fetch)
+ (uri (string-append "https://pwmt.org/projects/zathura-ps"
+ "/download/zathura-ps-" version ".tar.xz"))
+ (sha256
+ (base32 "0jifjfl3dzwyavwr0g795109d8iy6hc8811q01nqgybpf97mkjh7"))))
(native-inputs (list pkg-config))
(inputs (list libspectre 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.7: 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)))))
+ (list #:tests? #f ; package does not contain tests
+ #:configure-flags
+ #~(list (string-append "-Dplugindir=" #$output "/lib/zathura"))))
(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
--
2.48.1
guix-patches <at> gnu.org:bug#77159; Package guix-patches.
(Fri, 21 Mar 2025 21:13:04 GMT) Full text and rfc822 format available.Message #26 received at 77159 <at> debbugs.gnu.org (full text, mbox):
From: Andrew Wong <wongandj <at> icloud.com> To: 77159 <at> debbugs.gnu.org Cc: Andrew Wong <wongandj <at> icloud.com> Subject: [PATCH 7/7] gnu: zathura-cb: Update to 0.1.11. Date: Fri, 21 Mar 2025 17:11:59 -0400
* gnu/packages/pdf.scm (zathura-cb): Update to 0.1.11.
[arguments] <#:phases>: Remove unneeded 'patch-plugin-directory phase
Change-Id: I549314a02fb4a639577c6e2125a5fddafbb1853e
---
gnu/packages/pdf.scm | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4a32473f89..1cc5fd0e8e 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -514,31 +514,20 @@ (define-public xpdf
(define-public zathura-cb
(package
(name "zathura-cb")
- (version "0.1.10")
- (source (origin
- (method url-fetch)
- (uri
- (string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-"
- version ".tar.xz"))
- (sha256
- (base32
- "1j5v32f9ki35v1jc7a067anhlgqplzrp4fqvznlixfhcm0bwmc49"))))
+ (version "0.1.11")
+ (source
+ (origin (method url-fetch)
+ (uri (string-append "https://pwmt.org/projects/zathura-cb"
+ "/download/zathura-cb-" version ".tar.xz"))
+ (sha256
+ (base32 "0ixx5wbj9x8zrakdrrqdfjcsyhcl73v5cdf4b0raj86w9jjiw82f"))))
(native-inputs (list pkg-config))
(inputs (list libarchive 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.10: 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)))))
+ (list #:tests? #f ; package does not contain tests
+ #:configure-flags
+ #~(list (string-append "-Dplugindir=" #$output "/lib/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
--
2.48.1
guix-patches <at> gnu.org:bug#77159; Package guix-patches.
(Sat, 22 Mar 2025 01:33:01 GMT) Full text and rfc822 format available.Message #29 received at 77159 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Andrew Wong <wongandj <at> icloud.com>, 77159 <at> debbugs.gnu.org Cc: Vivien Kraus <vivien <at> planete-kraus.eu>, Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Subject: Re: [bug#77159] [PATCH 1/7] gnu: girara: Update to 0.4.5. Date: Sat, 22 Mar 2025 02:31:50 +0100
Am Freitag, dem 21.03.2025 um 17:11 -0400 schrieb Andrew Wong: > * gnu/packages/gtk.scm (girara): Update to 0.4.5. > [arguments] <#:phases>: Refactor. > [source]: Switch to url-fetch. > > Change-Id: I8e7b512d7f398540855ac00813d71eba59044bb4 > --- > gnu/packages/gtk.scm | 55 ++++++++++++++++++------------------------ > -- > 1 file changed, 22 insertions(+), 33 deletions(-) > > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm > index 846103ff9e..ef2ec7ed84 100644 > --- a/gnu/packages/gtk.scm > +++ b/gnu/packages/gtk.scm > @@ -2261,45 +2261,34 @@ (define-public perl-pango > (define-public girara > ;; TODO: Move propagated inputs to inputs after core-updates is > merged (as > ;; of 2024-03) > + ;; N: Attempted, doing so causes failure to locate girara-gtk3 in > packages > + ;; that depend on it (as of 2025-03) > (package > (name "girara") > - (version "0.4.3") > + (version "0.4.5") > (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")) LGTM. > (sha256 > - (base32 > "0cbcs3810frgdmal5ia9pf3rk3k5h4xyzw1d2ia3rcg4nms5gcpx")))) > + (base32 > "14fspmblgqcc67dsn4lxc45pxbzsky3jnmrna16qb5i7z29pjzvb")))) > (arguments > - (list > - #: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 > - (list pkg-config > - check > - gettext-minimal > - `(,glib "bin") > - xorg-server-for-tests)) > - ;; Listed in 'Requires.private' of 'girara.pc'. > - (propagated-inputs (list gtk+ json-glib)) > + (list #:phases #~(modify-phases %standard-phases > + (add-before 'check 'start-xserver-for-tests > + (lambda* (#:key inputs #:allow-other-keys) > + (setenv "DISPLAY" ":1") > + ;; 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") > + ((compose zero? system) > + (string-append (assoc-ref inputs "xorg- > server") > + "/bin/Xvfb :1 &"))))))) You don't have to reindent arguments IIUC, and doing so introduces commit noise. > + (native-inputs (list pkg-config gettext-minimal `(,glib "bin") ; > build > + check xorg-server-for-tests)) ; test > + (propagated-inputs (list gtk+ json-glib));See girara.pc > 'Requires.private' Same here, you can leave them unchanged. If you do want to clean them up, please sort them alphabetically. > (build-system meson-build-system) > (home-page "https://pwmt.org/projects/girara/") > (synopsis "Library for minimalistic gtk+3 user interfaces") Cheers
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.