gentoo auto-resync : 27:05:2023 - 09:11:36

4 files changed, 31 insertions, 2 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index d700abab4b50..903138b8b4c8 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,9 +1,10 @@
 AUX doxygen-1.9.1-do_not_force_libcxx.patch 670 BLAKE2B e618f7acba8e4c7910b8f56001bf17bc41da5765dab57dbc148515eb2c4cfdc341d39498095f3f0dc9cad7ab74f3a508ec0ef143ca4652faace9db1031b29bb5 SHA512 ab40fb3a85f6cfcc93056d4d7b81397077552df53de1fcf26127d982a497bb0d67ead4f213b2c7101beefe2136b367137346b034b5597b39c29699c598ac91bb
 AUX doxygen-1.9.1-ignore-bad-encoding.patch 1016 BLAKE2B 453e13ba115fe7108b0f319b45ad6c3f66c937a2a133eb9c76d38455f71cbbc1ee830e5e632ce36ab2a2906a67b1c676d60c02d0696a9da75862ea4197e209b1 SHA512 71cc9c54bc40f6719c64874e2bd9355cda47c87affec7f3e551fae06cb27bd9c569bffec03d2594c2f1a0190c6975123270fb446c62d8c1fac4c2834c7adaf80
 AUX doxygen-1.9.4-link_with_pthread.patch 1116 BLAKE2B 864adde5d9c0c852dba8fdaee9021f16e7e119a660d5d8657f320686c0d86c29b5695f367c2af2846e9861bca5a70889b6dd56a9734485527ae504a134e30594 SHA512 f9a1089585f83a09b89c813f51bbb7914fb27be2b3e554148387fd322c88153c2aca1af4215d90b6f2fc9eae25814085fb468f0ef2dacfa092662a4609d52929
+AUX doxygen-1.9.7-musl-1.2.4.patch 1126 BLAKE2B 050fa56a7786c557ce03c9275e152f2b2d2285209f8ea9aed5019c96c2e545ce46208f783092addfcd8ae00b0ed257d4f588ae4036b65752087901d616cc4979 SHA512 eb89ca38cee0431528240c9b354adeef5e2c3ed89db762e7e12e12fa17ca596752b9da0cb75fb9d09dcfbecc302a7e63f811b8fb2f43baf3b4d2230f259ad96f
 DIST doxygen-1.9.6.src.tar.gz 5293513 BLAKE2B 35d3286b47922776814bb7941c7a1cb27a5a50be35a9f231b1f072333d966630bbf0b97813f56711f71f040a0ceb87e7e1cbee04ca2aa3f035754ba844561697 SHA512 f8b0d19d33fa8a5bb92b38f1c775bd3cde7f024566cf93ed61ab0cafe86643971c04b7f2492364767b3e6ce5b518bad5e0321c82f0a72875ccf936ea7d3595b2
 DIST doxygen-1.9.7.src.tar.gz 5736446 BLAKE2B e0f6e06399a2dda7226fe8fea351a79f19bf71aee51fba0ce113c3423b85aa633ce8d98894e3e49027839c2accc18af87c7f23a1fd37c0de441de42a8a76d307 SHA512 618ff58aa6f0a2eb89f95b570995ea3ebbcda64f502cabcecd9be2967abffb56d0d6747de0c06df422705919757e6af9c6e5a56ca603b1ddf7a09a7ee79b1803
 EBUILD doxygen-1.9.6.ebuild 3238 BLAKE2B aa62cf5aed097af9c3cb92e90f66b79de95c65df3dc89de8236e918daf0ecacf6efee9598d54c85ee71118599168e05782ca84e2e9ac7ec1a9fe68737c32efc4 SHA512 7a2d7d684f873024380e5b1bf5fa3399928feb8dd3eb1ad6af16cc1309706042c4fab818560948fa6c4c0e5d649dc528369693808674d87c8656563eee2c4e14
-EBUILD doxygen-1.9.7-r1.ebuild 3336 BLAKE2B 8c60de1431338e47a8a184afb5b900f6e5d35513be3aca66941a97fb2b1d580c93c31644951b1710fa060feafca3ed4041b12eec31bc8ca75c8f14f6f62b37bc SHA512 0f845b0ccea0c7296acabe6cd578d956c34b1bd87a8ac5636e8d9b1e0f60910a4ded3bb433c222d9341e3d5ce0fa79d6c8d21d1051bedf0527cc8e6481bdc085
-EBUILD doxygen-9999.ebuild 3336 BLAKE2B 8c60de1431338e47a8a184afb5b900f6e5d35513be3aca66941a97fb2b1d580c93c31644951b1710fa060feafca3ed4041b12eec31bc8ca75c8f14f6f62b37bc SHA512 0f845b0ccea0c7296acabe6cd578d956c34b1bd87a8ac5636e8d9b1e0f60910a4ded3bb433c222d9341e3d5ce0fa79d6c8d21d1051bedf0527cc8e6481bdc085
+EBUILD doxygen-1.9.7-r1.ebuild 3380 BLAKE2B d02c97b4f3382290b2478b89347c58881f179217b6962201d4415faa2e15e58f6128e6f28134707b3fb41cfda090d26673657a4e2a8559843893f31a978479cd SHA512 280b9a945ddca90e4fcd028265c654a756355f67c50b28166040fcd96c6ee9d88e3c3bc9fe4dbef100211057e8dc7c50c9a41068b670325320de3d02594cff0e
+EBUILD doxygen-9999.ebuild 3380 BLAKE2B d02c97b4f3382290b2478b89347c58881f179217b6962201d4415faa2e15e58f6128e6f28134707b3fb41cfda090d26673657a4e2a8559843893f31a978479cd SHA512 280b9a945ddca90e4fcd028265c654a756355f67c50b28166040fcd96c6ee9d88e3c3bc9fe4dbef100211057e8dc7c50c9a41068b670325320de3d02594cff0e
 MISC metadata.xml 1024 BLAKE2B 884363174e8a83eecb926c962185d1f1cc3263ed216b26e149035b47b424b5baf1da222805f5ed04f25b4e97f12c79cface7bd6ce59ca9d37388c696a9a13117 SHA512 12c91be3f02f1ef99db00a48f2dd252f4bab85078f308c921a1a07062d971090f8dd39480b5b72e2bb21f8e2df69bc10c7828c1c91f2f83ce64be50a233eef15
diff --git a/app-doc/doxygen/doxygen-1.9.7-r1.ebuild b/app-doc/doxygen/doxygen-1.9.7-r1.ebuild
index 3d5cb989116b..367e877520b0 100644
--- a/app-doc/doxygen/doxygen-1.9.7-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.7-r1.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
 	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
 	"${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
+	"${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 3d5cb989116b..367e877520b0 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch"
 	"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
 	"${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch"
+	"${FILESDIR}/${PN}-1.9.7-musl-1.2.4.patch"
 )
 
 DOCS=( LANGUAGE.HOWTO README.md )
diff --git a/app-doc/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch b/app-doc/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch
new file mode 100644
index 000000000000..2c71a0af9ae8
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.7-musl-1.2.4.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/906920
+https://gitlab.exherbo.org/exherbo/arbor/-/commit/7b517ba0068adc471fe7b2ed8cfbb191a197ca17
+
+From 6d713aa98b36ee8219294515142c0225fbd09dfc Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Thu, 25 May 2023 10:52:29 +0200
+Subject: [PATCH] Apply upstream fix for spdlog
+
+Fixes the build with musl >= 1.2.4, see
+https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96
+for details.
+--- a/deps/spdlog/include/spdlog/details/os-inl.h
++++ b/deps/spdlog/include/spdlog/details/os-inl.h
+@@ -236,8 +236,8 @@ SPDLOG_INLINE size_t filesize(FILE *f)
+ #    else
+     int fd = ::fileno(f);
+ #    endif
+-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
+-#    if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
++// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated)
++#    if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64))
+     struct stat64 st;
+     if (::fstat64(fd, &st) == 0)
+     {
+-- 
+2.41.0.rc2