From patchwork Sat Mar 4 17:39:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 47663 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 C74D216D48; Sat, 4 Mar 2023 23:05:28 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 DC08316D22 for ; Sat, 4 Mar 2023 23:05:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYaw4-0002Dd-Hm; Sat, 04 Mar 2023 18:05:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYaw3-0002D4-L2 for guix-patches@gnu.org; Sat, 04 Mar 2023 18:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pYaw3-0001lJ-1k for guix-patches@gnu.org; Sat, 04 Mar 2023 18:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYaw2-0008JS-SX for guix-patches@gnu.org; Sat, 04 Mar 2023 18:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61968] [PATCH v2 8/8] gnu: gnome-builder: Update to 43.6. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Mar 2023 23:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61968 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61968@debbugs.gnu.org Received: via spool by 61968-submit@debbugs.gnu.org id=B61968.167797104731811 (code B ref 61968); Sat, 04 Mar 2023 23:05:02 +0000 Received: (at 61968) by debbugs.gnu.org; 4 Mar 2023 23:04:07 +0000 Received: from localhost ([127.0.0.1]:38017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYav8-0008H0-H2 for submit@debbugs.gnu.org; Sat, 04 Mar 2023 18:04:06 -0500 Received: from planete-kraus.eu ([89.234.140.182]:44478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYav5-0008Eq-Jj for 61968@debbugs.gnu.org; Sat, 04 Mar 2023 18:04:04 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 35f4b10f for <61968@debbugs.gnu.org>; Sat, 4 Mar 2023 23:04:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=dkim; bh=tZXa1GVx7k8iSC1vH9/7F4YxJ3k=; b=Gdffbk HsjnaF1cTsmvaYyFUYT6WS+4v94fdq7INJOjn+9S1reMhIB3qX9beKQFRcBB1YeZ 7hm2FQefOgBY1RSK1emkgjOeeWc/LWXtAmUzxi0EvqHznYVNd6gzrnBFfjhJZC8y nbX9rB+9e+eThRAu+2mZhnHEDHvtuwYFwpG4s= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ef677355 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <61968@debbugs.gnu.org>; Sat, 4 Mar 2023 23:04:00 +0000 (UTC) Message-Id: <58310841c51b6b55bbfd4302532600d7461384a3.1677970718.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 4 Mar 2023 18:39:37 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.0 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: , 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 Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Gnome-builder requires editorconfig, and that makes a cycle because (gnu packages text-editors) imports (gnu packages gnome) already. * gnu/packages/text-editors.scm (gnome-builder): Update to 43.6. [inputs]: Remove glade3, libdazzle, libhandy, libsoup-minimal-2. Replace devhelp-with-libsoup2 with devhelp, gtk+ with gtk, vte with vte-with-gtk-4. Add webkitgtk-next. [propagated-inputs]: Upgrade gtksourceview-4 to gtksourceview. [patch-meson]: meson.build needs to be configured not to search for gtk-update-icon-cache (in addition to not running it at the end of the build). [disable-failing-tests]: New phase. --- gnu/packages/text-editors.scm | 37 +++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index a581a30edf..fe1da39494 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1420,7 +1420,7 @@ (define-public xnedit (define-public gnome-builder (package (name "gnome-builder") - (version "42.1") + (version "43.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1428,7 +1428,7 @@ (define-public gnome-builder name "-" version ".tar.xz")) (sha256 (base32 - "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax")))) + "1abplccsxdm2sf9zi856g3axykanr7sm0s12wkxm5jb8v4yj2kwv")))) (build-system meson-build-system) (arguments (list @@ -1438,6 +1438,9 @@ (define-public gnome-builder #~(modify-phases %standard-phases (add-after 'unpack 'patch-meson (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")) (substitute* "build-aux/meson/post_install.py" (("gtk-update-icon-cache") "true") (("update-desktop-database") "true")) @@ -1445,6 +1448,13 @@ (define-public gnome-builder (("/usr/lib") (string-append #$(this-package-input "python-pygobject") "/lib"))))) + (add-after 'unpack 'disable-failing-tests + (lambda* _ + (substitute* "src/tests/meson.build" + (("test\\('test-text-iter'") + "# test('test-text-iter'") + (("test\\('test-shortcuts'") + "# test('test-shortcuts'")))) (add-before 'check 'pre-check (lambda _ (system "Xvfb :1 &") @@ -1452,32 +1462,33 @@ (define-public gnome-builder (inputs (list cmark clang - devhelp-with-libsoup2 + d-spy + devhelp + editorconfig-core-c flatpak - glade3 + glib-next gspell - gtk+ + gtk json-glib jsonrpc-glib - libdazzle + libadwaita libgit2-glib - libhandy + libpanel libpeas libportal - libsoup-minimal-2 llvm libostree python python-pygobject - sysprof-3.44 + sysprof template-glib - vte - webkitgtk-with-libsoup2)) + vte-with-gtk-4 + webkitgtk-next)) (propagated-inputs - (list gtksourceview-4)) ;needed for settings + (list gtksourceview)) ;needed for settings (native-inputs (list desktop-file-utils ;for desktop-file-validate - `(,glib "bin") + `(,glib-next "bin") gettext-minimal pkg-config python ;for meson scripts