From a0a08cf5683af1f8055156be32ec7bbac35ade93 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: Mon, 3 Feb 2020 22:23:10 +0100
Subject: [PATCH] Port baloofile_config patch to kcfg

---
 baloo-5.45.0-baloofile_config.patch | 19 -------------------
 baloo-5.67.0-baloofile_config.patch | 21 +++++++++++++++++++++
 kf5-baloo.spec                      |  4 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 baloo-5.45.0-baloofile_config.patch
 create mode 100644 baloo-5.67.0-baloofile_config.patch

diff --git a/baloo-5.45.0-baloofile_config.patch b/baloo-5.45.0-baloofile_config.patch
deleted file mode 100644
index ccc717f..0000000
--- a/baloo-5.45.0-baloofile_config.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up baloo-5.45.0/src/file/fileindexerconfig.cpp.baloofile_config baloo-5.45.0/src/file/fileindexerconfig.cpp
---- baloo-5.45.0/src/file/fileindexerconfig.cpp.baloofile_config	2018-04-07 14:32:21.000000000 -0500
-+++ baloo-5.45.0/src/file/fileindexerconfig.cpp	2018-04-08 07:53:43.984930379 -0500
-@@ -318,8 +318,13 @@ void FileIndexerConfig::buildFolderCache
-     }
- 
-     KConfigGroup group = m_config.group("General");
--    QStringList includeFoldersPlain = group.readPathEntry("folders", QStringList() << QDir::homePath());
--    QStringList excludeFoldersPlain = group.readPathEntry("exclude folders", QStringList());
-+    QStringList includeFoldersPlain = group.readPathEntry("folders", QStringList() << 
-+        QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation) <<
-+        QStandardPaths::standardLocations(QStandardPaths::MusicLocation) <<
-+        QStandardPaths::standardLocations(QStandardPaths::MoviesLocation) <<
-+        QStandardPaths::standardLocations(QStandardPaths::PicturesLocation) 
-+    );
-+    QStringList excludeFoldersPlain = group.readPathEntry("exclude folders", QStringList() << QDir::homePath());
- 
-     // Add all removable media and network shares as ignored unless they have
-     // been explicitly added in the include list
diff --git a/baloo-5.67.0-baloofile_config.patch b/baloo-5.67.0-baloofile_config.patch
new file mode 100644
index 0000000..6781bc7
--- /dev/null
+++ b/baloo-5.67.0-baloofile_config.patch
@@ -0,0 +1,21 @@
+diff -ur baloo-5.67.0/src/lib/baloosettings.kcfg baloo-5.67.0-baloofile_config/src/lib/baloosettings.kcfg
+--- baloo-5.67.0/src/lib/baloosettings.kcfg	2020-02-02 13:42:43.000000000 +0100
++++ baloo-5.67.0-baloofile_config/src/lib/baloosettings.kcfg	2020-02-03 22:19:59.824381582 +0100
+@@ -31,11 +31,15 @@
+     </entry>
+     <entry name="excludedFolders" key="exclude folders" type="PathList">
+       <label>exclude folders</label>
+-      <default code="true">QStringList()</default>
++      <default code="true">QStringList() &lt;&lt; QDir::homePath()</default>
+     </entry>
+     <entry name="folders" type="PathList">
+       <label>folders</label>
+-      <default code="true">QStringList() &lt;&lt; QDir::homePath()</default>
++      <default code="true">QStringList() &lt;&lt;
++         QStandardPaths::standardLocations(QStandardPaths::DocumentsLocation) &lt;&lt;
++         QStandardPaths::standardLocations(QStandardPaths::MusicLocation) &lt;&lt;
++         QStandardPaths::standardLocations(QStandardPaths::MoviesLocation) &lt;&lt;
++         QStandardPaths::standardLocations(QStandardPaths::PicturesLocation)</default>
+     </entry>
+     <entry name="excludedMimetypes" key="exclude mimetypes" type="StringList">
+       <label>exclude mimetypes</label>
diff --git a/kf5-baloo.spec b/kf5-baloo.spec
index e2bfd51..a46f59d 100644
--- a/kf5-baloo.spec
+++ b/kf5-baloo.spec
@@ -31,8 +31,7 @@ Source1:        97-kde-baloo-filewatch-inotify.conf
 
 ## upstreamable patches
 # http://bugzilla.redhat.com/1235026
-# FIXME!
-#Patch100: baloo-5.45.0-baloofile_config.patch
+Patch100: baloo-5.67.0-baloofile_config.patch
 
 ## upstream patches
 
@@ -206,6 +205,7 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 %changelog
 * Sun Feb 02 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.67.0-1
 - 5.67.0
+- Port baloofile_config patch to kcfg (Kevin Kofler)
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.66.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild