gentoo auto-resync : 22:02:2024 - 11:40:14

3 files changed, 68 insertions, 1 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 797057a32b70..51542eef6de4 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,7 +1,8 @@
+AUX dolphin-23.08.5-musl.patch 1817 BLAKE2B 3194646c46cfb4cc1160b3a6d2322031cef16856296951845345a324f4bf5ef1a06c0f0fc46f9579cc3af21d1ad534409d826d4b98aa35180abc8175edd7405f SHA512 19cd5e5a258facf4c069cbc79e78434c75f406b96eefd2b0d8d3f04acd5854d41ad8bfa85e8a060eff7ed3e66cf59299a04bd113f72063ef5e5b3021b465804c
 DIST dolphin-23.04.3.tar.xz 5737968 BLAKE2B 5942d5894c2d51cc3f0c5ab599bb82c2e324203f26a6b7a65dca2198cf046011c37d809ca71c2ef36db1687d8159bdbe97f33eb99d550eada982555d903c381e SHA512 6078947b3dd6c1c62ba2306109c9dcc4be6ebb64bb69699f0457aaa1e0b6b0168d8767d73f0f8731984f5b412200c5463df7237c65990ee073f2d35946ad7b9e
 DIST dolphin-23.08.4.tar.xz 5769716 BLAKE2B dd9f27258b3e8a04c53efee66cead0a3c193a4fe0050a7d7fddaba544503da1a2d0f8bc3f8d1700303f900e69e374d0c7d9d912897ae90899d05d7c17f111543 SHA512 f0e7af7a066f71b155292d7a49ff217f89be5f062629e67ed9a43ce3ed77cbb09b3b037de71bea7d21fc97732c0545fda3530e5eabed54a581384792d3195db9
 DIST dolphin-23.08.5.tar.xz 5770048 BLAKE2B d46cbd81d2f6e020998fe560affa45916fdcf53e7acbb62503221d4a53cd582d692c025b7c9c16f6285a5d97fda696ff75198b479b7316c95e6b782c39bbb570 SHA512 0b25cc8ec1222fcd6eba971aa701a2ddcf5297c4d78b1cd63fde7ecf8e267f1af76ca1bf544ea4a4f98309b40c41aba441cfda1a9c3fb0e4df2a426e4402cb4b
 EBUILD dolphin-23.04.3.ebuild 3177 BLAKE2B a3ef1c0ad02a544b3c4442eff2037fe815eed550bc863bef53e9e4f32ec3cae73188dfd80661919679499e78fab47c0ed459e7ef2bff1cdbc0d0153399431909 SHA512 fa69815df1e3ae73bc90ea0343639383cd5cfd3ecc979e6d276ce22472c675deb3a3a5bb268742f4c5b689909d03060be04cf749492214d43da0fcfd5334e9bf
 EBUILD dolphin-23.08.4-r1.ebuild 3298 BLAKE2B 49f2ec7b944fe91afe6a784fb4b2ebd615668ee30099e5ec9ce7c1d593991f20a7a90c8b25d3c6659564480153194391be52aff9da9c8b0c56e519762c2db8ff SHA512 373ba2fbb775cf3f812414fe37cee8f1bda8e762e288007d5fce9df4e59bceee1f9491eae58cb335b7207ab99fefc415df3fe1bd4cd097b6c49468136c428d77
-EBUILD dolphin-23.08.5.ebuild 3180 BLAKE2B 8a6882e9b93116326f1cd935a81efae9a21d1bc47ff7526c0f3ec1a7837168c284f950cfd0922ffe7a23a8a03e68fc08964c6df7e1e7efb9ea86d51f9f126da7 SHA512 c948034f1257a75612c59863f072d92fb9f40bbd7c034fd902019a8d26a9024231eecdd5c82c08a1695b1f2adfce1cc22841078355a9db80383821df8244cf3a
+EBUILD dolphin-23.08.5.ebuild 3223 BLAKE2B 21b3a3d94368a2dad3a73b835da94ec6f260d1d24374f95360ab9377076c1fe4d90a31c411b6034553598537d9254e0555faab9c5a29c8b272a5923a80715eca SHA512 ab54de2304173e81533adccbc35e292d5c73121eeaa913a669f19736e97439e95bd73ad925f06e8330e2ff521519fa8ec6fafea37582d1262e28c7d37266abdd
 MISC metadata.xml 430 BLAKE2B 4e7f2312a9ff5828bb5090867a1cb3f8e80365cf7fe92e45973ee6d1fbf1bafaa9427227b6cc424214b4892c92188918c36e25ca346a89e44e2b2ea25d2871b8 SHA512 cd3e017e0c9259940450a1b7a6fa5b8c81e82963b3c4d63b0921474f42651076a0fd7c3dd90d8a23b57646ed6eb2ccba8fbd41944d4e874a4e2ac58c981a68c0
diff --git a/kde-apps/dolphin/dolphin-23.08.5.ebuild b/kde-apps/dolphin/dolphin-23.08.5.ebuild
index f253b8e0a372..3116f5e5d438 100644
--- a/kde-apps/dolphin/dolphin-23.08.5.ebuild
+++ b/kde-apps/dolphin/dolphin-23.08.5.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch b/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch
new file mode 100644
index 000000000000..044a0caef830
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch
@@ -0,0 +1,64 @@
+From 32a5f1c041d00cdd0246cf7e764a447588f30f3a Mon Sep 17 00:00:00 2001
+From: Bart Ribbers <bribbers@disroot.org>
+Date: Wed, 9 Aug 2023 14:07:46 +0200
+Subject: [PATCH] Fix musl build by using fts_* from external library
+
+musl does not support fts. There is however a standalone package that
+can be used, but it must be linked against. This commit adds a check
+that makes sure to link to the external library if it is required.
+---
+ CMakeLists.txt     | 17 +++++++++++++++++
+ src/CMakeLists.txt |  2 ++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a0b97c635..0a655babb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,6 +27,8 @@ include(GenerateExportHeader)
+ include(FeatureSummary)
+ include(ECMQtDeclareLoggingCategory)
+ include(ECMDeprecationSettings)
++include(CheckIncludeFiles)
++include(CheckLibraryExists)
+ 
+ ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHIN
+                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
+@@ -150,6 +152,21 @@ else()
+     set(HAVE_TERMINAL TRUE)
+ endif()
+ 
++# Compatibility with platforms without native fts (e.g. musl)
++check_include_files("sys/types.h;sys/stat.h;fts.h" HAVE_FTS_H)
++if(HAVE_FTS_H)
++    check_function_exists(fts_open HAVE_FTS_OPEN)
++    if(NOT HAVE_FTS_OPEN)
++        check_library_exists(fts fts_open "" HAVE_LIB_FTS)
++    endif()
++endif()
++
++if(HAVE_LIB_FTS)
++    set(FTS_LIB fts)
++else()
++    set(FTS_LIB "")
++endif()
++
+ add_subdirectory(src)
+ add_subdirectory(doc)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5a481e39ff..fa7de5cc23 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -213,6 +213,8 @@ target_link_libraries(
+     KF5::WindowSystem
+     KF5::WidgetsAddons
+     KF5::Codecs
++
++    ${FTS_LIB}
+ )
+ 
+ if(HAVE_BALOO)
+-- 
+GitLab
+