From cecfa14db9141f25aa4ca144ea08438c39984745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= <marcdeop@fedoraproject.org>
Date: Tue, 10 Oct 2023 22:57:10 +0200
Subject: [PATCH] 5.111.0

---
 .gitignore                                    |  1 +
 kf5-baloo.spec                                |  7 +--
 sources                                       |  2 +-
 ...the_device_identifier_where_possible.patch | 43 -------------------
 4 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 use_the_FSID_as_the_device_identifier_where_possible.patch

diff --git a/.gitignore b/.gitignore
index cdc7783..04a9b02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@
 /baloo-5.108.0.tar.xz
 /baloo-5.109.0.tar.xz
 /baloo-5.110.0.tar.xz
+/baloo-5.111.0.tar.xz
diff --git a/kf5-baloo.spec b/kf5-baloo.spec
index faa4a51..8abd05e 100644
--- a/kf5-baloo.spec
+++ b/kf5-baloo.spec
@@ -9,7 +9,7 @@
 
 Name:    kf5-%{framework}
 Summary: A Tier 3 KDE Frameworks 5 module that provides indexing and search functionality
-Version: 5.110.0
+Version: 5.111.0
 Release: 1%{?dist}
 
 # libs are LGPL, tools are GPL
@@ -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
 
@@ -209,6 +207,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 8bbc122..cd5bafa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (baloo-5.110.0.tar.xz) = f5bfd313bb72f57899c3be845dfc699cfcc1c9286733fe0ff5d09cb654b793282dfda8a59a185107686105b7eec2f11b623dbbf1059dd7cb993ceb6295bcc673
+SHA512 (baloo-5.111.0.tar.xz) = 81a1dfb265e564b33d8c9440d0b71438db6ff244a9081b431180e4d730f77c1cdf4f67258f587c846bae58ae34106fd1df5f93617c1f0f81543c657a00c6e03a
diff --git a/use_the_FSID_as_the_device_identifier_where_possible.patch b/use_the_FSID_as_the_device_identifier_where_possible.patch
deleted file mode 100644
index 89ce3cd..0000000
--- a/use_the_FSID_as_the_device_identifier_where_possible.patch
+++ /dev/null
@@ -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);