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

[GNU bug Tracking System]

Your message dated Mon, 24 Jan 2022 09:58:36 +0100
with message-id <877dapy0g3.fsf@gnu.org>
and subject line Re: bug#53443: [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 
compilation error.
has caused the debbugs.gnu.org bug report #53443,
regarding [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
53443: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=53443
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems

--- Begin Message --- Subject: [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error. Date: Sat, 22 Jan 2022 19:47:33 +0800 User-agent: mu4e 1.6.10; emacs 27.2

signature.asc
Description: PGP signature

>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

-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

--- End Message ---

> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#53443: [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.
>
>
>
>
> Date: 
>
> Mon, 24 Jan 2022 09:58:36 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
>
>
>
>
> 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’.
>
>
> --- End Message ---