From 1fd1215c62ee14dc2e94fa04d6e3622391c9ab57 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Sep 2024 12:11:53 +0100 Subject: gentoo auto-resync : 21:09:2024 - 12:11:53 --- kde-apps/dolphin/Manifest | 3 - kde-apps/dolphin/dolphin-23.08.5-r1.ebuild | 97 ----------------------- kde-apps/dolphin/files/dolphin-23.08.5-musl.patch | 64 --------------- 3 files changed, 164 deletions(-) delete mode 100644 kde-apps/dolphin/dolphin-23.08.5-r1.ebuild delete mode 100644 kde-apps/dolphin/files/dolphin-23.08.5-musl.patch (limited to 'kde-apps/dolphin') diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest index fdf1a5858ebe..cd4127e3c562 100644 --- a/kde-apps/dolphin/Manifest +++ b/kde-apps/dolphin/Manifest @@ -1,8 +1,5 @@ -AUX dolphin-23.08.5-musl.patch 1817 BLAKE2B 3194646c46cfb4cc1160b3a6d2322031cef16856296951845345a324f4bf5ef1a06c0f0fc46f9579cc3af21d1ad534409d826d4b98aa35180abc8175edd7405f SHA512 19cd5e5a258facf4c069cbc79e78434c75f406b96eefd2b0d8d3f04acd5854d41ad8bfa85e8a060eff7ed3e66cf59299a04bd113f72063ef5e5b3021b465804c -DIST dolphin-23.08.5.tar.xz 5770048 BLAKE2B d46cbd81d2f6e020998fe560affa45916fdcf53e7acbb62503221d4a53cd582d692c025b7c9c16f6285a5d97fda696ff75198b479b7316c95e6b782c39bbb570 SHA512 0b25cc8ec1222fcd6eba971aa701a2ddcf5297c4d78b1cd63fde7ecf8e267f1af76ca1bf544ea4a4f98309b40c41aba441cfda1a9c3fb0e4df2a426e4402cb4b DIST dolphin-24.05.2.tar.xz 5580708 BLAKE2B 4a94495294e4327ece277650c075f26a26e96d1f7f9cc7850087bacebc04d80278101c01cd82908fd395528641bae3e9628fea218d8a230ea35f7657c08c39f6 SHA512 dd1fbfccf52a97528558b6dc6d3c95df44f4b027644bdb619472092158e8390968d553d6b8b17ce90533feb355c9e82e66bc12b26132ba76e08ed0eb91c168c6 DIST dolphin-24.08.1.tar.xz 5630960 BLAKE2B 5a0b2de7532c7ba46103bcde39754b3358baaf3f532d68eeb6fba24eb78ed3506633289f4ae7dbb6e163e0e9bb41d9fa9373824151e58ceda588ede2283acc23 SHA512 cfae900ebaf3b7910c74ca180315a25ddde8a7e003547f07cd9c32ca5fde0f020fa378803252423a324e94f5c05140bcc41984ddcff35a2b06746f3296738272 -EBUILD dolphin-23.08.5-r1.ebuild 3148 BLAKE2B 954c540ff76e73e4cc2a4e77a52e37f6943794cceef656bd48565418a44537e82dd0f61c73f33a8eb18f6a21ef570349efe88b30ab36018737559343b2b754b8 SHA512 bdd793f1f3b3cd225392644ef8729e9c702c4ce00b3c0d3cd9c1b8fee723bb785530868a69fef744a088043ccbaab89e99fa52792a27b7ceb6e6ed229fe4dde8 EBUILD dolphin-24.05.2-r1.ebuild 2970 BLAKE2B 51ab7244b3513fcb5d412af927f82159c5821a5263331b87ac2275d7121466e4965e41d9ca7d9bd0f47e0f034b0de6cec99766609de5013997ea69365d3a3e60 SHA512 5ac41098a84e99941aeddee38712b0f89c1994ec8ec61409045f670d0e9cde643eb7a7006fbeff73183f2aea88df64d388ba679025919b4b140fbdc3444c2f39 EBUILD dolphin-24.08.1.ebuild 2925 BLAKE2B 078267beec5a7403adf2c720585929d2604b5aab263472054a070a6185fcaf37446df29a8cf48513f322dc40a67dedc9631ded05b98da6c6ccaca2fd46770859 SHA512 08f4e75d3733e58cd6a09b298af110223ef6bdea0bb0d3ef2a239ec3034ebfcc72459ac0f70edaa84d25ce9b90114dbe0a41eea63989c3b503fa7ccf6d2dfc87 MISC metadata.xml 517 BLAKE2B 4678e02c7b2d4556b90714bbd5d357c387cd6791f2f69799f32cffda0cafba8dfc35d47b0ad8fd3168ba883932c56d2bea37cf1e21db0de41289c71d0858622b SHA512 cfac1c2cb39c6d09bff73c57436f4787bead2409551760c042b8101f7d260d09c89aac66aa80bfef5f5abf80f508ccfdd1d49c3e262915557eec363f6460e5dd diff --git a/kde-apps/dolphin/dolphin-23.08.5-r1.ebuild b/kde-apps/dolphin/dolphin-23.08.5-r1.ebuild deleted file mode 100644 index 7263ce1a1363..000000000000 --- a/kde-apps/dolphin/dolphin-23.08.5-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org optfeature - -DESCRIPTION="Plasma filemanager focusing on usability" -HOMEPAGE="https://apps.kde.org/dolphin/ https://userbase.kde.org/Dolphin" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" -IUSE="activities semantic-desktop telemetry" - -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5= - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=media-libs/phonon-4.11.0[qt5(+)] - activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 ) - semantic-desktop? ( - >=kde-apps/baloo-widgets-${PVCUT}:5 - >=kde-frameworks/baloo-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5 - ) - telemetry? ( kde-frameworks/kuserfeedback:5 ) -" -RDEPEND="${DEPEND} - >=kde-apps/kio-extras-${PVCUT}:5 - >=kde-apps/thumbnailers-${PVCUT}:5 -" - -PATCHES=( "${FILESDIR}/${P}-musl.patch" ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON - $(cmake_use_find_package activities KF5Activities) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package semantic-desktop KF5BalooWidgets) - $(cmake_use_find_package semantic-desktop KF5FileMetaData) - $(cmake_use_find_package telemetry KUserFeedback) - ) - ecm_src_configure -} - -src_test() { - local myctestargs=( - # servicemenuinstaller requires ruby, no thanks - # dolphinmainwindowtest, kitemlistcontrollertest, kfileitemlistviewtest, kfileitemmodeltest hang forever - # placesitemmodeltest requires DBus - -E "(servicemenuinstaller|dolphinmainwindowtest|kfileitemlistviewtest|kfileitemmodeltest|kitemlistcontrollertest|placesitemmodeltest)" - ) - ecm_src_test -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "compress/extract and other actions" kde-apps/ark:${SLOT} - optfeature "crypto actions" kde-apps/kleopatra:${SLOT} - optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT} - optfeature "'Share' context menu actions" kde-frameworks/purpose:${SLOT} - fi - ecm_pkg_postinst -} diff --git a/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch b/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch deleted file mode 100644 index 044a0caef830..000000000000 --- a/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 32a5f1c041d00cdd0246cf7e764a447588f30f3a Mon Sep 17 00:00:00 2001 -From: Bart Ribbers -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 - -- cgit v1.2.3