Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2017-04-17 10:24:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Mon Apr 17 10:24:14 2017 rev:59 rq:487573 version:5.9.4 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2017-03-28 15:16:50.251325615 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2017-04-17 10:24:15.739624338 +0200 @@ -1,0 +2,11 @@ +Wed Apr 12 13:18:46 UTC 2017 - [email protected] + +- Add upstreamed patch to allow switching off baloo content indexing: + * 0001-kcm_baloofile-Add-option-to-disable-file-content-ind.patch + +------------------------------------------------------------------- +Sat Apr 8 11:44:22 UTC 2017 - [email protected] + +- Remove empty files in %_kf5_appstreamdir + +------------------------------------------------------------------- New: ---- 0001-kcm_baloofile-Add-option-to-disable-file-content-ind.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.VrLjmX/_old 2017-04-17 10:24:16.583504826 +0200 +++ /var/tmp/diff_new_pack.VrLjmX/_new 2017-04-17 10:24:16.587504260 +0200 @@ -35,6 +35,8 @@ Patch1: 0001-Use-themed-user-face-icon-in-kickoff.patch # PATCHES 100-200 and above are from upstream 5.9 branch # PATCHES 201-300 and above are from upstream master/5.10 branch +# PATCH-FIX-UPSTREAM +Patch201: 0001-kcm_baloofile-Add-option-to-disable-file-content-ind.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -178,6 +180,7 @@ %prep %setup -q -n plasma-desktop-%{version} %patch1 -p1 +%patch201 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} @@ -198,6 +201,10 @@ cp %{_kf5_iconsdir}/breeze/preferences/32/preferences-desktop-color.svg %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/preferences/ fi + # remove empty/invalid appstream xml files. kpackagetool5 generates invalid files sometimes... + # remove this once kpackagetool5 is fixed + find %{buildroot}%{_kf5_appstreamdir} -type f -size 0 -print -delete + # no devel files needed here rm -rfv %{buildroot}%{_kf5_sharedir}/dbus-1/interfaces/ %fdupes %{buildroot}/%{_prefix} ++++++ 0001-kcm_baloofile-Add-option-to-disable-file-content-ind.patch ++++++ >From a818d2f0ad30bb14718f296690a95ef55ed5a9db Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Sat, 8 Apr 2017 16:02:49 +0200 Subject: [PATCH] kcm_baloofile: Add option to disable file content indexing Summary: Baloo supports "only basic indexing" since version 5.15, which causes it to only store file names into the database: https://community.kde.org/Baloo/Configuration Test Plan: Ran "balooctl config show contentIndexing" after changing the option. Reviewers: #plasma, mart Reviewed By: mart Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D5351 --- CMakeLists.txt | 2 +- kcms/baloo/configwidget.ui | 7 +++++++ kcms/baloo/kcm.cpp | 11 +++++++++++ kcms/baloo/kcm.h | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e8ef25d..04c1309c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ set_package_properties(AppStreamQt PROPERTIES DESCRIPTION "Appstream integration TYPE RECOMMENDED PURPOSE "Needed to allow appstream integration from application menus" ) -find_package(KF5Baloo) +find_package(KF5Baloo 5.15) set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" TYPE RECOMMENDED PURPOSE "Needed to build the File Search KCM" diff --git a/kcms/baloo/configwidget.ui b/kcms/baloo/configwidget.ui index 63103f02..bd13169c 100644 --- a/kcms/baloo/configwidget.ui +++ b/kcms/baloo/configwidget.ui @@ -40,6 +40,13 @@ </widget> </item> <item> + <widget class="QCheckBox" name="m_enableContentIndexing"> + <property name="text"> + <string>Also index file content</string> + </property> + </widget> + </item> + <item> <widget class="QGroupBox" name="m_excludeFolders_GB"> <property name="title"> <string>Do not search in these locations</string> diff --git a/kcms/baloo/kcm.cpp b/kcms/baloo/kcm.cpp index 96574961..a192ad5a 100644 --- a/kcms/baloo/kcm.cpp +++ b/kcms/baloo/kcm.cpp @@ -73,6 +73,8 @@ ServerConfigModule::ServerConfigModule(QWidget* parent, const QVariantList& args this, &ServerConfigModule::onDirectoryListChanged); connect(m_enableCheckbox, SIGNAL(stateChanged(int)), this, SLOT(changed())); + connect(m_enableCheckbox, SIGNAL(stateChanged(int)), + this, SLOT(indexingEnabledChanged())); } @@ -88,6 +90,9 @@ void ServerConfigModule::load() m_previouslyEnabled = config.fileIndexingEnabled(); m_enableCheckbox->setChecked(m_previouslyEnabled); + m_enableContentIndexing->setChecked(!config.onlyBasicIndexing()); + m_enableContentIndexing->setEnabled(m_enableCheckbox->isChecked()); + QStringList includeFolders = config.includeFolders(); QStringList excludeFolders = config.excludeFolders(); m_excludeFolders_FSW->setDirectoryList(includeFolders, excludeFolders); @@ -112,6 +117,7 @@ void ServerConfigModule::save() config.setFileIndexingEnabled(enabled); config.setIncludeFolders(includeFolders); config.setExcludeFolders(excludeFolders); + config.setOnlyBasicIndexing(!m_enableContentIndexing->isChecked()); if (m_previouslyEnabled != enabled) { config.setFirstRun(true); @@ -148,6 +154,11 @@ void ServerConfigModule::defaults() m_excludeFolders_FSW->setDirectoryList(defaultFolders(), QStringList()); } +void ServerConfigModule::indexingEnabledChanged() +{ + m_enableContentIndexing->setEnabled(m_enableCheckbox->isChecked()); +} + void ServerConfigModule::onDirectoryListChanged() { m_enableCheckbox->setChecked(!allMountPointsExcluded()); diff --git a/kcms/baloo/kcm.h b/kcms/baloo/kcm.h index 829610a6..f093d02c 100644 --- a/kcms/baloo/kcm.h +++ b/kcms/baloo/kcm.h @@ -38,6 +38,7 @@ public Q_SLOTS: void load(); void save(); void defaults(); + void indexingEnabledChanged(); void onDirectoryListChanged(); private: -- 2.12.0
