rpms
/
kf5-baloo
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import kf5-baloo-5.115.0-1.el9

Browse Source
i9ce changed/i9ce/kf5-baloo-5.115.0-1.el9
MSVSphere Packaging Team 9 months ago
parent 71463ab8b0
commit 989648237b
4 changed files with 50 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/baloo-5.108.0.tar.xz
SOURCES/baloo-5.115.0.tar.xz

2
.kf5-baloo.metadata
Unescape View File

@ -1 +1 @@
b1eaf028c0f0ebbafd161613bc6874056647d0da SOURCES/baloo-5.108.0.tar.xz
0ef18e5a798a7927a5954959d40fe458ab6d3315 SOURCES/baloo-5.115.0.tar.xz

43
SOURCES/use_the_FSID_as_the_device_identifier_where_possible.patch
Unescape View File

@ -1,43 +0,0 @@
diff --git a/src/engine/idutils.h b/src/engine/idutils.h
index 78d881a96e894d731ba024acc8cc74b47823c96b..606ac9dca0a647fcc78ffb031c081201fbb1a491 100644
--- a/src/engine/idutils.h
+++ b/src/engine/idutils.h
@@ -13,6 +13,8 @@
#ifdef Q_OS_WIN
# include <QFileInfo>
+#else
+# include <sys/statvfs.h>
#endif
namespace Baloo {
@@ -40,10 +42,28 @@ inline quint64 statBufToId(const QT_STATBUF& stBuf)
static_cast<quint32>(stBuf.st_ino));
}
+#ifndef Q_OS_WIN
+inline int statWithFsid(const char* path, QT_STATBUF* statBuf)
+{
+ int ret = QT_LSTAT(path, statBuf);
+ if (ret != 0) {
+ return ret;
+ }
+
+ struct statvfs fsBuf;
+ ret = statvfs(path, &fsBuf);
+ if (ret == 0 && fsBuf.f_fsid != 0) {
+ // Fold FSID into 32 bits, statBufToId would discard anything else
+ statBuf->st_dev = static_cast<quint32>(fsBuf.f_fsid ^ (fsBuf.f_fsid >> 32));
+ }
+ return ret;
+}
+#endif
+
inline int filePathToStat(const QByteArray& filePath, QT_STATBUF& statBuf)
{
#ifndef Q_OS_WIN
- return QT_LSTAT(filePath.constData(), &statBuf);
+ return statWithFsid(filePath.constData(), &statBuf);
#else
const int ret = QT_STAT(filePath.constData(), &statBuf);
const QString filePathStr = QString::fromUtf8(filePath);

56
SPECS/kf5-baloo.spec
Unescape View File

@ -1,3 +1,5 @@
%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
%global framework baloo
# uncomment to enable bootstrap mode
@ -9,12 +11,10 @@
Name: kf5-%{framework}
Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality
Version: 5.108.0
Version: 5.115.0
Release: 1%{?dist}
# libs are LGPL, tools are GPL
# KDE e.V. may determine that future LGPL/GPL versions are accepted
License: (LGPLv2 or LGPLv3) and (GPLv2 or GPLv3)
License: BSD-3-Clause AND CC0-1.0 AND LGPL-3.0-or-later
URL: https://community.kde.org/Baloo
#URL: https://invent.kde.org/frameworks/%{framework}
@ -30,8 +30,6 @@ Source2: baloo_file_shutdown.sh
## upstreamable patches
# http://bugzilla.redhat.com/1235026
Patch100: baloo-5.67.0-baloofile_config.patch
# https://invent.kde.org/frameworks/baloo/-/merge_requests/131
Patch101: use_the_FSID_as_the_device_identifier_where_possible.patch
## upstream patches
@ -99,6 +97,9 @@ Provides: baloo-file = %{version}-%{release}
%else
Conflicts: baloo-file < 5
%endif
%if %{with kf6_compat}
Requires: kf6-baloo-file%{?_isa}
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description file
%{summary}.
@ -117,7 +118,8 @@ License: LGPLv2 or LGPLv3
%build
%{cmake_kf5} \
-DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
-DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \
%{?with_kf6_compat:-DBUILD_INDEXER_SERVICE=OFF}
%cmake_build
@ -131,8 +133,10 @@ find %{buildroot} -name kde-baloo.service -delete
# baloodb not installed unless BUILD_EXPERIMENTAL is enabled, so omit translations
rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/baloodb5.*
%if %{without kf6_compat}
install -p -m644 -D %{SOURCE1} %{buildroot}%{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf
install -p -m755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/shutdown/baloo_file.sh
%endif
%find_lang kio5_baloosearch
%find_lang kio5_tags
@ -169,10 +173,13 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
#{_kf5_bindir}/baloodb
%{_kf5_bindir}/baloosearch
%{_kf5_bindir}/balooshow
%if %{without kf6_compat}
%{_kf5_bindir}/balooctl
%endif
%{_kf5_datadir}/qlogging-categories5/%{framework}*
%files file -f %{name}-file.lang
%if %{without kf6_compat}
%{_prefix}/lib/sysctl.d/97-kde-baloo-filewatch-inotify.conf
%config(noreplace) %{_sysconfdir}/xdg/plasma-workspace/shutdown/baloo_file.sh
%{_kf5_bindir}/baloo_file
@ -183,6 +190,7 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
%endif
%{_libexecdir}/baloo_file
%{_libexecdir}/baloo_file_extractor
%endif
%ldconfig_scriptlets libs
@ -204,14 +212,46 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
%{_kf5_includedir}/Baloo/
%{_kf5_archdatadir}/mkspecs/modules/qt_Baloo.pri
%if %{without kf6_compat}
%{_kf5_datadir}/dbus-1/interfaces/org.kde.baloo.*.xml
%{_kf5_datadir}/dbus-1/interfaces/org.kde.Baloo*.xml
%endif
%changelog
* Mon Jan 15 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 5.108.0-1
* Sat Feb 10 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.115.0-1
- 5.115.0
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.113.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.113.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 15 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 5.113.0-1
- Rebuilt for MSVSphere 9.3
* Fri Dec 08 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.113.0-1
- 5.113.0
* Mon Oct 16 2023 Alessandro Astone <ales.astone@gmail.com> - 5.111.0-3
- Require kf6-baloo if compat build
* Thu Oct 12 2023 Alessandro Astone <ales.astone@gmail.com> - 5.111.0-2
- Add KF6 compatibility flag
* Tue Oct 10 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.111.0-1
- 5.111.0
* Tue Sep 05 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.110.0-1
- 5.110.0
* Sat Aug 05 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.109.0-1
- 5.109.0
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.108.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sun Jul 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.108.0-1
- 5.108.0

Write Preview
Loading…
Cancel
Save