From patchwork Sat Sep 2 11:36:12 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: 53606 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 AEA6827BBE9; Wed, 6 Sep 2023 21:24:34 +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 15FFF27BBE2 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 1qdz4P-0007oI-On; Wed, 06 Sep 2023 16:24:13 -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 1qdz4J-0007km-30 for guix-patches@gnu.org; Wed, 06 Sep 2023 16:24:08 -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 1qdz4I-0006me-R2 for guix-patches@gnu.org; Wed, 06 Sep 2023 16:24:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdz4J-0004AN-J2; Wed, 06 Sep 2023 16:24:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65696] [PATCH gnome-team v2 5/7] gnu: nautilus: Update to 44.2. 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:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65696 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65696@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 65696-submit@debbugs.gnu.org id=B65696.169403180815737 (code B ref 65696); Wed, 06 Sep 2023 20:24:07 +0000 Received: (at 65696) by debbugs.gnu.org; 6 Sep 2023 20:23:28 +0000 Received: from localhost ([127.0.0.1]:37831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdz3f-00045d-VS for submit@debbugs.gnu.org; Wed, 06 Sep 2023 16:23:28 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:62928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdz3c-00044P-5B for 65696@debbugs.gnu.org; Wed, 06 Sep 2023 16:23:24 -0400 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-51e28cac164so2880075a12.1 for <65696@debbugs.gnu.org>; Wed, 06 Sep 2023 13:23:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694031797; x=1694636597; 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=EpO5W/uwTNjhk3dr0t+GNjvhQMz/+enCrUJrM2CC0Jk=; b=Nu0Plj2PRhWoHuAAyQfWwB3q8A6+LRFYcFS2F6SE6n4oKPwuOoyhKMSZsrLztkLdjw S2DjcRmjlOBlN3NEYxOK3aaQFedaGwT+p1yE0ZlgXUEMi9GFmHgm4GeWQs0YGhvHLY7M B7i34e3wILPePJTs3yrxVrIAlqJgWcRmZooJdJtjETVYDsQHtoR7KijkXScBs/c0Ef7X B/pjuaQJmiQC24bk2E9Iu3RzjEdpi9wekzfApZU9ef7xx9xV0POw3q0if86Z2L42MgSa /AXXfAn16KYuOz+7q9PpIz6+07YV3nnN2F7mH/CH2KVv2yoAeRwaGOUzPVIN0IRaDlAi 3++w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694031797; x=1694636597; 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=EpO5W/uwTNjhk3dr0t+GNjvhQMz/+enCrUJrM2CC0Jk=; b=iwU6LkjzRe6HkAsXFeP/oiBMQzOFsYU+aa3NMElATsjpJX6u/urM/hoitpKjTDMI77 0fWhQ70SDBIpP68AJCbMh1rfnIhWKkrIKlqSZoMQmFX7Lwx81ZXrnT+bD9lsABmkGugt 8xGtRAvHlOUIoolsS6vdcp5ciefWYexwOsJS3BZgPlI3BRYo1dqgCmQ17woKzTtKf6+U TElU7ts4loCYGqKPY0CP9aJ04tdToCCuEvPJE1Sq5wWAiWWkWGps6ZrT/o8LXpBEQuhh mBx+tT2m+ugKapr/rodSbehCqhff571Q2petn+L9kJtp/aBVWtfCOK4bFHh9g8u3t2YV GhXg== X-Gm-Message-State: AOJu0Yz4tEV2DODNclp9kMru6tclHoSPrReO36bPb8FNL9WV/4VaoD7r sYGzLNKz5LWlrbF51B4S8BvyAqqFyjH6/qwY X-Google-Smtp-Source: AGHT+IFmUugqKmT0kuCwcW0oSyRTz9gu5Ibe805huIeCgNBKtG2GUswEgLuSvkcSOK/30vmud8S1Kg== X-Received: by 2002:a17:907:e8e:b0:9a1:e5bf:c907 with SMTP id ho14-20020a1709070e8e00b009a1e5bfc907mr1027824ejc.2.1694031797054; Wed, 06 Sep 2023 13:23:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 13:23:16 -0700 (PDT) Message-ID: <453217d69c38d1b858af04f389145fac7a9eb58c.1694031712.git.liliana.prikler@gmail.com> In-Reply-To: <38bc8c1102ad10d258adce73af746c4fae6e9248.1694031712.git.liliana.prikler@gmail.com> References: <38bc8c1102ad10d258adce73af746c4fae6e9248.1694031712.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 13:36:12 +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 (nautilus): Update to 44.2. [#:phases]: Add ‘patch-tracker3-command’. Adjust ‘skip-gtk-update-icon-cache’ accordingly. [inputs]: Remove gtk+ and libhandy. Add gtk and libadwaita. * gnu/packages/patches/nautilus-extension-search-path.patch: Adjust accordingly. --- gnu/packages/gnome.scm | 24 ++++--- .../nautilus-extension-search-path.patch | 64 +++++++++++-------- 2 files changed, 52 insertions(+), 36 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6ad2434b11..b460812348 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9618,7 +9618,7 @@ (define-public tracker-miners (define-public nautilus (package (name "nautilus") - (version "42.2") + (version "44.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9626,7 +9626,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr")) + "1rfkh43iw4bqv36ccznl3lh9g0p9pa8xqyjk167qlvar4xchcji7")) (patches (search-patches "nautilus-extension-search-path.patch")))) (build-system meson-build-system) @@ -9635,6 +9635,13 @@ (define-public nautilus #:glib-or-gtk? #t #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tracker3-command + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/nautilus-tag-manager.c" + (("\"tracker3\"") + (string-append "\"" + (search-input-file inputs "/bin/tracker3") + "\""))))) (add-after 'unpack 'disable-tracker-tests ;; The tracker test hangs in the build container (see: ;; https://gitlab.gnome.org/GNOME/nautilus/-/issues/2486). @@ -9645,8 +9652,9 @@ (define-public nautilus (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "build-aux/meson/postinstall.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (delete 'check) (add-after 'install 'check (assoc-ref %standard-phases 'check)) @@ -9673,18 +9681,18 @@ (define-public nautilus gnome-autoar gst-plugins-base json-glib - libhandy + libadwaita libportal libseccomp libselinux tracker tracker-miners - ;; XXX: gtk+ is required by libnautilus-extension.pc + ;; XXX: gtk is required by libnautilus-extension.pc ;; - ;; Don't propagate it to reduces "profile pollution" of the 'gnome' meta + ;; Don't propagate it to reduce "profile pollution" of the 'gnome' meta ;; package. See: ;; . - gtk+ + gtk libexif libxml2)) (native-search-paths diff --git a/gnu/packages/patches/nautilus-extension-search-path.patch b/gnu/packages/patches/nautilus-extension-search-path.patch index d5dc35b241..1394956315 100644 --- a/gnu/packages/patches/nautilus-extension-search-path.patch +++ b/gnu/packages/patches/nautilus-extension-search-path.patch @@ -1,54 +1,62 @@ Allow Nautilus to search for extensions in the directories listed in $NAUTILUS_EXTENSION_PATH. -diff --git a/src/nautilus-module.c b/src/nautilus-module.c -index bf474bd..42e2a4e 100644 ---- a/src/nautilus-module.c -+++ b/src/nautilus-module.c -@@ -211,6 +211,10 @@ static void +Index: nautilus-44.2/src/nautilus-module.c +=================================================================== +--- nautilus-44.2.orig/src/nautilus-module.c ++++ nautilus-44.2/src/nautilus-module.c +@@ -220,8 +220,16 @@ static void load_module_dir (const char *dirname) { GDir *dir; +- + static GHashTable *loaded = NULL; + g_autoptr (GStrvBuilder) installed_module_name_builder = g_strv_builder_new (); ++ ++ if (installed_module_names != NULL) ++ g_strv_builder_addv (installed_module_name_builder, ++ (const gchar **)installed_module_names); + + if (loaded == NULL) + loaded = g_hash_table_new (g_str_hash, g_str_equal); - ++ dir = g_dir_open (dirname, 0, NULL); -@@ -221,15 +225,22 @@ load_module_dir (const char *dirname) - while ((name = g_dir_read_name (dir))) + if (dir) +@@ -232,16 +240,24 @@ load_module_dir (const char *dirname) { if (g_str_has_suffix (name, "." G_MODULE_SUFFIX)) -- { + { - char *filename; - - filename = g_build_filename (dirname, - name, - NULL); -- nautilus_module_load_file (filename); +- nautilus_module_load_file (filename, installed_module_name_builder); - g_free (filename); -- } -+ { -+ /* Make sure each module is loaded only twice or this could -+ lead to a crash. Double loading can occur if DIRNAME -+ occurs more than once in $NAUTILUS_EXTENSION_PATH. */ -+ if (!g_hash_table_contains (loaded, name)) -+ { -+ char *filename; ++ /* Make sure each module is loaded only twice or this could ++ lead to a crash. Double loading can occur if DIRNAME ++ occurs more than once in $NAUTILUS_EXTENSION_PATH. */ ++ if (!g_hash_table_contains (loaded, name)) ++ { ++ char *filename; + -+ filename = g_build_filename (dirname, -+ name, -+ NULL); -+ nautilus_module_load_file (filename); -+ g_hash_table_add (loaded, g_strdup (name)); -+ g_free (filename); -+ } -+ } - } ++ filename = g_build_filename (dirname, ++ name, ++ NULL); ++ nautilus_module_load_file (filename, ++ installed_module_name_builder); ++ g_hash_table_add (loaded, g_strdup (name)); ++ g_free (filename); ++ } + } +- } ++ } g_dir_close (dir); -@@ -257,10 +268,24 @@ nautilus_module_setup (void) + } + +@@ -278,10 +294,24 @@ nautilus_module_setup (void) if (!initialized) {