From 7044c982087e2ab5ce48cd349b2d98df15aafe25 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 8 May 2023 18:09:57 +0800 Subject: [PATCH] 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 Signed-off-by: Khem Raj (cherry picked from commit 0398ebda1188038e95196bd84673ea63a3b89f70) Signed-off-by: Armin Kuster --- ...initialize-GdkDragAction-action-to-0.patch | 47 ------------------- .../{nautilus_44.0.bb => nautilus_44.1.bb} | 3 +- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-initialize-GdkDragAction-action-to-0.patch rename meta-gnome/recipes-gnome/nautilus/{nautilus_44.0.bb => nautilus_44.1.bb} (88%) 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 abe584874c..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-initialize-GdkDragAction-action-to-0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d8f8859369b228d86aeeb043d732b9c60fdce289 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 24 Mar 2023 15:29:04 -0700 -Subject: [PATCH] initialize GdkDragAction action to 0 - -This helps in silencing clang found warning - -autilus-pathbar.c:759:9: error: variable 'action' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] - if (G_VALUE_HOLDS (value, GDK_TYPE_FILE_LIST)) - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1158] -Signed-off-by: Khem Raj ---- - src/nautilus-pathbar.c | 2 +- - src/nautilus-window.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c -index 1b6ea6a..a5ab780 100644 ---- a/src/nautilus-pathbar.c -+++ b/src/nautilus-pathbar.c -@@ -746,7 +746,7 @@ on_drag_motion (GtkDropTarget *target, - gpointer user_data) - { - ButtonData *button_data = user_data; -- GdkDragAction action; -+ GdkDragAction action = 0; - const GValue *value; - graphene_point_t start; - -diff --git a/src/nautilus-window.c b/src/nautilus-window.c -index 30299b1..74c548f 100644 ---- a/src/nautilus-window.c -+++ b/src/nautilus-window.c -@@ -1476,7 +1476,7 @@ extra_drag_value_cb (AdwTabBar *self, - { - NautilusWindowSlot *slot = NAUTILUS_WINDOW_SLOT (adw_tab_page_get_child (page)); - g_autoptr (NautilusFile) file = nautilus_file_get (nautilus_window_slot_get_location (slot)); -- GdkDragAction action; -+ GdkDragAction action = 0; - - if (value == NULL) - { --- -2.40.0 - diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_44.0.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb similarity index 88% rename from meta-gnome/recipes-gnome/nautilus/nautilus_44.0.bb rename to meta-gnome/recipes-gnome/nautilus/nautilus_44.1.bb index e066556177..9c60d15d86 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 def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI += "file://0001-initialize-GdkDragAction-action-to-0.patch" -SRC_URI[archive.sha256sum] = "57b99ebb8e2b9c1512d381e53096188c087b33410d6c52d87a27bd60ee76ac7f" +SRC_URI[archive.sha256sum] = "360802a595e3edbad962c8cea353b62baa8be407513b5162c89c933ca5387aa9" REQUIRED_DISTRO_FEATURES = "x11 opengl"