From 7e1c76c19dc42b7d2c46a54c651fc1e1c2e033e2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 7 Jan 2020 18:23:25 +1000 Subject: [PATCH] kservice: fix path for sycoca databases --- .../kservice/kservice-5.65.0.recipe | 5 ++-- .../kservice/patches/kservice-5.65.0.patchset | 25 +++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 kde-frameworks/kservice/patches/kservice-5.65.0.patchset diff --git a/kde-frameworks/kservice/kservice-5.65.0.recipe b/kde-frameworks/kservice/kservice-5.65.0.recipe index aad4918ed..fa8c71b14 100644 --- a/kde-frameworks/kservice/kservice-5.65.0.recipe +++ b/kde-frameworks/kservice/kservice-5.65.0.recipe @@ -5,10 +5,12 @@ MIME types or handled by application specific code." HOMEPAGE="https://github.com/KDE/kservice/" COPYRIGHT="2010-2019 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/KDE/kservice/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="19eb2cb23be5dbd31f8b416d8564cce1714a0bf85566bb2bbc524b23b2d2b9a4" +PATCHES="kservice-$portVersion.patchset" + ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -68,7 +70,6 @@ BUILD() mkdir -p build cd build -# TODO: /bin/kbuildsycoca5 - Couldn't create "/boot/system/cache" # TODO: ECM_MKSPECS_INSTALL_DIR is not picked up unless defined cmake .. $cmakeDirArgs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ diff --git a/kde-frameworks/kservice/patches/kservice-5.65.0.patchset b/kde-frameworks/kservice/patches/kservice-5.65.0.patchset new file mode 100644 index 000000000..0ed1d6e55 --- /dev/null +++ b/kde-frameworks/kservice/patches/kservice-5.65.0.patchset @@ -0,0 +1,25 @@ +From db7f7af2c76551444f0226cc698abf2306b51c23 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 7 Jan 2020 18:16:42 +1000 +Subject: Set path for sycoca databases + + +diff --git a/src/sycoca/ksycoca.cpp b/src/sycoca/ksycoca.cpp +index a40a263..b0c1d33 100644 +--- a/src/sycoca/ksycoca.cpp ++++ b/src/sycoca/ksycoca.cpp +@@ -690,7 +690,11 @@ QString KSycoca::absoluteFilePath(DatabaseType type) + suffix.replace(QLatin1Char(':'), QLatin1Char('_')); + #endif + const QString fileName = QLatin1String("ksycoca5") + suffix; ++#ifdef Q_OS_HAIKU ++ return QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1String("/kdesycoca/") + fileName; ++#else + return QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + fileName; ++#endif + } else { + return QFile::decodeName(ksycoca_env); + } +-- +2.24.1 +