reduce stderr spam about invalid mimetypes (workaround #1184918)
This commit is contained in:
parent
6c70da6b72
commit
13bce06724
|
@ -0,0 +1,12 @@
|
||||||
|
diff -up kdelibs-4.14.4/kdecore/services/kmimetyperepository.cpp.mimespam kdelibs-4.14.4/kdecore/services/kmimetyperepository.cpp
|
||||||
|
--- kdelibs-4.14.4/kdecore/services/kmimetyperepository.cpp.mimespam 2015-01-06 17:55:23.000000000 -0600
|
||||||
|
+++ kdelibs-4.14.4/kdecore/services/kmimetyperepository.cpp 2015-01-27 08:39:12.461004022 -0600
|
||||||
|
@@ -317,7 +317,7 @@ QStringList KMimeTypeRepository::parents
|
||||||
|
const QString derivedTypeName = line.left(pos);
|
||||||
|
KMimeType::Ptr derivedType = findMimeTypeByName(derivedTypeName, KMimeType::ResolveAliases);
|
||||||
|
if (!derivedType)
|
||||||
|
- kWarning(7012) << fileName << " refers to unknown mimetype " << derivedTypeName;
|
||||||
|
+ kDebug(7012) << fileName << " refers to unknown mimetype " << derivedTypeName;
|
||||||
|
else {
|
||||||
|
const QString parentTypeName = line.mid(pos+1);
|
||||||
|
Q_ASSERT(!parentTypeName.isEmpty());
|
|
@ -44,7 +44,7 @@ Summary: KDE Libraries
|
||||||
# shipped with kde applications, version...
|
# shipped with kde applications, version...
|
||||||
%global apps_version 14.12.1
|
%global apps_version 14.12.1
|
||||||
Version: 4.14.4
|
Version: 4.14.4
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
|
@ -137,6 +137,9 @@ Patch41: 0002-Trigger-installation-of-missing-components-when-inst.patch
|
||||||
# https://git.reviewboard.kde.org/r/102350/
|
# https://git.reviewboard.kde.org/r/102350/
|
||||||
Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
|
Patch42: 0003-Implement-automatic-scanning-of-source-code-for-requ.patch
|
||||||
|
|
||||||
|
# reduce stderr spamming about invalid mimetypes (kWarning->kDebug)
|
||||||
|
# workaround for http://bugzilla.redhat.com/1184918
|
||||||
|
Patch43: kdelibs-4.14.4-unknown_mimetype_spam.patch
|
||||||
# limit solid qDebug spam
|
# limit solid qDebug spam
|
||||||
# http://bugzilla.redhat.com/882731
|
# http://bugzilla.redhat.com/882731
|
||||||
# TODO: could make uptreamable and conditional only on Release-type builds
|
# TODO: could make uptreamable and conditional only on Release-type builds
|
||||||
|
@ -419,6 +422,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||||
%patch41 -p1 -b .libplasma-pk-0002
|
%patch41 -p1 -b .libplasma-pk-0002
|
||||||
%patch42 -p1 -b .libplasma-pk-0003
|
%patch42 -p1 -b .libplasma-pk-0003
|
||||||
|
|
||||||
|
%patch43 -p1 -b .unknown_mimetype_spam
|
||||||
%if "%{?udisks}" == "udisks2"
|
%if "%{?udisks}" == "udisks2"
|
||||||
%patch49 -p1 -b .solid_qt_no_debug_output
|
%patch49 -p1 -b .solid_qt_no_debug_output
|
||||||
%endif
|
%endif
|
||||||
|
@ -790,6 +794,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 27 2015 Rex Dieter <rdieter@fedoraproject.org> 6:4.14.4-2
|
||||||
|
- reduce stderr spam about invalid mimetypes (workaround #1184918)
|
||||||
|
|
||||||
* Sat Jan 10 2015 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.4-1
|
* Sat Jan 10 2015 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.4-1
|
||||||
- 4.14.4 (with kde-applications-14.12.1)
|
- 4.14.4 (with kde-applications-14.12.1)
|
||||||
- +macros.kdelibs4 : includes %%kde_applications_version, %%kde_runtime_requires, %%kdelibs_requires
|
- +macros.kdelibs4 : includes %%kde_applications_version, %%kde_runtime_requires, %%kdelibs_requires
|
||||||
|
|
Loading…
Reference in New Issue