From patchwork Mon Mar 13 21:04:03 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: 47956 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 020C516E9E; Tue, 14 Mar 2023 05:11:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 A253316E83 for ; Tue, 14 Mar 2023 05:11:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbwwD-0007JD-UW; Tue, 14 Mar 2023 01:11:05 -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 1pbwwB-0007Hp-0f for guix-patches@gnu.org; Tue, 14 Mar 2023 01:11:03 -0400 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 1pbwwA-00040j-JA for guix-patches@gnu.org; Tue, 14 Mar 2023 01:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbwwA-0004wB-41 for guix-patches@gnu.org; Tue, 14 Mar 2023 01:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62175] [PATCH 2/2] gnu: nautilus: Update to 43.2. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 05:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62175 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62175@debbugs.gnu.org Received: via spool by 62175-submit@debbugs.gnu.org id=B62175.167877065718961 (code B ref 62175); Tue, 14 Mar 2023 05:11:02 +0000 Received: (at 62175) by debbugs.gnu.org; 14 Mar 2023 05:10:57 +0000 Received: from localhost ([127.0.0.1]:36019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbww4-0004ve-Ay for submit@debbugs.gnu.org; Tue, 14 Mar 2023 01:10:56 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:36504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbww2-0004vS-MD for 62175@debbugs.gnu.org; Tue, 14 Mar 2023 01:10:55 -0400 Received: by mail-ed1-f68.google.com with SMTP id da10so57325876edb.3 for <62175@debbugs.gnu.org>; Mon, 13 Mar 2023 22:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678770649; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=VrU4HFL0+NyY08z4s1FEWjUwwhnv24j85pKg6I8x1vw=; b=bpnkRng/BEeSR2ts0QrNMFPYdAmjMgOXpZIdYZ2Z5O2hMtcDNXISkVpZeNRG9hsgfa Dg6RL350UdKwsUxIbg5rFYEJlBsSXvXgXF4sF44dfMRLcvQIhx34rsHG4FBBoa+G9WZj dFZVsX7tJfJo8heyF1PslTbXTzWZkRYTg3KKVFu175t4tMv/gWOlYUNNrXxIoQN6rr66 OvkRqAGPd4NQ2pnVtMhpNHpbxVlYpPJ7R2sZ/F4kVyd2S1OU3Y528AbFbyybOmi7+f7X 4PqQcwi1yVwhnkeM6daO5nqzqIZoFD8Mwc979Wlrq4XnnHIAMW2usNj7O2lLMlJUSypn Vr7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678770649; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VrU4HFL0+NyY08z4s1FEWjUwwhnv24j85pKg6I8x1vw=; b=Y040Q9BFW20ymZElSJCBDCv9Qe+qIjRQMYt2S5B7ThchltENP2NV5T1HvcO9s6md6D Kj0tuN2oYjjUimBoahHo/Pqb/KXOIR78KfrGXBZfubWB4A22sj0fw/llqN5xJXOJX7PJ hXktERObIIPVFDusexbQAqXaNp6jidezi+0mJMXuZHtwP4RyQO9J/saqVui78cI9NQIs ZUJsEpSZFONyq2ZiSlZZs5bjr8NFg3zzM9L8omkID2p8fcH1OFVFB60k20sINzESgn6h ohQEWovRj3YRb9neEaadC6bm7AiRHxUF+JYizQuTcgBLuPKAlj2kjXsdh9CE1c+M9lbD 18ZQ== X-Gm-Message-State: AO0yUKVYX7MvtvykOUF4iZgBYbSyiGM8TB2i9I4yke2snt4huvSY4pPO 3TfcPp605FhkkjtLnWvgzRGT8NhU/wvzEQ== X-Google-Smtp-Source: AK7set/49kzrwQhFJVsTWi1yA2e6SiZGAxeIokcue/DjP65PYBwLkfEIO7zbWgNXhLJdROVYv00ZEw== X-Received: by 2002:a17:907:8d1b:b0:889:1eb1:7517 with SMTP id tc27-20020a1709078d1b00b008891eb17517mr1148133ejc.30.1678770648114; Mon, 13 Mar 2023 22:10:48 -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 x20-20020a1709064a9400b0092b86d41dbasm584086eju.114.2023.03.13.22.10.47 for <62175@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 22:10:47 -0700 (PDT) From: Liliana Marie Prikler Date: Mon, 13 Mar 2023 22:04:03 +0100 MIME-Version: 1.0 Message-ID: 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 43.2. [arguments]: Adjust ‘skip-gtk-update-icon-cache’ phase accordingly. [inputs]: Replace glib with glib-next, gtk+ with gtk and libhandy with libadwaita. * gnu/packages/patches/nautilus-extension-search-path.patch: Adjust accordingly. --- gnu/packages/gnome.scm | 16 ++--- .../nautilus-extension-search-path.patch | 58 +++++++++---------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 49991f9f0c..19a91b4d96 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9899,7 +9899,7 @@ (define-public tracker-miners (define-public nautilus (package (name "nautilus") - (version "42.2") + (version "43.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9907,7 +9907,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr")) + "1q7dmwvyc3adpdh767fqnmaw7hsr8s5iv6p4kh11nlamljkrlsm8")) (patches (search-patches "nautilus-extension-search-path.patch")))) (build-system meson-build-system) @@ -9926,8 +9926,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)) @@ -9948,24 +9949,25 @@ (define-public nautilus (inputs (list dconf gexiv2 + glib-next gvfs exempi gnome-desktop 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 ;; 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..07170b12a4 100644 --- a/gnu/packages/patches/nautilus-extension-search-path.patch +++ b/gnu/packages/patches/nautilus-extension-search-path.patch @@ -1,54 +1,54 @@ 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-43.2/src/nautilus-module.c +=================================================================== +--- nautilus-43.2.orig/src/nautilus-module.c ++++ nautilus-43.2/src/nautilus-module.c +@@ -220,8 +220,13 @@ static void load_module_dir (const char *dirname) { GDir *dir; + static GHashTable *loaded = NULL; -+ ++ g_autoptr (GStrvBuilder) installed_module_name_builder = NULL; + +- g_autoptr (GStrvBuilder) installed_module_name_builder = g_strv_builder_new (); + if (loaded == NULL) + loaded = g_hash_table_new (g_str_hash, g_str_equal); - ++ ++ installed_module_name_builder = g_strv_builder_new (); 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,13 +237,20 @@ 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 ocur 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 +290,24 @@ nautilus_module_setup (void) if (!initialized) {