| 1 |
commit: a1b6c92b768d8ed8f0b34e057c14fda689adf12b |
| 2 |
Author: Leonardo Hernández Hernández <leohdz172 <AT> protonmail <DOT> com> |
| 3 |
AuthorDate: Sat Oct 1 02:04:55 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 1 03:14:24 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b6c92b |
| 7 |
|
| 8 |
gnome-base/nautilus: fix build with clang |
| 9 |
|
| 10 |
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> protonmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/27549 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../nautilus/files/43.0-fix-clang-build.patch | 30 ++++++++++++++++++++++ |
| 15 |
gnome-base/nautilus/nautilus-43.0.ebuild | 1 + |
| 16 |
2 files changed, 31 insertions(+) |
| 17 |
|
| 18 |
diff --git a/gnome-base/nautilus/files/43.0-fix-clang-build.patch b/gnome-base/nautilus/files/43.0-fix-clang-build.patch |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..ec8fbd90ac1a |
| 21 |
--- /dev/null |
| 22 |
+++ b/gnome-base/nautilus/files/43.0-fix-clang-build.patch |
| 23 |
@@ -0,0 +1,30 @@ |
| 24 |
+From 68b050ac0f60b1f02767276643cba8eb701f9884 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= |
| 26 |
+ <leohdz172@××××××××××.com> |
| 27 |
+Date: Fri, 30 Sep 2022 17:35:50 -0500 |
| 28 |
+Subject: [PATCH] fix conflicting types for nautilus_file_get{u,g}id |
| 29 |
+ |
| 30 |
+when building with clang |
| 31 |
+--- |
| 32 |
+ src/nautilus-file.h | 4 ++-- |
| 33 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/src/nautilus-file.h b/src/nautilus-file.h |
| 36 |
+index 9b0613e98..57cca177f 100644 |
| 37 |
+--- a/src/nautilus-file.h |
| 38 |
++++ b/src/nautilus-file.h |
| 39 |
+@@ -244,9 +244,9 @@ gboolean nautilus_file_can_get_owner (Nautilu |
| 40 |
+ gboolean nautilus_file_can_set_owner (NautilusFile *file); |
| 41 |
+ gboolean nautilus_file_can_get_group (NautilusFile *file); |
| 42 |
+ gboolean nautilus_file_can_set_group (NautilusFile *file); |
| 43 |
+-uid_t nautilus_file_get_uid (NautilusFile *file); |
| 44 |
++const uid_t nautilus_file_get_uid (NautilusFile *file); |
| 45 |
+ char * nautilus_file_get_owner_name (NautilusFile *file); |
| 46 |
+-gid_t nautilus_file_get_gid (NautilusFile *file); |
| 47 |
++const gid_t nautilus_file_get_gid (NautilusFile *file); |
| 48 |
+ char * nautilus_file_get_group_name (NautilusFile *file); |
| 49 |
+ GList * nautilus_get_user_names (void); |
| 50 |
+ GList * nautilus_get_all_group_names (void); |
| 51 |
+-- |
| 52 |
+GitLab |
| 53 |
+ |
| 54 |
|
| 55 |
diff --git a/gnome-base/nautilus/nautilus-43.0.ebuild b/gnome-base/nautilus/nautilus-43.0.ebuild |
| 56 |
index 44ac74e4207e..8fec2d0f8328 100644 |
| 57 |
--- a/gnome-base/nautilus/nautilus-43.0.ebuild |
| 58 |
+++ b/gnome-base/nautilus/nautilus-43.0.ebuild |
| 59 |
@@ -56,6 +56,7 @@ PDEPEND=" |
| 60 |
PATCHES=( |
| 61 |
"${FILESDIR}"/43.0-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc |
| 62 |
"${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build |
| 63 |
+ "${FILESDIR}"/43.0-fix-clang-build.patch # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/996 |
| 64 |
) |
| 65 |
|
| 66 |
src_prepare() { |
Archives