From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id cJuWDXQ5BGRhHwAAbAwnHQ (envelope-from ) for ; Sun, 05 Mar 2023 07:40:52 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 6I6ADXQ5BGQeMwAAauVa8A (envelope-from ) for ; Sun, 05 Mar 2023 07:40:52 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CEAF511812 for ; Sun, 5 Mar 2023 07:40:51 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="kj/0ol 5"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677998451; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=wLsS1RZP+Kf9E7tknLm1BJkyL5Y7ip8c+tNLJPPAOCM=; b=IQVpo6Gz/rJykcNUC4GvtHgA2aa2Y2jGoFTfQArIvs4wg9btGKvfOcPzbGkwS7KuAzB29B h9PTxG7pkdfufKP7zheEcI7xNmMJTyYzBwABldIB5w21ByELFPqKKYydr0VRMogrN6byDK x8j6jS0BT0wjE1MZBiPZaN2rA/x+baxgRuTxWFXMHYETAdPzNm6l9ZWl8h9TDQD/tYI/0G RHQfr8GUW/nE+h2BqAAUeKu935ACGBfCauMyAj5p3QQteRgY/3gbKMPpUo16MGSqYmmHrx 5/L/n4ePYu3NF3iMEVnZhmfXtEAbCvJK1dcjJGXcRXIcFdMwSndbAU8i0gQQ0A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b="kj/0ol 5"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677998451; a=rsa-sha256; cv=none; b=poIK7A3dFyC9tporR9/qSNRqxTY4kddYMg2xJAATxb2f/YH+wA8K1UPdPmZesw3ceX9IrZ VEFyk54DgbmatVzNBlg+tG8295UvG+sJnzG0dSrAWXB5b8sW6m/mV8lK/jm/4ibXtSpfnv klPhRDI0vIWksstDLMiF7wVjggylFm62nzEO2tzvSU0yPks0vrHzMzxE5bN8z8EImbRNpX y4jeQCNs2oLZG9FCHf/gZV7JT3MRTPFxzUhVKCkBVRHmnxR35F2mD6HLBk8s7fOJP8XLJa LJCaYxlzsCasKIv8YM4/eLRn/WeHu02JhFfgeAUblr/HhTinv6wrMiiiDTVICw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYi2d-00063W-9i; Sun, 05 Mar 2023 01:40:19 -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 1pYi2N-00062v-4f for guix-patches@gnu.org; Sun, 05 Mar 2023 01:40: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 1pYi2M-0005DC-He for guix-patches@gnu.org; Sun, 05 Mar 2023 01:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pYi2M-0003oK-5t for guix-patches@gnu.org; Sun, 05 Mar 2023 01:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61968] [PATCH v3 12/12] gnu: gnome-builder: Update to 43.6. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Mar 2023 06:40: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.167799838914612 (code B ref 61968); Sun, 05 Mar 2023 06:40:02 +0000 Received: (at 61968) by debbugs.gnu.org; 5 Mar 2023 06:39:49 +0000 Received: from localhost ([127.0.0.1]:38312 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYi28-0003nb-3T for submit@debbugs.gnu.org; Sun, 05 Mar 2023 01:39:48 -0500 Received: from planete-kraus.eu ([89.234.140.182]:52634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYhvL-0003Zr-Rg for 61968@debbugs.gnu.org; Sun, 05 Mar 2023 01:32:48 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id b17ba6bf for <61968@debbugs.gnu.org>; Sun, 5 Mar 2023 06:32:46 +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=wKrzqkbEMuc6ISEIEi/A9xxuUUk=; b=kj/0ol 5YWu0p3Mu0vvIb9l6HMXGuhRx0yx2gvPma19Q54+sbbF9F8lm7s9OCS4HoToKEfO P/4ZcgLj7g8BxO8dsZXkkSeik3llE99Q/UkQICoiN6aoIZNm+ERMAhdifWG0+L9k zdVGA4qKSEsm7/JW2PEBgQzvoWAYzXPrwyo7s= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id eec15849 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <61968@debbugs.gnu.org>; Sun, 5 Mar 2023 06:32:45 +0000 (UTC) Message-Id: 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-Migadu-Spam-Score: -2.21 X-Spam-Score: -2.21 X-Migadu-Scanner: scn0.migadu.com X-Migadu-Queue-Id: CEAF511812 X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: 1CoN2TLy+IS7 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 07a9f904db..cd893f2ea7 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1421,7 +1421,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 "/" @@ -1429,7 +1429,7 @@ (define-public gnome-builder name "-" version ".tar.xz")) (sha256 (base32 - "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax")))) + "1abplccsxdm2sf9zi856g3axykanr7sm0s12wkxm5jb8v4yj2kwv")))) (build-system meson-build-system) (arguments (list @@ -1439,6 +1439,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")) @@ -1446,6 +1449,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 &") @@ -1453,32 +1463,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 -- 2.39.1