From 1896cfae1abd427d02e4e0e71beb052bad1119e7 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Tue, 12 Mar 2024 13:03:07 +0500 Subject: [PATCH] dolphin: update to 24.02.2. --- common/shlibs | 2 +- ...d-by-using-fts-from-external-library.patch | 61 ------------------- srcpkgs/dolphin/template | 20 +++--- 3 files changed, 14 insertions(+), 69 deletions(-) delete mode 100644 srcpkgs/dolphin/patches/0001-Fix-musl-build-by-using-fts-from-external-library.patch diff --git a/common/shlibs b/common/shlibs index 7718d21953f..f79b2724b38 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4015,7 +4015,7 @@ libtexluajit.so.2 texlive-LuaTeX-20200406_1 libtexlua53.so.5 texlive-LuaTeX-20200406_1 libptexenc.so.1 texlive-20200406_1 libsynctex.so.2 libsynctex-20200406_3 -libdolphinvcs.so.5 dolphin-20.04.3_1 +libdolphinvcs.so.6 dolphin-24.02.0_1 libocl.so.2019.07 opencamlib-2019.07_1 libcglm.so.0 cglm-0.7.6_1 libfcft.so.4 fcft-3.0.1_1 diff --git a/srcpkgs/dolphin/patches/0001-Fix-musl-build-by-using-fts-from-external-library.patch b/srcpkgs/dolphin/patches/0001-Fix-musl-build-by-using-fts-from-external-library.patch deleted file mode 100644 index 339f573c42b..00000000000 --- a/srcpkgs/dolphin/patches/0001-Fix-musl-build-by-using-fts-from-external-library.patch +++ /dev/null @@ -1,61 +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 62c70ba79..b8cda5c82 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -210,6 +210,8 @@ target_link_libraries( - KF5::WindowSystem - KF5::WidgetsAddons - KF5::Codecs -+ -+ ${FTS_LIB} - ) - - if(HAVE_BALOO) diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template index ea43ea8d76b..6913d8217b2 100644 --- a/srcpkgs/dolphin/template +++ b/srcpkgs/dolphin/template @@ -1,13 +1,19 @@ # Template file for 'dolphin' pkgname=dolphin -version=23.08.5 +version=24.02.2 revision=1 build_style=cmake -configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="extra-cmake-modules python3 qt5-qmake qt5-host-tools - gettext kcoreaddons kconfig kdoctools" -makedepends="baloo-widgets5-devel kcmutils-devel knewstuff-devel kactivities5-devel - kinit-devel kparts-devel ksolid-devel" +configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake + -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" +hostmakedepends="extra-cmake-modules python3 qt6-tools qt6-base + gettext kf6-kcoreaddons kf6-kconfig kf6-kdoctools kf6-kcmutils" +makedepends="kf6-baloo-devel kf6-kbookmarks-devel kf6-kcmutils-devel + kf6-kcompletion-devel kf6-kconfig-devel kf6-kcoreaddons-devel kf6-kcrash-devel + kf6-kdbusaddons-devel kf6-kdoctools-devel kf6-kfilemetadata-devel + kf6-ki18n-devel kf6-kiconthemes-devel kf6-kio-devel kf6-knewstuff-devel + kf6-knotifications-devel kf6-kparts-devel kf6-ktextwidgets-devel + kf6-kuserfeedback-devel kf6-kwindowsystem-devel kf6-solid-devel + baloo-widgets-devel phonon-devel plasma-activities-devel" depends="kio-extras" short_desc="KDE File manager" maintainer="John " @@ -15,7 +21,7 @@ license="GPL-2.0-or-later, GFDL-1.2-or-later" homepage="https://kde.org/applications/en/system/org.kde.dolphin" changelog="https://kde.org/announcements/changelogs/gear/${version}/#dolphin" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" -checksum=6309abda566dfe890f6a3790f101198ed0f274728896054f21e24bdfc3e1f1f3 +checksum=50844490d45159ca16c1d8d9f5f0701f118772e4b09adad270835b67bb26a701 if [ "$CROSS_BUILD" ]; then LDFLAGS=" -Wl,-rpath-link,../bin"