diff options
| author |   Leonardo Hernández Hernández <leohdz172@protonmail.com> | 2022-09-30 21:04:55 -0500 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-10-01 04:14:24 +0100 |
| commit | a1b6c92b768d8ed8f0b34e057c14fda689adf12b (patch) | |
| tree | 3d41ff01aa0ff8c95e5002b1495001f4dde048db /gnome-base | |
| parent | app-admin/bitwarden-desktop-bin: add 2022.9.1 (diff) | |
| download | gentoo-a1b6c92b768d8ed8f0b34e057c14fda689adf12b.tar.gz gentoo-a1b6c92b768d8ed8f0b34e057c14fda689adf12b.tar.bz2 gentoo-a1b6c92b768d8ed8f0b34e057c14fda689adf12b.zip | |
gnome-base/nautilus: fix build with clang
Signed-off-by: Leonardo Hernández Hernández <leohdz172@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27549
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/nautilus/files/43.0-fix-clang-build.patch | 30 | ||||
| -rw-r--r-- | gnome-base/nautilus/nautilus-43.0.ebuild | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/gnome-base/nautilus/files/43.0-fix-clang-build.patch b/gnome-base/nautilus/files/43.0-fix-clang-build.patch new file mode 100644 index 000000000000..ec8fbd90ac1a --- /dev/null +++ b/gnome-base/nautilus/files/43.0-fix-clang-build.patch @@ -0,0 +1,30 @@ +From 68b050ac0f60b1f02767276643cba8eb701f9884 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= + <leohdz172@protonmail.com> +Date: Fri, 30 Sep 2022 17:35:50 -0500 +Subject: [PATCH] fix conflicting types for nautilus_file_get{u,g}id + +when building with clang +--- + src/nautilus-file.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/nautilus-file.h b/src/nautilus-file.h +index 9b0613e98..57cca177f 100644 +--- a/src/nautilus-file.h ++++ b/src/nautilus-file.h +@@ -244,9 +244,9 @@ gboolean nautilus_file_can_get_owner (Nautilu + gboolean nautilus_file_can_set_owner (NautilusFile *file); + gboolean nautilus_file_can_get_group (NautilusFile *file); + gboolean nautilus_file_can_set_group (NautilusFile *file); +-uid_t nautilus_file_get_uid (NautilusFile *file); ++const uid_t nautilus_file_get_uid (NautilusFile *file); + char * nautilus_file_get_owner_name (NautilusFile *file); +-gid_t nautilus_file_get_gid (NautilusFile *file); ++const gid_t nautilus_file_get_gid (NautilusFile *file); + char * nautilus_file_get_group_name (NautilusFile *file); + GList * nautilus_get_user_names (void); + GList * nautilus_get_all_group_names (void); +-- +GitLab + diff --git a/gnome-base/nautilus/nautilus-43.0.ebuild b/gnome-base/nautilus/nautilus-43.0.ebuild index 44ac74e4207e..8fec2d0f8328 100644 --- a/gnome-base/nautilus/nautilus-43.0.ebuild +++ b/gnome-base/nautilus/nautilus-43.0.ebuild @@ -56,6 +56,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/43.0-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc "${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build + "${FILESDIR}"/43.0-fix-clang-build.patch # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/996 ) src_prepare() { |