From patchwork Mon Nov 29 23:19:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 34879 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 754CE27BBE9; Mon, 29 Nov 2021 23:21:12 +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,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 53F9D27BBEA for ; Mon, 29 Nov 2021 23:21:10 +0000 (GMT) Received: from localhost ([::1]:60954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrpxN-0000w0-EJ for patchwork@mira.cbaines.net; Mon, 29 Nov 2021 18:21:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrpxG-0000ut-Bz for guix-patches@gnu.org; Mon, 29 Nov 2021 18:21:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56393) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrpxG-0003CS-33 for guix-patches@gnu.org; Mon, 29 Nov 2021 18:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrpxF-0004zd-Mv for guix-patches@gnu.org; Mon, 29 Nov 2021 18:21:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52188] [PATCH] [core-updates-frozen] Fix gnome-builder. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Nov 2021 23:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52188@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163822800719092 (code B ref -1); Mon, 29 Nov 2021 23:21:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Nov 2021 23:20:07 +0000 Received: from localhost ([127.0.0.1]:39703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrpwN-0004xr-DE for submit@debbugs.gnu.org; Mon, 29 Nov 2021 18:20:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:34354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrpwL-0004xi-UZ for submit@debbugs.gnu.org; Mon, 29 Nov 2021 18:20:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrpwL-0000oW-Jm for guix-patches@gnu.org; Mon, 29 Nov 2021 18:20:05 -0500 Received: from planete-kraus.eu ([89.234.140.182]:45334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mrpwI-0002vz-S6 for guix-patches@gnu.org; Mon, 29 Nov 2021 18:20:05 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e63c7485 for ; Mon, 29 Nov 2021 23:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=CJlPqXq5Q/Fo6lQawpIdOLmBW1U=; b=JKZGIg3c/HMaSJxJNuUkOHY9Z+lh 9OlwJi5apvIzstaur6TBwWLGysNMb3mGcUcOxNnwOVpu61WByqCCgnriLJ3UEjul sVK2HUMsaWphipyYByRRpBm78qzSGjIKTFPYPC3+iRfheFnoeinX5JNF5iC0+guR mGtPdqe01+r3kwg= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d06ecdf2 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Mon, 29 Nov 2021 23:19:52 +0000 (UTC) Date: Tue, 30 Nov 2021 00:19:12 +0100 Message-ID: <87czmi7dov.fsf@planete-kraus.eu> MIME-Version: 1.0 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu 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, SPF_HELO_PASS=-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" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus X-getmail-retrieved-from-mailbox: Patches Dear guix, GNOME builder is not ready yet for libsoup 3, so I suggest that we add a libsoup 2 variant for devhelp, and use libsoup 2 everywhere for builder. What do you think? Best regards, Vivien From 6c896768d191f1fbc129b2c5b1d7bcd8a88aa93c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 30 Nov 2021 00:05:18 +0100 Subject: [PATCH 2/2] gnu: gnome-builder: Use libsoup 2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-builder) [phase 'patch-meson]: Don’t search for webkit2gtk-4.1. [inputs]: Replace devhelp with devhelp-with-libsoup2 and webkit with webkit-with-libsoup2. --- gnu/packages/gnome.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ccb99ca8ec..5f99616571 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12486,10 +12486,7 @@ (define-public gnome-builder (substitute* "src/libide/meson.build" (("/usr/lib") (string-append (assoc-ref inputs "python-pygobject") - "/lib"))) - (substitute* "meson.build" - (("webkit2gtk-4.0") "webkit2gtk-4.1")) - #t)) + "/lib"))))) (add-after 'configure 'fix-ninja (lambda _ ;; #43296: meson(?) incorrectly assumes we want to link @@ -12505,7 +12502,7 @@ (define-public gnome-builder (inputs `(("cmark" ,cmark) ("clang" ,clang) - ("devhelp" ,devhelp) + ("devhelp" ,devhelp-with-libsoup2) ("glade" ,glade3) ("gspell" ,gspell) ("gtk+" ,gtk+) @@ -12521,7 +12518,7 @@ (define-public gnome-builder ("sysprof" ,sysprof) ("template-glib" ,template-glib) ("vte" ,vte) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-with-libsoup2))) (propagated-inputs `(("gtksourceview" ,gtksourceview))) ;needed for settings (native-inputs -- 2.34.0