From patchwork Mon Nov 11 06:16:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 70219 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 BB69627BBEA; Mon, 11 Nov 2024 06:23:59 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 0B65A27BBE2 for ; Mon, 11 Nov 2024 06:23:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tANpP-0001uk-AB; Mon, 11 Nov 2024 01:23:11 -0500 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 1tANpI-0001sG-Am for guix-patches@gnu.org; Mon, 11 Nov 2024 01:23:06 -0500 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 1tANpI-00072c-1F for guix-patches@gnu.org; Mon, 11 Nov 2024 01:23:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=gX7YfJT2qpc0FgWupOLaWgrGwPxTCfmDbM5KzPnSyeQ=; b=Km74OBSZlYIkW5kY3Rf/2pRj1dk/ng7N/udl+WInJPgssvX21XUAqEBWBsYmMl8+6F0C+VuviEbyf7pHfHco6kVV0zWUJffl5WUwSGImZfC+Vu9Ecqe5YBCt/hgjh7YQ3MgwyZ2T4Sy78v5UbyNUqK2Sk1YwcbzxmRTEy78+D46V/uvzw7MMma/Gt1HWahKYR+4d5mHIQAZsNlBWfKuy/wXYnnQLpvdoGD4o5/0v5aPRgYJhXYY2zhsOtwOR00QNqK02Zdxnm108TcSxqMYWJsugVbp8F17uN6XVE1M0ap+tBN/uxzW3pB0snIW5Cx36BvueFxT+q2YfYnnWdrnXaw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tANpH-00069T-Qb; Mon, 11 Nov 2024 01:23:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74306] [PATCH gnome-team 04/44] gnu: nautilus: Update to 46.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 11 Nov 2024 06:23:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74306@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 74306-submit@debbugs.gnu.org id=B74306.173130615623456 (code B ref 74306); Mon, 11 Nov 2024 06:23:03 +0000 Received: (at 74306) by debbugs.gnu.org; 11 Nov 2024 06:22:36 +0000 Received: from localhost ([127.0.0.1]:57592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANop-00066B-SO for submit@debbugs.gnu.org; Mon, 11 Nov 2024 01:22:36 -0500 Received: from mail-oi1-f181.google.com ([209.85.167.181]:49524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANon-00065x-IC for 74306@debbugs.gnu.org; Mon, 11 Nov 2024 01:22:34 -0500 Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3e786167712so2579028b6e.3 for <74306@debbugs.gnu.org>; Sun, 10 Nov 2024 22:22:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731306092; x=1731910892; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gX7YfJT2qpc0FgWupOLaWgrGwPxTCfmDbM5KzPnSyeQ=; b=MzJghH/vi0QqNsxhTljaBwnOdgTsvGy2OpOD6vzycIifnss7qcCqKenjUOpM6Ce/VY 2dGMLKEr1y+6IFa1cHq9DmgBMm7xMHU3zHRyNSgqDao5D6e+EJnZyS0aBKLDHIL+UzUH Jwjmu222iIA5kMXU5gT0Lcg4o1apFW4MxY1+thDl6poKgeuITWxuI+7EH3L843eWj/GE Il6eO4MEekUsdvG/K2cFxUQyxuEBUSIFHEdqNblHUK/E0VEuJD05Jq0DHJeiyMOsCvQ5 Q+XdCPyKdwSGgmoWxWP7A5zrvWVwORYEXvTqsUNBcJ8i4W0wGQ+8+zC5+Ee25p11NSwO uyOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731306092; x=1731910892; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gX7YfJT2qpc0FgWupOLaWgrGwPxTCfmDbM5KzPnSyeQ=; b=di4jyoqEG2IW9DhtIa0aVAy+PEBSIXuSmvtE9IYfL+jD/e7cKKyfjPUQEOlXODZdpn JfM2O6YJtxB7BlAizP58os+WfyQKl0vRDS02aCQR+dPXfb1w78+ix8wM3itLC9bB9mtQ 1Jg4aDE0bTFjUayt81+p9jMZG2gqLWwCKoNCaMGZHpX5alhjmW9d2hffqkizgmi4KejM O//Vlvk4T0tkw4N8jVYz28PgEfyknFYk9m9X1EhyerHBPXph2ra0ssFYio65AQNs4SxN 41Nf0oqBgx6pcQUvvKRBVCijtU44ia67ibHNGgrvyk3FQtsMbhNEPdLkLO3AlMOFPYNl pjdw== X-Gm-Message-State: AOJu0YzChOqsmRd0jFkHfiblWPPvjygRTN4aiOaAn/rq2pxr6sWr04k9 TnKf77HT0rKNwIXe45FT68CjTOrWdJDRlS6kArXhVHxsyp6TH673f88YBQ== X-Google-Smtp-Source: AGHT+IH5p0IMc8uodOStcIk0g3uLyiFuzavLX+rA5MqnnO2qzC16vP0hw8M0SJO0kh6xQtHxab6c3A== X-Received: by 2002:a05:6808:1591:b0:3e5:cf3b:4fc5 with SMTP id 5614622812f47-3e794669a12mr9467764b6e.15.1731306092045; Sun, 10 Nov 2024 22:21:32 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7f41f5ea0d5sm7782996a12.47.2024.11.10.22.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 22:21:31 -0800 (PST) From: Maxim Cournoyer Date: Mon, 11 Nov 2024 15:16:47 +0900 Message-ID: <6323ef3d44a0b0d2345ab6e14b9e78ede66dbbce.1731303037.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 46.1. [phases] {patch-commands}: New phase. [inputs]: Add bash-minimal. * gnu/packages/patches/nautilus-extension-search-path.patch: Rebase patch. Change-Id: I9ce51dbe488336d52fabec0a0a7f3ca2803731ac --- gnu/packages/gnome.scm | 13 +++- .../nautilus-extension-search-path.patch | 77 ++++++++----------- 2 files changed, 40 insertions(+), 50 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f907140574..3000b8193e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9976,7 +9976,7 @@ (define-public tracker-miners (define-public nautilus (package (name "nautilus") - (version "44.3.1") + (version "46.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9984,7 +9984,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "05njbaq98y00n1z1smg1pdip3shr84q8a10wssm8sjbv7sirwj75")) + "1mvvi11pz9pn8j9vx5d8j59xx8096wkavizkwglr4byp3pgmy6nc")) (patches (search-patches "nautilus-extension-search-path.patch")))) (build-system meson-build-system) @@ -9993,6 +9993,12 @@ (define-public nautilus #:glib-or-gtk? #t #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-commands + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/nautilus-autorun-software.c" + (("g_file_new_for_path \\(\"/bin/sh\");") + (format #f "g_file_new_for_path (~s);" + (search-input-file inputs "bin/sh")))))) (add-after 'unpack 'patch-tracker3-command (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/nautilus-tag-manager.c" @@ -10031,7 +10037,8 @@ (define-public nautilus python python-pygobject)) (inputs - (list dconf + (list bash-minimal + dconf gexiv2 gvfs exempi diff --git a/gnu/packages/patches/nautilus-extension-search-path.patch b/gnu/packages/patches/nautilus-extension-search-path.patch index 1394956315..789addc918 100644 --- a/gnu/packages/patches/nautilus-extension-search-path.patch +++ b/gnu/packages/patches/nautilus-extension-search-path.patch @@ -1,62 +1,45 @@ Allow Nautilus to search for extensions in the directories listed in $NAUTILUS_EXTENSION_PATH. -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 +diff --git a/src/nautilus-module.c b/src/nautilus-module.c +index 3f1051ba5..030a898d1 100644 +--- a/src/nautilus-module.c ++++ b/src/nautilus-module.c +@@ -219,6 +219,13 @@ 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); ++ loaded = g_hash_table_new (g_str_hash, g_str_equal); - if (dir) -@@ -232,16 +240,24 @@ load_module_dir (const char *dirname) + g_autoptr (GStrvBuilder) installed_module_name_builder = g_strv_builder_new (); + dir = g_dir_open (dirname, 0, NULL); +@@ -231,12 +238,18 @@ 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, 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; -+ -+ 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); - } - -@@ -278,10 +294,24 @@ nautilus_module_setup (void) + 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); + } + } +@@ -277,9 +290,24 @@ nautilus_module_setup (void) if (!initialized) { @@ -64,20 +47,20 @@ Index: nautilus-44.2/src/nautilus-module.c initialized = TRUE; load_module_dir (NAUTILUS_EXTENSIONDIR); - -+ /* Load additional modules from the user-provided search path. */ -+ extension_path = g_getenv ("NAUTILUS_EXTENSION_PATH"); -+ if (extension_path) -+ { -+ char **extension_dirs, **d; + -+ extension_dirs = g_strsplit (extension_path, ":", -1); -+ for (d = extension_dirs; d != NULL && *d != NULL; d++) -+ load_module_dir (*d); ++ /* Load additional modules from the user-provided search path. */ ++ extension_path = g_getenv ("NAUTILUS_EXTENSION_PATH"); ++ if (extension_path) ++ { ++ char **extension_dirs, **d; ++ ++ extension_dirs = g_strsplit (extension_path, ":", -1); ++ for (d = extension_dirs; d != NULL && *d != NULL; d++) ++ load_module_dir (*d); + -+ g_strfreev (extension_dirs); -+ } ++ g_strfreev (extension_dirs); ++ } + - eel_debug_call_at_shutdown (free_module_objects); } } +