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: 53604 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 9F64127BBE9; Wed, 6 Sep 2023 21:24:33 +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=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 5A7F427BBEA for ; Wed, 6 Sep 2023 21:24:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdz4L-0007lK-4c; Wed, 06 Sep 2023 16:24:09 -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 1qdz4G-0007jS-Do for guix-patches@gnu.org; Wed, 06 Sep 2023 16:24:04 -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 1qdz4G-0006lw-5d for guix-patches@gnu.org; Wed, 06 Sep 2023 16:24:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdz4H-00049c-CC; Wed, 06 Sep 2023 16:24:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65644] [PATCH gnome-team v2 9/9] gnu: gnome-shell: Update to 44.3. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 20:24: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: Maxim Cournoyer , liliana.prikler@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, rg@raghavgururajan.name Received: via spool by 65644-submit@debbugs.gnu.org id=B65644.169403182515877 (code B ref 65644); Wed, 06 Sep 2023 20:24:05 +0000 Received: (at 65644) by debbugs.gnu.org; 6 Sep 2023 20:23:45 +0000 Received: from localhost ([127.0.0.1]:37860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdz3x-00047w-9y for submit@debbugs.gnu.org; Wed, 06 Sep 2023 16:23:45 -0400 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]:46327) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdz3o-00046C-NK for 65644@debbugs.gnu.org; Wed, 06 Sep 2023 16:23:37 -0400 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-5007c8308c3so315937e87.0 for <65644@debbugs.gnu.org>; Wed, 06 Sep 2023 13:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694031809; x=1694636609; darn=debbugs.gnu.org; h=cc: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=IF1CWJaNtbp4A2CiPxqzirwG3y8x6dBbzfsEWt3QTR4=; b=QiuyvayQaq7PcCSksIlu0EAAMEMnU1fmK18/o+VSagwHRbKX5I/cYJNzf1SumWCphO nSQEhrtTPh8sOmbXeECOCLUgB5QXy+oS1Z3GAX+2Is0h0mX3Y6Kuk8lZHPPWpg7vKskQ VQ1XYuc2HUa4fvoA/rDzZ3gCzosM9o8pfEGLf205Epa5kr38A8qFK3ykJJX37QdYqvlW gypAqxo7IA/JuAABvlaz54XV08Wg3emzZ3JG1hVBMjIwELMWRVnmeq7mEg9gz5D8EWD1 CaajsE37bOULVYx5hcZPtOKF4/xwkjQ8q7YL3b5kuk+NTrL+Btau36rZc5ZhX/0pSPO/ l63w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694031809; x=1694636609; h=cc: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=IF1CWJaNtbp4A2CiPxqzirwG3y8x6dBbzfsEWt3QTR4=; b=Lmjm8tfU5B1tCDf9Hj0g2TGdmzoklP7i8J1EJ0BK2OpDQOeVLB3eevebzvRkPU8zuF CjZIpKAYXh5M6Mu0Arb4AVubV5V0RDkLM2B/UiIrKTmYjgejGzMTtb6282UJuoKDcOvB IMTk5gBdE3mT3NR1i6QEogrfyzFfKt/QSBnCN8eGG5KCGcCPFnUXhXzpXLjAXYO2AJ6x 997/ysOuV8Ajd5ju9WizTuuX4uQb3ccpj7NsZ61eOxxfR0HMEvlmuPii4VDe9ZPgohh5 Ji1vx6jYZ2TDp0ow2MX90iRnSrKkBwZ2c0uKXUl8jYz9eVI3BJ46mpjDiegrmhXWkhOV Qk/Q== X-Gm-Message-State: AOJu0Yx6RNZSLRSJWKN2Mp44BJ7REGuTRDVPkc+wRG4oMV6DY0vR3+bV CocAKPdZd/41PG3tsStGjuUQ+j3CnqvKpg== X-Google-Smtp-Source: AGHT+IFtne20eAncqByaV/2kNdV//lOT+vlSU25+j4nNtv1mHAWMJKevShFMLd5TEZAhOkRvHZEB2w== X-Received: by 2002:a05:6512:3594:b0:500:a39a:1b99 with SMTP id m20-20020a056512359400b00500a39a1b99mr2969418lfr.38.1694031809470; Wed, 06 Sep 2023 13:23:29 -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 um16-20020a170906cf9000b00992d70f8078sm9429602ejb.106.2023.09.06.13.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 13:23:28 -0700 (PDT) Message-ID: <12c3e3341d5d4a3a98c5f6ebe7166034bd025a45.1694031712.git.liliana.prikler@gmail.com> In-Reply-To: <35a9ebf83ef1063dfdda255b5a670d19747564f7.1694031712.git.liliana.prikler@gmail.com> References: <35a9ebf83ef1063dfdda255b5a670d19747564f7.1694031712.git.liliana.prikler@gmail.com> 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-3 with gcr. --- 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 81e3e0cd65..5c0f84d057 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9113,7 +9113,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 "/" @@ -9121,7 +9121,7 @@ (define-public gnome-shell name "-" version ".tar.xz")) (sha256 (base32 - "0kn5fclciybp2fs38wd39hdz85y91pas0ckfa02pmyx91sbz4pw7")))) + "1grizh3fbks5dgizaj38300cz97ay81q0hlk1pvawkpfq9qlnsam")))) (build-system meson-build-system) (arguments (let ((disallowed-references @@ -9159,6 +9159,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 _ + ;; Lest non-fatal dbus warnings be made fatal again… + (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")) @@ -9175,7 +9181,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")) @@ -9241,16 +9253,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-3 + gcr gdm librsvg gjs