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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 53443 in the body.
You can then email your comments to 53443 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error.
Date: Sat, 22 Jan 2022 19:47:33 +0800

[Message part 1 (text/plain, inline)]

[signature.asc (application/pgp-signature, inline)]

[0001-gnu-nomad-Fix-missing-webkit2gtk-4.0-compilation-err.patch (text/x-patch, inline)]

From 6935b34642d37c3830011087707ad4f12bc39658 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 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

[Message part 4 (text/plain, inline)]

-- 
Retrieve my PGP public key:

  gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao

Message #10 received at 53443-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Zhu Zihao <all_but_last <at> 163.com>
Cc: 53443-done <at> debbugs.gnu.org
Subject: Re: bug#53443: [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0
 compilation error.
Date: Mon, 24 Jan 2022 09:58:36 +0100

Hi,

Zhu Zihao <all_but_last <at> 163.com> skribis:

>>From 6935b34642d37c3830011087707ad4f12bc39658 Mon Sep 17 00:00:00 2001
> From: Zhu Zihao <all_but_last <at> 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’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.