Hello community, here is the log from the commit of package baloo5 for openSUSE:Factory checked in at 2019-02-28 21:37:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baloo5 (Old) and /work/SRC/openSUSE:Factory/.baloo5.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "baloo5" Thu Feb 28 21:37:12 2019 rev:61 rq:679902 version:5.55.0 Changes: -------- --- /work/SRC/openSUSE:Factory/baloo5/baloo5.changes 2019-02-14 14:22:40.699950591 +0100 +++ /work/SRC/openSUSE:Factory/.baloo5.new.28833/baloo5.changes 2019-02-28 21:37:15.285661863 +0100 @@ -1,0 +2,13 @@ +Wed Feb 27 16:04:34 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix crashing kdeinit, add + 0001-Check-string-length-to-avoid-crash-for-tags-URL.patch + +------------------------------------------------------------------- +Fri Feb 15 09:25:42 UTC 2019 - [email protected] + +- Add 0001-Do-not-use-qfileinfo-metadatachangetime-if-Qt-lt-5.10.patch to + revert a change by upstream that removes support for Qt < 5.10 +- Downgrade the Qt version requirement to build with 5.9 + +------------------------------------------------------------------- New: ---- 0001-Check-string-length-to-avoid-crash-for-tags-URL.patch 0001-Do-not-use-qfileinfo-metadatachangetime-if-Qt-lt-5.10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo5.spec ++++++ --- /var/tmp/diff_new_pack.8b3C2m/_old 2019-02-28 21:37:16.345661528 +0100 +++ /var/tmp/diff_new_pack.8b3C2m/_new 2019-02-28 21:37:16.381661518 +0100 @@ -33,6 +33,10 @@ Source1: baselibs.conf # PATCH-FIX-OPENSUSE fix-cmakelists-comments.diff -- Change cmake 3.0 block comments to work in cmake 2.x Patch1: fix-cmakelists-comments.diff +# PATCH-FIX-OPENSUSE +Patch2: 0001-Do-not-use-qfileinfo-metadatachangetime-if-Qt-lt-5.10.patch +# PATCH-FIX-UPSTREAM +Patch3: 0001-Check-string-length-to-avoid-crash-for-tags-URL.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem BuildRequires: libattr-devel @@ -144,6 +148,11 @@ %prep %setup -q -n baloo-%{version} %patch1 -p1 +%patch2 -p1 +%if 0%{?suse_version} == 1500 +sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt +%endif +%patch3 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ 0001-Check-string-length-to-avoid-crash-for-tags-URL.patch ++++++ >From 604a2f402da7bf9869b9f4fbe31e776e64435448 Mon Sep 17 00:00:00 2001 From: Jonathan Marten <[email protected]> Date: Wed, 27 Feb 2019 08:04:58 +0000 Subject: [PATCH] Check string length to avoid crash for "tags:/" URL Reviewed changes merged with upstream commit. Differential Revision: https://phabricator.kde.org/D19371 --- src/kioslaves/tags/kio_tags.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kioslaves/tags/kio_tags.cpp b/src/kioslaves/tags/kio_tags.cpp index b81647e2..e241f022 100644 --- a/src/kioslaves/tags/kio_tags.cpp +++ b/src/kioslaves/tags/kio_tags.cpp @@ -295,7 +295,7 @@ TagsProtocol::ParseResult TagsProtocol::parseUrl(const QUrl& url, const QList<Pa TagsProtocol::ParseResult result; result.decodedUrl = QUrl::fromPercentEncoding(url.toString().toUtf8()); - if (result.decodedUrl.at(6) == QChar('/')) { + if ((url.scheme() == QLatin1String("tags")) && result.decodedUrl.length()>6 && result.decodedUrl.at(6) == QChar('/')) { result.urlType = InvalidUrl; return result; } -- 2.21.0 ++++++ 0001-Do-not-use-qfileinfo-metadatachangetime-if-Qt-lt-5.10.patch ++++++ >From d1a289b4b94903d86a60efc7f1cdc55fd7364b54 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid <[email protected]> Date: Mon, 7 Jan 2019 00:26:27 +0100 Subject: Remove Qt 5.10 checks now that we require it as min version --- src/file/modifiedfileindexer.cpp | 4 ---- src/file/unindexedfileiterator.cpp | 4 ---- src/tools/balooshow/main.cpp | 4 ---- 3 files changed, 12 deletions(-) Reverted by Antonio Larrosa <[email protected]> so Qt 5.9 is still supported diff --git a/src/file/modifiedfileindexer.cpp b/src/file/modifiedfileindexer.cpp index b609b7b..6ac9f82 100644 --- a/src/file/modifiedfileindexer.cpp +++ b/src/file/modifiedfileindexer.cpp @@ -79,7 +79,11 @@ void ModifiedFileIndexer::run() } bool mTimeChanged = timeInfo.mTime != fileInfo.lastModified().toTime_t(); +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) bool cTimeChanged = timeInfo.cTime != fileInfo.metadataChangeTime().toTime_t(); +#else + bool cTimeChanged = timeInfo.cTime != fileInfo.created().toTime_t(); +#endif if (!mTimeChanged && !cTimeChanged) { continue; diff --git a/src/file/unindexedfileiterator.cpp b/src/file/unindexedfileiterator.cpp index 80f4b49..4417874 100644 --- a/src/file/unindexedfileiterator.cpp +++ b/src/file/unindexedfileiterator.cpp @@ -114,7 +114,11 @@ bool UnIndexedFileIterator::shouldIndex(const QString& filePath, const QString& m_mTimeChanged = true; } +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) auto fileMTime = fileInfo.metadataChangeTime().toTime_t(); +#else + auto fileMTime = fileInfo.created().toTime_t(); +#endif if (timeInfo.cTime != fileMTime) { m_cTimeChanged = true; } diff --git a/src/tools/balooshow/main.cpp b/src/tools/balooshow/main.cpp index 78f24de..4419bc1 100644 --- a/src/tools/balooshow/main.cpp +++ b/src/tools/balooshow/main.cpp @@ -232,7 +232,11 @@ int main(int argc, char* argv[]) int propNum = prop.toInt(&ok); QString value = word.mid(posOfNonNumeric + 1); if (!ok) { +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) auto error = QString("malformed property term (bad index): '%1' in '%2'\n").arg(prop).arg(arrAsPrintable()); +#else + auto error = QString("malformed property term (bad index): '%1' in '%2'\n").arg(prop.toString()).arg(arrAsPrintable()); +#endif stream << errorPrefix.subs(error).toString(); continue; } -- cgit v1.1
