From bd7da72e419e798d355ce150afc2f536af0d02c4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 09 2015 14:55:21 +0000 Subject: reduce kbuildsycoca5 warning(spam) output --- diff --git a/kf5-kservice.spec b/kf5-kservice.spec index 23d5fac..7688cfd 100644 --- a/kf5-kservice.spec +++ b/kf5-kservice.spec @@ -3,7 +3,7 @@ Name: kf5-%{framework} Summary: KDE Frameworks 5 Tier 3 solution for advanced plugin and service introspection Version: 5.17.0 -Release: 1%{?dist} +Release: 2%{?dist} # mixture of LGPLv2 and LGPLv2+ (mostly the latter) License: LGPLv2 @@ -23,6 +23,11 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra # This prevents the stuff getting listed twice, under both System and Settings. Patch0: kservice-5.15.0-xdg-menu.patch +# kbuildsycoca5 always gives: +# kf5.kservice.sycoca: Parse error in "$HOME/.config/menus/applications-merged/xdg-desktop-menu-dummy.menu" , line 1 , col 1 : "unexpected end of file" +# hide that by default, make it qCDebug instead (of qCWarning) +Patch1: kservice-5.17.0-vfolder_spam.patch + ## upstream patches BuildRequires: cmake @@ -100,6 +105,9 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kservicetypes5 %changelog +* Wed Dec 09 2015 Rex Dieter 5.17.0-2 +- reduce kbuildsycoca5 warning(spam) output + * Tue Dec 08 2015 Daniel Vrátil - 5.17.0-1 - KDE Frameworks 5.17.0 diff --git a/kservice-5.17.0-vfolder_spam.patch b/kservice-5.17.0-vfolder_spam.patch new file mode 100644 index 0000000..37b3603 --- /dev/null +++ b/kservice-5.17.0-vfolder_spam.patch @@ -0,0 +1,12 @@ +diff -up kservice-5.17.0/src/sycoca/vfolder_menu.cpp.vfolder_spam kservice-5.17.0/src/sycoca/vfolder_menu.cpp +--- kservice-5.17.0/src/sycoca/vfolder_menu.cpp.vfolder_spam 2015-12-06 15:38:04.000000000 -0600 ++++ kservice-5.17.0/src/sycoca/vfolder_menu.cpp 2015-12-09 08:51:46.339401871 -0600 +@@ -464,7 +464,7 @@ VFolderMenu::loadDoc() + int errorRow; + int errorCol; + if (!doc.setContent(&file, &errorMsg, &errorRow, &errorCol)) { +- qCWarning(SYCOCA) << "Parse error in " << m_docInfo.path << ", line " << errorRow << ", col " << errorCol << ": " << errorMsg; ++ qCDebug(SYCOCA) << "Parse error in " << m_docInfo.path << ", line " << errorRow << ", col " << errorCol << ": " << errorMsg; + file.close(); + return doc; + }