From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 52E21158095 for ; Sat, 1 Oct 2022 03:16:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA07BE0A7C; Sat, 1 Oct 2022 03:16:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9350BE0A7C for ; Sat, 1 Oct 2022 03:16:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A22AB340FF6 for ; Sat, 1 Oct 2022 03:16:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18602599 for ; Sat, 1 Oct 2022 03:16:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1664594064.a1b6c92b768d8ed8f0b34e057c14fda689adf12b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/nautilus/files/43.0-fix-clang-build.patch gnome-base/nautilus/nautilus-43.0.ebuild X-VCS-Directories: gnome-base/nautilus/files/ gnome-base/nautilus/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a1b6c92b768d8ed8f0b34e057c14fda689adf12b X-VCS-Branch: master Date: Sat, 1 Oct 2022 03:16:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0f98b170-a9db-4692-9e00-689dfcd6f258 X-Archives-Hash: 0c02f0c8ffb0838d3ee3d27ed69c3599 commit: a1b6c92b768d8ed8f0b34e057c14fda689adf12b Author: Leonardo Hernández Hernández protonmail com> AuthorDate: Sat Oct 1 02:04:55 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 1 03:14:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b6c92b gnome-base/nautilus: fix build with clang Signed-off-by: Leonardo Hernández Hernández protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/27549 Signed-off-by: Sam James gentoo.org> .../nautilus/files/43.0-fix-clang-build.patch | 30 ++++++++++++++++++++++ gnome-base/nautilus/nautilus-43.0.ebuild | 1 + 2 files changed, 31 insertions(+) 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?= + +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() {