From patchwork Thu Aug 31 03:35:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 53325 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 32C4727BBE9; Thu, 31 Aug 2023 05:18:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 F061E27BBE2 for ; Thu, 31 Aug 2023 05:18:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbZ8F-0003UD-Iq; Thu, 31 Aug 2023 00:18:11 -0400 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 1qbZ83-0003Q7-0E for guix-patches@gnu.org; Thu, 31 Aug 2023 00:17:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qbZ82-0005d6-Fg for guix-patches@gnu.org; Thu, 31 Aug 2023 00:17:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbZ89-0008VY-Ug; Thu, 31 Aug 2023 00:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65644] [PATCH gnome-team 9/9] gnu: gnome-shell: Update to 44.3. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Thu, 31 Aug 2023 04:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65644 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65644@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 65644-submit@debbugs.gnu.org id=B65644.169345546732609 (code B ref 65644); Thu, 31 Aug 2023 04:18:05 +0000 Received: (at 65644) by debbugs.gnu.org; 31 Aug 2023 04:17:47 +0000 Received: from localhost ([127.0.0.1]:54449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZ7r-0008To-Dg for submit@debbugs.gnu.org; Thu, 31 Aug 2023 00:17:47 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:52644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbZ7k-0008SH-TL for 65644@debbugs.gnu.org; Thu, 31 Aug 2023 00:17:41 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-52a4b62c2f5so384683a12.1 for <65644@debbugs.gnu.org>; Wed, 30 Aug 2023 21:17:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693455447; x=1694060247; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=s0sHhjRJ9nEgD6QR8R86NkRRUZsK87JvkeY3eq31E3c=; b=C6YfW/gY425QEDxEZjJrkAf5wPqHvk6UN3/g/gPyevTx5Fr54g0+Y4XdNMdSaaYH9z LQ/ZPgAGL92rQPAEL3YRg2nmhV1qLJ3CwRnaG2/eDgwqSDmR/UWA8mZBvhgqYrq5pyv1 kMOM3i6KEzHBulfpXoH9z5WJqPln1+zwILpOoA21JLsliVnD0X7xSneJAc/5o8yQNPSO TaqPv1y2xbLHGepVBPUBAygA2awc4e/GgR4JrvqH8dFmeukGdtYU1l/MVrPM6K3UXPNn cUruGZWY5eBG3fF6RYjeZtLdnCynhfLRLAIGiSqCy4sRplARrM+NLPd/2EO9KJkkPouF Jtrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693455447; x=1694060247; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s0sHhjRJ9nEgD6QR8R86NkRRUZsK87JvkeY3eq31E3c=; b=CBAdzf6Ew7NeVfe4IH/DcGBJtAFSbMcbvQVxxqs+PF3vaaTU7T6vJTjmJE5btu2YFj 7qzsjeGCFGNlXPOMqgfxQz4h5gBy4vpPOBfw7d9vKf6+mUxkYYAiF02lgJnYqmos51TU yWtY0CdZV1L8ZZBOdVJF7olbeANMfpYttOYJCa2FN7SQkjFNkB7DMa5Gmaux89zrAu2y XvBDVLBp/k5sTayk0cCNoS9n3z7r8mlgRvH/+agmsVXY9a5b885UdJ0JUINIQiI5SxyI MRi6N6RSeB2CJm2QdYt3x9tjZcJxGKwYR75QhAD1TkHlJcoYvjh6ysX/3SOjbM7UP56w 2cxw== X-Gm-Message-State: AOJu0YwczfJDv6Ng5KK+v4Ws2xZij9s2hj1a/Xrd3rLZTYV5fKeHDyDo +Jpjj4aq8R7bboP4yat+6cg/6m3v9Y5bWNwY X-Google-Smtp-Source: AGHT+IGkRCXPx5E1dYSD/Dm4pzVN533O1r+QWp+JLl9X9uyvfSxvzyZzbjRXHXDL23rXVeVb7JenbA== X-Received: by 2002:aa7:d403:0:b0:523:364b:e6a9 with SMTP id z3-20020aa7d403000000b00523364be6a9mr3149846edq.38.1693455447262; Wed, 30 Aug 2023 21:17:27 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d3-20020a056402516300b005256771db39sm313300ede.58.2023.08.30.21.17.26 for <65644@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 21:17:26 -0700 (PDT) Message-ID: <784d9cde7ead9ea237035b7f19d0c46346d4fade.1693454927.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 31 Aug 2023 05:35:30 +0200 MIME-Version: 1.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: , 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 * gnu/packages/gnome.scm (gnome-shell): Update to 44.3. [arguments]<#:phases>: Add ‘unbreak-perf-tests’. Adjust ‘pre-check’ accordingly. [native-inputs]: Add python-dbus and python-dbusmock. [inputs]: Remove caribou. Replace gcr with gcr-4. --- gnu/packages/gnome.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5e6a6df44c..d4e78bb08d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9114,7 +9114,7 @@ (define-public gnome-control-center (define-public gnome-shell (package (name "gnome-shell") - (version "42.4") + (version "44.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9122,7 +9122,7 @@ (define-public gnome-shell name "-" version ".tar.xz")) (sha256 (base32 - "0kn5fclciybp2fs38wd39hdz85y91pas0ckfa02pmyx91sbz4pw7")))) + "1grizh3fbks5dgizaj38300cz97ay81q0hlk1pvawkpfq9qlnsam")))) (build-system meson-build-system) (arguments (let ((disallowed-references @@ -9160,6 +9160,12 @@ (define-public gnome-shell (substitute* "meson.build" (("gtk_update_icon_cache: true") "gtk_update_icon_cache: false")))) + (add-after 'unpack 'unbreak-perf-tests + (lambda _ + ;; non-fatal dbus warning otherwise causes shell to crash + (substitute* "tests/meson.build" + (("perf_testenv\\.set\\('G_DEBUG'" all) + (string-append "# " all))))) (add-before 'configure 'record-absolute-file-names (lambda* (#:key inputs #:allow-other-keys) (let ((ibus-daemon (search-input-file inputs "bin/ibus-daemon")) @@ -9176,7 +9182,13 @@ (define-public gnome-shell ;; Tests require a running X server. (system "Xvfb :1 &") (setenv "DISPLAY" ":1") - (setenv "HOME" "/tmp"))) ;to avoid "fatal" warnings + ;; For the missing /var/lib/dbus/machine-id + (setenv "DBUS_FATAL_WARNINGS" "0") + (setenv "NO_AT_BRIDGE" "1") + (setenv "HOME" "/tmp") + (setenv "XDG_RUNTIME_DIR" (string-append (getcwd) "/runtime-dir")) + (mkdir (getenv "XDG_RUNTIME_DIR")) + (chmod (getenv "XDG_RUNTIME_DIR") #o700))) (add-after 'install 'wrap-programs (lambda* (#:key inputs #:allow-other-keys) (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")) @@ -9242,16 +9254,17 @@ (define-public gnome-shell perl pkg-config python + python-dbus + python-dbusmock ruby-sass sassc ;; For tests xorg-server-for-tests)) (inputs (list accountsservice - caribou docbook-xsl evolution-data-server - gcr + gcr-4 gdm librsvg gjs