[PATCH core-updates-frozen] gnu: zathura: use old meson

  • Done
  • quality assurance status badge
Details
2 participants
  • angryrectangle
  • Maxim Cournoyer
Owner
unassigned
Submitted by
angryrectangle
Severity
normal
A
A
angryrectangle wrote on 24 Nov 2021 21:21
(address . guix-patches@gnu.org)
66f2d074d47dd62cd05f92881866e865@cock.li
fixes the build.
this problem has already been fixed in zathura master, but it's not part
of the latest release.

---
gnu/packages/pdf.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index ea19897ae4..f50486f9cb 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -56,6 +56,7 @@ (define-module (gnu packages pdf)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages build-tools)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
#:use-module (gnu packages cups)
@@ -650,7 +651,8 @@ (define-public zathura
(files '("lib/zathura")))))
(build-system meson-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
+ `(#:meson ,meson-0.59 ;positional arguments error with
meson 0.60
+ #:phases (modify-phases %standard-phases
(add-before 'check 'start-xserver
;; Tests require a running X server.
(lambda* (#:key inputs #:allow-other-keys)
--
2.34.0
M
M
Maxim Cournoyer wrote on 25 Nov 2021 07:41
(address . angryrectangle@cock.li)(address . 52084-done@debbugs.gnu.org)
877dcwbutn.fsf@gmail.com
Hello!

angryrectangle@cock.li writes:

Toggle quote (32 lines)
> fixes the build.
> this problem has already been fixed in zathura master, but it's not part
> of the latest release.
>
> ---
> gnu/packages/pdf.scm | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
> index ea19897ae4..f50486f9cb 100644
> --- a/gnu/packages/pdf.scm
> +++ b/gnu/packages/pdf.scm
> @@ -56,6 +56,7 @@ (define-module (gnu packages pdf)
> #:use-module (gnu packages backup)
> #:use-module (gnu packages base)
> #:use-module (gnu packages bash)
> + #:use-module (gnu packages build-tools)
> #:use-module (gnu packages check)
> #:use-module (gnu packages compression)
> #:use-module (gnu packages cups)
> @@ -650,7 +651,8 @@ (define-public zathura
> (files '("lib/zathura")))))
> (build-system meson-build-system)
> (arguments
> - `(#:phases (modify-phases %standard-phases
> + `(#:meson ,meson-0.59 ;positional arguments error with
> meson 0.60
> + #:phases (modify-phases %standard-phases
> (add-before 'check 'start-xserver
> ;; Tests require a running X server.
> (lambda* (#:key inputs #:allow-other-keys)

Something happened and the above patch was sent malformed (it didn't
apply). I applied it manually and commit as
c9208beb3cbdd592275af28221cb93848b2a71a1.

Thank you!

Maxim
Closed
?