From patchwork Sat Jan 22 11:47:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 36743 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6F91D27BBEA; Sat, 22 Jan 2022 11:54:45 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 28F5827BBE9 for ; Sat, 22 Jan 2022 11:54:45 +0000 (GMT) Received: from localhost ([::1]:46004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nBEyi-0006Yy-7C for patchwork@mira.cbaines.net; Sat, 22 Jan 2022 06:54:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBEtC-00043d-Dv for guix-patches@gnu.org; Sat, 22 Jan 2022 06:49:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nBEtC-00074V-4D for guix-patches@gnu.org; Sat, 22 Jan 2022 06:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nBEtC-0001DZ-49 for guix-patches@gnu.org; Sat, 22 Jan 2022 06:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53443] [PATCH] gnu: nomad: Fix missing webkit2gtk-4.0 compilation error. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jan 2022 11:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53443 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53443@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16428521074628 (code B ref -1); Sat, 22 Jan 2022 11:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Jan 2022 11:48:27 +0000 Received: from localhost ([127.0.0.1]:35893 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBEsd-0001Ca-04 for submit@debbugs.gnu.org; Sat, 22 Jan 2022 06:48:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:44336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBEsZ-0001CQ-2B for submit@debbugs.gnu.org; Sat, 22 Jan 2022 06:48:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBEsY-0003ZE-Q0 for guix-patches@gnu.org; Sat, 22 Jan 2022 06:48:22 -0500 Received: from mail-m974.mail.163.com ([123.126.97.4]:27510) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nBEsP-0006yU-Oi for guix-patches@gnu.org; Sat, 22 Jan 2022 06:48:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=kCnRT lgsbLjLjckYWKoAIGWfKhfGe2LOB+zMRBAN8SU=; b=N5OQaKQhxOJCNsNNmVXxj B1CiqCnONF0wmLXzv+PSWZh5oU6FqENZs6sQbSbNUIOCWjht5KD6n2HqW+Sva3vK JPVeC4W3FsxizcWZUnL1PTBX1rMJC5Vyf80rgFRWiWy36ZIKrPx+z3oG7fEnTANP oJK6cI4sDjF2gddboMOh7Q= Received: from asus-laptop (unknown [27.46.80.3]) by smtp4 (Coremail) with SMTP id HNxpCgC3unTz7uthIavSBA--.22174S2; Sat, 22 Jan 2022 19:48:05 +0800 (CST) User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Sat, 22 Jan 2022 19:47:33 +0800 Message-ID: <86pmokyosy.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: HNxpCgC3unTz7uthIavSBA--.22174S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU1SoXDUUUU X-Originating-IP: [27.46.80.3] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFBWQr1aD-AmrIAAAsV Received-SPF: pass client-ip=123.126.97.4; envelope-from=all_but_last@163.com; helo=mail-m974.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 6935b34642d37c3830011087707ad4f12bc39658 Mon Sep 17 00:00:00 2001 From: Zhu Zihao 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]: 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