nautilus: Fix build with clang and drop unused patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2023-03-24 15:55:23 -07:00
parent b5c36abc0f
commit a67da92aa4
3 changed files with 48 additions and 94 deletions

View File

@ -1,94 +0,0 @@
From 76f1625bae95212ec6d4bc1bd1c8ff1232150c48 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 29 Aug 2022 13:14:09 -0700
Subject: [PATCH] Provide parameter prototype for functions without parameter
Fixes build with clang-15 with -Wstrict-prototypes
src/nautilus-toolbar.c:1205:22: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
nautilus_toolbar_new ()
^
void
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/nautilus/-/commit/95d35aedf68f0398a6ee9e0b0af9ce80528fdc22]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/nautilus-file-undo-manager.c | 4 ++--
src/nautilus-list-model.c | 2 +-
src/nautilus-starred-directory.c | 2 +-
src/nautilus-toolbar.c | 2 +-
src/nautilus-view-model.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/nautilus-file-undo-manager.c b/src/nautilus-file-undo-manager.c
index 2a886176f..f2d1eebcf 100644
--- a/src/nautilus-file-undo-manager.c
+++ b/src/nautilus-file-undo-manager.c
@@ -258,13 +258,13 @@ nautilus_file_undo_manager_get_state (void)
gboolean
-nautilus_file_undo_manager_is_operating ()
+nautilus_file_undo_manager_is_operating (void)
{
return undo_singleton->is_operating;
}
NautilusFileUndoManager *
-nautilus_file_undo_manager_get ()
+nautilus_file_undo_manager_get (void)
{
return undo_singleton;
}
diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c
index 7e2aeeeee..741007105 100644
--- a/src/nautilus-list-model.c
+++ b/src/nautilus-list-model.c
@@ -1625,7 +1625,7 @@ nautilus_list_model_get_drag_view (NautilusListModel *model,
}
GtkTargetList *
-nautilus_list_model_get_drag_target_list ()
+nautilus_list_model_get_drag_target_list (void)
{
GtkTargetList *target_list;
diff --git a/src/nautilus-starred-directory.c b/src/nautilus-starred-directory.c
index fd41418a4..07ed62693 100644
--- a/src/nautilus-starred-directory.c
+++ b/src/nautilus-starred-directory.c
@@ -556,7 +556,7 @@ nautilus_starred_directory_class_init (NautilusFavoriteDirectoryClass *klass)
}
NautilusFavoriteDirectory *
-nautilus_starred_directory_new ()
+nautilus_starred_directory_new (void)
{
NautilusFavoriteDirectory *self;
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index 5fe4e63a4..15a696827 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -1202,7 +1202,7 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass)
}
GtkWidget *
-nautilus_toolbar_new ()
+nautilus_toolbar_new (void)
{
return g_object_new (NAUTILUS_TYPE_TOOLBAR,
NULL);
diff --git a/src/nautilus-view-model.c b/src/nautilus-view-model.c
index 84c40302d..2935809ae 100644
--- a/src/nautilus-view-model.c
+++ b/src/nautilus-view-model.c
@@ -190,7 +190,7 @@ compare_data_func (gconstpointer a,
}
NautilusViewModel *
-nautilus_view_model_new ()
+nautilus_view_model_new (void)
{
return g_object_new (NAUTILUS_TYPE_VIEW_MODEL, NULL);
}

View File

@ -0,0 +1,47 @@
From d8f8859369b228d86aeeb043d732b9c60fdce289 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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

View File

@ -26,6 +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"
REQUIRED_DISTRO_FEATURES = "x11 opengl"