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: 53393 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 070F727BBEC; Sat, 2 Sep 2023 14:25:21 +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 B4F1827BBE2 for ; Sat, 2 Sep 2023 14:25:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQcS-0003w8-6O; Sat, 02 Sep 2023 09:24:56 -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 1qcQcQ-0003vA-Ou for guix-patches@gnu.org; Sat, 02 Sep 2023 09:24:54 -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 1qcQcQ-0001XK-GO for guix-patches@gnu.org; Sat, 02 Sep 2023 09:24:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qcQcZ-0007MU-LE; Sat, 02 Sep 2023 09:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65699] [PATCH gnome-team 5/7] gnu: nautilus: Update to 44.2. 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: Sat, 02 Sep 2023 13:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65699 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65699@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 65699-submit@debbugs.gnu.org id=B65699.169366106628202 (code B ref 65699); Sat, 02 Sep 2023 13:25:03 +0000 Received: (at 65699) by debbugs.gnu.org; 2 Sep 2023 13:24:26 +0000 Received: from localhost ([127.0.0.1]:35472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcQby-0007Kn-1g for submit@debbugs.gnu.org; Sat, 02 Sep 2023 09:24:26 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:59852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcQbt-0007Jb-Gf for 65699@debbugs.gnu.org; Sat, 02 Sep 2023 09:24:22 -0400 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-99bed101b70so1211766b.3 for <65699@debbugs.gnu.org>; Sat, 02 Sep 2023 06:24:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693661046; x=1694265846; 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=vVyac54CSoEYGi8+iPkd3ULGVzsZyID+7n6Sab90oT4=; b=HR3nl0xeN9YdKSiB/2JS0GOhN3S7svRilyyfGlAc4RriFWq6RK6gNU/zO7LA9NUav8 i7M6qh+UEyCiKGxKYbwvaIgZRcTrht59qT0WfPJcrYyZ50A++Bt01KFeUJhi/Lx+rpYY kYs8daj0eTk/O7tAMqSPtHnENLBG3KIlnmDPaiuZGERFJgzJuRjsQUrxfJHE95iTWAlc CSZnD9ieeCjriGsdPJLezS3KfHDbCNboF3l5O174temR9I+pQszFMDMNYgBvTHOm2obM 23Z0s5gFufz/XuTHCHhOw8h3MDdTuCLehzJjmLViIEjHfkNTKwW2wV+52wibZxqsbunZ jzWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693661046; x=1694265846; 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=vVyac54CSoEYGi8+iPkd3ULGVzsZyID+7n6Sab90oT4=; b=hNfuvzP7lA5GB4A57fWk6XfahBJoA7Mk+iSb/5HdcSH9vdHvBKujhSWpwm9uWCfTTh OsFgzJc1P5XRyo3Q2gHLHYzdj+7yN4fYD02MdTIEaJ7qr2iHQhb6wJrIALeoWuCO1kHp U5u37lgjOW+Sna+V00TeK+KvObDeCDCNvpqOssD1m0+mJxEo1XEeLNKcMfAvOft7WeLa o93meuiA4c1UW0+vnfhxdSzYMDsmuE8u5w8oT/Dlm+Jrk1k8/KBsQL27YI5isp+fcjtV /69x+SbV9SpVM57dJvWIC32CzbAX4K+DyO8ynNLKornVCz42jSXXIzggVP2/3n+VEhl/ C+Jg== X-Gm-Message-State: AOJu0YwGN7CkagUpYDUMSNtbwieKNRitspGsznrLh6U4lLNRkFkBUupH QYnAWqx/3KUC/NO5pomuTCcOJM9HK/KAg7Q8 X-Google-Smtp-Source: AGHT+IHx4O2m5L0IhTWxr44sXPFnIs8WTHi+VoaAAiRKJclnMmNSQRXJWWUOAsaJaVhzqMFUERUGKg== X-Received: by 2002:a17:907:7611:b0:9a5:ebfd:79a3 with SMTP id jx17-20020a170907761100b009a5ebfd79a3mr3606874ejc.29.1693661045874; Sat, 02 Sep 2023 06:24:05 -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 rk17-20020a170907215100b00985ed2f1584sm3381966ejb.187.2023.09.02.06.24.04 for <65699@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 06:24:05 -0700 (PDT) Message-ID: In-Reply-To: References: 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 ‘hardcode-tracker’. 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 0d52058eb4..d550b204c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9619,7 +9619,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 "/" @@ -9627,7 +9627,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) @@ -9636,6 +9636,13 @@ (define-public nautilus #:glib-or-gtk? #t #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'hardcode-tracker + (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). @@ -9646,8 +9653,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)) @@ -9674,18 +9682,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) {