summaryrefslogtreecommitdiff
path: root/gnome-base
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-01 07:10:13 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-10-01 07:10:13 +0100
commit42ff81a7480d9bba317b42fcca03b46da2a622ce (patch)
tree5a0ccbe2b71a4ec6c160b568160999a6afe316de /gnome-base
parent290844d409ace33d948956aec3c542ea6f4a7b13 (diff)
gentoo auto-resync : 01:10:2022 - 07:10:12
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/Manifest.gzbin5037 -> 5040 bytes
-rw-r--r--gnome-base/nautilus/Manifest3
-rw-r--r--gnome-base/nautilus/files/43.0-fix-clang-build.patch30
-rw-r--r--gnome-base/nautilus/nautilus-43.0.ebuild1
4 files changed, 33 insertions, 1 deletions
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 8aaf1994fcef..279cdee16dae 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
Binary files differ
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 4e6e55d27db7..bf5fd4a44940 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,9 +1,10 @@
AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
AUX 42.0-optional-gstreamer.patch 1590 BLAKE2B eb251337ef8f2cba7b0fa9e1643c1155aa36bbc9234f4c5bf6baddd7f91d69e2713172685687a0bbf8fc646a97df857cfbce2a73768beb4eb5dae32ace893d07 SHA512 5f90d946c7bea63da2ca20397b0606747383b781dc972051082596d4fd0522a22c0d40440129e41ff4faeb5e9fcdfc5abb14318a9dade5b0343003bf86c7e339
AUX 43.0-docs-build.patch 1086 BLAKE2B 449456236c807c28905698c5fc0f4b40b26ab300f40308d65b2889fa5f37ca8225eb564e682b5055b060529903d5c68a8a620d23ff8941229da5465918fa6b1c SHA512 f5847babcaee256c6718d499070029f3582a90f9fcb472c91d53d67fec63c0ac624dd6282ba81909f742244da5c715ba1b05b740c1ad187a75bd0b92a7f4d36e
+AUX 43.0-fix-clang-build.patch 1809 BLAKE2B 75b4bbaec1781ed8d89c7c1dcd24ec2b76b8967ef59d0acccded31e0f982d5d71b2f6d4542f94316e7139c461a1574eb3f7894adf7aeeccf8a593484f4e27b3c SHA512 023a9ff1ec8e4b376c4cd2aaa08c9873768dec0a69cf1217e73e744dba90f08cef4ca5bc20aa4b903a0f7505cdabe79dc6f681258a72c7d7704fe90d8921bb09
AUX 43.0-optional-gstreamer.patch 1269 BLAKE2B 2a4599771977e44f9e1b25d2334f838a2016d1bfd6eea48c004ce410442ec12152e69efec389b6d373d1e187f00b78ac3fd617f4992e90acaf69a5a3325b7a2d SHA512 7f578859a3c8100f4d8783851b91a40c1c3d2d702851772e91bb08bade7802271ffa0524861e968004c6ea6450060da0ca6cf917808c4542ad5853bcb7d3ae45
DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
DIST nautilus-43.0.tar.xz 3165200 BLAKE2B 460df75af37c1c038bbbc9442d061a45ef3fbf09b2af016cd8340674c6eddf59b37a92011cf6e46d84168c859d4cd543d95fe140b322a00e2866bfdf5421a909 SHA512 c880125c2339be02852470e45cd4d589470e0df7723acc44b80df35c18cb1375c5f85cb46c7e53efbab1b51eedb4fd51ffa455773d4913d44c59070dafa22b49
EBUILD nautilus-42.2.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
-EBUILD nautilus-43.0.ebuild 3212 BLAKE2B f53ce988a1b2f124f64fbf3d67713ab55f20b934e3996c084dce895b88018a2efda0f7477c69ffd1c0a45e0503572d169ea71a2942035a0281e6885a55a5937f SHA512 c458b9cd13880c81b310fbbb480bf204749375f49e5152b34627609d54caed682599eebbbebdcdb0a72afbf8744501db79a49de55513d72a6af887133e5012a2
+EBUILD nautilus-43.0.ebuild 3317 BLAKE2B d355f6b0ed01f6962e9beef61209a2467e3f74db4fddfe86a88d6d0487597fbbaa65bd5d20eac681791d8b3509c03ac6104a28ce6133bec9f68fcd1b9f51231a SHA512 cf49fed62950e4fd2abe73cd8ac79c5fc13ebc8b450e4f7f742e182bacac91ecec0f1bb6626843421c294115610878d388946209ab16790c0b2797acf05ff79b
MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
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() {