[bug#53443] [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.

[bug#53443] [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.

[Zhu Zihao]

[-- Attachment #1.1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 255 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-nomad-Fix-missing-webkit2gtk-4.0-compilation-err.patch --]
[-- Type: text/x-patch, Size: 1382 bytes --]

From 6935b34642d37c3830011087707ad4f12bc39658 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 22 Jan 2022 19:42:23 +0800
Subject: [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.

* gnu/package/guile-xyz.scm (nomad)[arguments]<phases>: Add phase
'fix-webkitgtk' to update webkit2gtk-4.0 reference in file 'configure.ac'
and 'typelib/Makefile.am'.
---
 gnu/packages/guile-xyz.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 9a7e7d8ba4..e2cf793acc 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3444,6 +3444,16 @@ (define-public nomad
                   (srfi srfi-26))
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-webkitgtk
+           (lambda _
+             ;; Adapt to the version we have in Guix.
+             (substitute* "configure.ac"
+               (("webkit2gtk-4\\.0") "webkit2gtk-4.1")
+               (("webkit2gtk-web-extension-4\\.0")
+                "webkit2gtk-web-extension-4.1"))
+
+             (substitute* "typelib/Makefile.am"
+               (("WebKit2-4\\.0") "WebKit2-4.1"))))
          (add-before 'check 'start-xorg-server
            (lambda* (#:key inputs #:allow-other-keys)
              ;; The test suite requires a running X server.
-- 
2.34.0


[-- Attachment #3: Type: text/plain, Size: 100 bytes --]


-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

bug#53443: [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.

[Ludovic Courtès]

Hi,

Zhu Zihao <all_but_last@163.com> skribis:

>>From 6935b34642d37c3830011087707ad4f12bc39658 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last@163.com>
> Date: Sat, 22 Jan 2022 19:42:23 +0800
> Subject: [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.
>
> * gnu/package/guile-xyz.scm (nomad)[arguments]<phases>: Add phase
> 'fix-webkitgtk' to update webkit2gtk-4.0 reference in file 'configure.ac'
> and 'typelib/Makefile.am'.

Applied, thanks!

Ludo’.