summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-05-08 18:09:57 +0800
committerArmin Kuster <akuster808@gmail.com>2023-05-28 16:32:35 -0400
commit7044c982087e2ab5ce48cd349b2d98df15aafe25 (patch)
tree88b05638674bdd15882e9efc694bdddc3d954052
parentf074fffb73df1066dbeb1afa77497ff964c603c2 (diff)
downloadmeta-openembedded-7044c982087e2ab5ce48cd349b2d98df15aafe25.tar.gz
nautilus: upgrade 44.0 -> 44.1
0001-initialize-GdkDragAction-action-to-0.patch removed since it's included in 44.1 Changelog: ========== * Resolve some crashes * Visual bugfixes: - Tweak style colors in view items - Show custom emblems from extensions again - Relayout SELinux property row - Flip switches correctly * Other bugfixes: - Disable some actions when not useful - Fix dead characters handling in batch rename dialog - Fix crashes when rapidly opening and closing windows - Prevent location change when autofs timeouts - Fix issues with translations in libadwaita widgets - Drop workarounds for fixed GTK bugs - Fix other issues * Enhancements: - Dismiss toast on undo - Select right items after some operations - Paste into expanded folders - Allow extraction of .tar.zst and .zstd archives - Performance optimization * Translation updates Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 0398ebda1188038e95196bd84673ea63a3b89f70) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus/0001-initialize-GdkDragAction-action-to-0.patch47
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb (renamed from meta-gnome/recipes-gnome/nautilus/nautilus_44.0.bb)3
2 files changed, 1 insertions, 49 deletions
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-initialize-GdkDragAction-action-to-0.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-initialize-GdkDragAction-action-to-0.patch
deleted file mode 100644
index abe584874..000000000
--- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-initialize-GdkDragAction-action-to-0.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From d8f8859369b228d86aeeb043d732b9c60fdce289 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 24 Mar 2023 15:29:04 -0700
4Subject: [PATCH] initialize GdkDragAction action to 0
5
6This helps in silencing clang found warning
7
8autilus-pathbar.c:759:9: error: variable 'action' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
9 if (G_VALUE_HOLDS (value, GDK_TYPE_FILE_LIST))
10 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11
12Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1158]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 src/nautilus-pathbar.c | 2 +-
16 src/nautilus-window.c | 2 +-
17 2 files changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
20index 1b6ea6a..a5ab780 100644
21--- a/src/nautilus-pathbar.c
22+++ b/src/nautilus-pathbar.c
23@@ -746,7 +746,7 @@ on_drag_motion (GtkDropTarget *target,
24 gpointer user_data)
25 {
26 ButtonData *button_data = user_data;
27- GdkDragAction action;
28+ GdkDragAction action = 0;
29 const GValue *value;
30 graphene_point_t start;
31
32diff --git a/src/nautilus-window.c b/src/nautilus-window.c
33index 30299b1..74c548f 100644
34--- a/src/nautilus-window.c
35+++ b/src/nautilus-window.c
36@@ -1476,7 +1476,7 @@ extra_drag_value_cb (AdwTabBar *self,
37 {
38 NautilusWindowSlot *slot = NAUTILUS_WINDOW_SLOT (adw_tab_page_get_child (page));
39 g_autoptr (NautilusFile) file = nautilus_file_get (nautilus_window_slot_get_location (slot));
40- GdkDragAction action;
41+ GdkDragAction action = 0;
42
43 if (value == NULL)
44 {
45--
462.40.0
47
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_44.0.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb
index e06655617..9c60d15d8 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_44.0.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb
@@ -26,8 +26,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check
26def gnome_verdir(v): 26def gnome_verdir(v):
27 return oe.utils.trim_version(v, 1) 27 return oe.utils.trim_version(v, 1)
28 28
29SRC_URI += "file://0001-initialize-GdkDragAction-action-to-0.patch" 29SRC_URI[archive.sha256sum] = "360802a595e3edbad962c8cea353b62baa8be407513b5162c89c933ca5387aa9"
30SRC_URI[archive.sha256sum] = "57b99ebb8e2b9c1512d381e53096188c087b33410d6c52d87a27bd60ee76ac7f"
31 30
32REQUIRED_DISTRO_FEATURES = "x11 opengl" 31REQUIRED_DISTRO_FEATURES = "x11 opengl"
33 32