summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-08-29 13:33:02 -0700
committerKhem Raj <raj.khem@gmail.com>2022-08-30 00:14:58 -0700
commit2d691b665ba708df0664983c31c1c1930d3bc485 (patch)
tree026cabd487cc29e97e32358997f2a515e295ea94
parente2b1b060b038ce26578e1672a1211b948f789bd6 (diff)
downloadmeta-openembedded-2d691b665ba708df0664983c31c1c1930d3bc485.tar.gz
nautilus: Backport a patch to fix build with clang-15
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch94
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb1
2 files changed, 95 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch
new file mode 100644
index 0000000000..6c743d8ce7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-Provide-parameter-prototype-for-functions-without-pa.patch
@@ -0,0 +1,94 @@
1From 76f1625bae95212ec6d4bc1bd1c8ff1232150c48 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 29 Aug 2022 13:14:09 -0700
4Subject: [PATCH] Provide parameter prototype for functions without parameter
5
6Fixes build with clang-15 with -Wstrict-prototypes
7
8src/nautilus-toolbar.c:1205:22: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
9nautilus_toolbar_new ()
10 ^
11 void
12
13Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/nautilus/-/commit/95d35aedf68f0398a6ee9e0b0af9ce80528fdc22]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 src/nautilus-file-undo-manager.c | 4 ++--
17 src/nautilus-list-model.c | 2 +-
18 src/nautilus-starred-directory.c | 2 +-
19 src/nautilus-toolbar.c | 2 +-
20 src/nautilus-view-model.c | 2 +-
21 5 files changed, 6 insertions(+), 6 deletions(-)
22
23diff --git a/src/nautilus-file-undo-manager.c b/src/nautilus-file-undo-manager.c
24index 2a886176f..f2d1eebcf 100644
25--- a/src/nautilus-file-undo-manager.c
26+++ b/src/nautilus-file-undo-manager.c
27@@ -258,13 +258,13 @@ nautilus_file_undo_manager_get_state (void)
28
29
30 gboolean
31-nautilus_file_undo_manager_is_operating ()
32+nautilus_file_undo_manager_is_operating (void)
33 {
34 return undo_singleton->is_operating;
35 }
36
37 NautilusFileUndoManager *
38-nautilus_file_undo_manager_get ()
39+nautilus_file_undo_manager_get (void)
40 {
41 return undo_singleton;
42 }
43diff --git a/src/nautilus-list-model.c b/src/nautilus-list-model.c
44index 7e2aeeeee..741007105 100644
45--- a/src/nautilus-list-model.c
46+++ b/src/nautilus-list-model.c
47@@ -1625,7 +1625,7 @@ nautilus_list_model_get_drag_view (NautilusListModel *model,
48 }
49
50 GtkTargetList *
51-nautilus_list_model_get_drag_target_list ()
52+nautilus_list_model_get_drag_target_list (void)
53 {
54 GtkTargetList *target_list;
55
56diff --git a/src/nautilus-starred-directory.c b/src/nautilus-starred-directory.c
57index fd41418a4..07ed62693 100644
58--- a/src/nautilus-starred-directory.c
59+++ b/src/nautilus-starred-directory.c
60@@ -556,7 +556,7 @@ nautilus_starred_directory_class_init (NautilusFavoriteDirectoryClass *klass)
61 }
62
63 NautilusFavoriteDirectory *
64-nautilus_starred_directory_new ()
65+nautilus_starred_directory_new (void)
66 {
67 NautilusFavoriteDirectory *self;
68
69diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
70index 5fe4e63a4..15a696827 100644
71--- a/src/nautilus-toolbar.c
72+++ b/src/nautilus-toolbar.c
73@@ -1202,7 +1202,7 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass)
74 }
75
76 GtkWidget *
77-nautilus_toolbar_new ()
78+nautilus_toolbar_new (void)
79 {
80 return g_object_new (NAUTILUS_TYPE_TOOLBAR,
81 NULL);
82diff --git a/src/nautilus-view-model.c b/src/nautilus-view-model.c
83index 84c40302d..2935809ae 100644
84--- a/src/nautilus-view-model.c
85+++ b/src/nautilus-view-model.c
86@@ -190,7 +190,7 @@ compare_data_func (gconstpointer a,
87 }
88
89 NautilusViewModel *
90-nautilus_view_model_new ()
91+nautilus_view_model_new (void)
92 {
93 return g_object_new (NAUTILUS_TYPE_VIEW_MODEL, NULL);
94 }
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb
index f9c2ed020b..a0f928ce25 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb
@@ -21,6 +21,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check
21def gnome_verdir(v): 21def gnome_verdir(v):
22 return oe.utils.trim_version(v, 1) 22 return oe.utils.trim_version(v, 1)
23 23
24SRC_URI += " file://0001-Provide-parameter-prototype-for-functions-without-pa.patch"
24SRC_URI[archive.sha256sum] = "99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2" 25SRC_URI[archive.sha256sum] = "99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2"
25 26
26REQUIRED_DISTRO_FEATURES = "x11" 27REQUIRED_DISTRO_FEATURES = "x11"