gentoo auto-resync : 16:12:2024 - 02:01:58

3 files changed, 43 insertions, 3 deletions

diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index b08e838004a2..10ada149eef7 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -1,3 +1,4 @@
+AUX mtpfs-1.1-c23-fix.patch 1032 BLAKE2B 0c189e823a18eae2304f2ee6a87613ac375c9174805ab0bb4c28cba6a4bcb6f31da951013f30845f5537b0f52a16b7d835fb48adb4ae28129f3cf880cbc3e7a0 SHA512 ae51ab4f1002a32d725967d87954fe2134ce2738c460f83fb3fbbeaaca7d65c020c3e76e76392ee6720c337180a3baffad7f84ff32e90d955406fc1257e6bc8a
 AUX mtpfs-1.1-deprecated_lock_init.patch 803 BLAKE2B 1e7e1cd45cc14ffd5300583f386bc2ff1199e9086efa148813f6b03fdd4254cff4b8136d5537dfbd9d8262cc1f17fdb9a0ec2811951a346d59444715b138f3a4 SHA512 d93a2fc04b4d09de89b4227a05d88f4a1d139098cd50bbd6970c746c090b44600572682721b48c5a59ac62f9584592aad0e6c17dfd6740f98e372346457620c7
 AUX mtpfs-1.1-fix-mutex-crash.patch 2115 BLAKE2B 13e74f735cf415d3b8a1139244d4c8f90a4d7d4482cda4de732ba6141e5988b5bd04faf29c8855897469f7e221414dd042be7042ff6c0a1349eec63c76df417c SHA512 800e1dd3d2b76503ee7ba03bbdce8cd43c6a64b4444d3f2f9b49e155b86b005c98ff2019043cbc440762ed8c4dc675a4666fe0fa4bfbc3c89971a2aeb16538e1
 AUX mtpfs-1.1-g_printf.patch 166 BLAKE2B 73c28b822a2ec2cc016bcf4adb037ec4b7b24dc49ecd7c5ad118edc09e970524c7976a95c04de4c5adeae575930912fb7eaf65c175226cff4f5665d2801606b1 SHA512 97ba9291dbcad22c149f5edb89fd67a92b678843caa7b1fa397c9d2c6205bfc591c31696f108732eef9b20bfe767df8e33d5a356d8e975c02eb0a28f773f2006
@@ -10,5 +11,5 @@ AUX mtpfs-1.1-wking-patches/0005-Use-O_ACCMODE-to-pull-out-the-access-portion-of
 AUX mtpfs-1.1-wking-patches/0006-Check-for-find_storage-failures.patch 3484 BLAKE2B c6cff901a12db5254517776abef8ec58b756bcb2a10b26bcf6fefe7340bb7003a6e2d043f1c87fa586025ab71d0c692e910b3e545858c560b7e9d21193892b70 SHA512 c43ab62c8d63d6e9c2b42de74a4a25fbb6edf87d0f46128796c7e4e61704a5ee7753fafffbcfbbbc116e180cc1a8d8a3aa8a9b4cb9d3a031ffd8d3d67e201da3
 AUX mtpfs-1.1-wking-patches/0007-Use-path-instead-of-fields-0-for-find_storage.patch 987 BLAKE2B dcf215b4ad2fd16e2cef84becdc530d4faed1cbab59531be095ea000546d14623a3a3ad370f9005e3b7b42016fcc21092ecb16ccd8ea7b892e63c0fb1429fe6d SHA512 b358816389cbde3679bd1e50505f9e68de9ffe68041dfdc48af9ae64d1453d1ce7c3ab4ee4b6260a6d42d520225ad91c6cf6cd8d05cd561e3b72d102fd6dcbdb
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
-EBUILD mtpfs-1.1-r6.ebuild 1299 BLAKE2B 0b570be9013efdea2c897cbbb7854e01191523f6caefd9fbcb86aa0194726fba8571edc2d0a721630238687e7cfe919bc1b629e6ce9049dbac652052553bf9ef SHA512 a591ca2d241b26ed7294815c35c4f44e4dbef35098d87f45263f80e98794ebf1c5258cf4517a7e910d9c7c21946a35c4066bde92a483531aaf56a6ed2b55a911
+EBUILD mtpfs-1.1-r6.ebuild 1333 BLAKE2B 00536c13d8bd080f27b95eb9e593aa8eb48b70e5ebf6a6d8c24a4a5a4556f88f5b06a8f07a5deb54e2f0d9ba03440cedb111f2a904d9389b328780bc65e4ccea SHA512 26c1f9ffc996c1f63bd4cc5bc8f86840f1241e4d718db9fe7fd0f28f0df743d2f8dce4e68ff20490d71e5ca5ae2c11a1ec5b642cc20a718e675e566b603ba393
 MISC metadata.xml 572 BLAKE2B 7a7e36f2ae5612b21850553cfbe139d1890625ab35c6af5e6ac7743283b60418fab05fdda51bca45131b033cd6f66d38ff8341414b753630c0e2dd3d15287b06 SHA512 0b400a93a50484a42d5cb9be206d4c233947de16692dedbd4163b692e5175ddc51d429ea0d3bf88c8f60502308fe29cc3ea94df7efdc58d17834be1a96a3c863
diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-c23-fix.patch b/sys-fs/mtpfs/files/mtpfs-1.1-c23-fix.patch
new file mode 100644
index 000000000000..a7875276b9a5
--- /dev/null
+++ b/sys-fs/mtpfs/files/mtpfs-1.1-c23-fix.patch
@@ -0,0 +1,38 @@
+From: https://github.com/cjd/mtpfs/commit/3b7b0d3ac7e15c9b654e19489bb4be84d48698f7.patch
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 9 Dec 2024 12:49:20 +0000
+Subject: [PATCH] fix gcc-15 build
+
+--- a/mtpfs.c
++++ b/mtpfs.c
+@@ -812,7 +812,7 @@ mtpfs_release (const char *path, struct fuse_file_info *fi)
+ }
+ 
+ void
+-mtpfs_destroy ()
++mtpfs_destroy (void *buf)
+ {
+   enter_lock ("destroy");
+   if (files)
+@@ -1622,7 +1622,7 @@ mtpfs_init ()
+ }
+ 
+ int
+-mtpfs_blank()
++mtpfs_blank (const char *path, mode_t mode)
+ {
+   // Do nothing
+ }
+
+--- a/mtpfs.h
++++ b/mtpfs.h
+@@ -49,9 +49,9 @@ static int find_storage(const gchar * path);
+  
+     /* fuse functions */
+ static void * mtpfs_init (void);
+-static int mtpfs_blank ();
++static int mtpfs_blank (const char *path, mode_t mode);
+ static int mtpfs_release (const char *path, struct fuse_file_info *fi);
+-void mtpfs_destroy ();
++void mtpfs_destroy (void *buf);
+ static int mtpfs_readdir (const gchar * path, void *buf, fuse_fill_dir_t filler, off_t offset, struct fuse_file_info *fi);
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
index 04dd5b86b903..d316e30cec72 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,8 @@ PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
 	"${FILESDIR}"/${P}-unitialized-variable.patch
 	"${FILESDIR}"/${P}-wking-patches/
 	"${FILESDIR}"/${P}-g_printf.patch
-	"${FILESDIR}"/${P}-deprecated_lock_init.patch )
+	"${FILESDIR}"/${P}-deprecated_lock_init.patch
+	"${FILESDIR}"/${P}-c23-fix.patch )
 
 src_prepare() {
 	default