Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2017-03-28 15:09:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata5" Tue Mar 28 15:09:47 2017 rev:44 rq:481509 version:5.32.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2017-03-03 15:39:12.233139899 +0100 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new/kfilemetadata5.changes 2017-03-28 15:09:49.410940425 +0200 @@ -1,0 +2,23 @@ +Mon Mar 20 14:52:29 UTC 2017 - [email protected] + +- Add Make-PlainTextExtractor-match-text-plain-again.patch to fix + metadata extraction for text files which got broken in 5.32.0 + +------------------------------------------------------------------- +Sun Mar 19 14:50:33 CET 2017 - [email protected] + +- Update to 5.32.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.32.0.php +- Changes since 5.31.0: + * Commit translations from l10n-kf5 + * Upgrade ECM and KF5 version requirements for 5.32.0 release. + * Upgrade KF5 version to 5.32.0. + * fix build of kfilemetadata with taglib version 1.9 + * New maintainer for kfilemetadata + * [ExtractorCollection] Use mimetype inheritance to return plugins + * add a new property DiscNumber for audio files from multi-disc albums + * add more audio format to automatic test and fix problems + +------------------------------------------------------------------- Old: ---- kfilemetadata-5.31.0.tar.xz New: ---- Make-PlainTextExtractor-match-text-plain-again.patch kfilemetadata-5.32.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.7RsMLz/_old 2017-03-28 15:09:50.038851469 +0200 +++ /var/tmp/diff_new_pack.7RsMLz/_new 2017-03-28 15:09:50.042850902 +0200 @@ -18,9 +18,9 @@ %bcond_without ffmpeg %bcond_without lang -%define _tar_path 5.31 +%define _tar_path 5.32 Name: kfilemetadata5 -Version: 5.31.0 +Version: 5.32.0 Release: 0 %define kf5_version %{version} Summary: Extract Metadata @@ -30,6 +30,8 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz Source1: baselibs.conf Patch0: ffmpeg-buildrequires.patch +# PATCH-FIX-UPSTREAM Make-PlainTextExtractor-match-text-plain-again.patch -- fixes metadata extraction for text files +Patch1: Make-PlainTextExtractor-match-text-plain-again.patch BuildRequires: extra-cmake-modules >= %{_tar_path} %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) @@ -69,6 +71,7 @@ %prep %setup -q -n kfilemetadata-%{version} %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ Make-PlainTextExtractor-match-text-plain-again.patch ++++++ >From f9c8bb29b2cf5d46ff68c0261393084d1ff16ece Mon Sep 17 00:00:00 2001 From: Igor Poboiko <[email protected]> Date: Fri, 17 Mar 2017 11:21:45 +0300 Subject: Make PlainTextExtractor match "text/plain" again This fixes the regression introduced with commit 7c7e985a4678fef5f5d0dd8faa9b9cb42e3844b4. Added autotest that could possibly detect such regression in the future. REVIEW: 130013 --- autotests/CMakeLists.txt | 14 +++++++++++ autotests/extractorcollectiontest.cpp | 45 +++++++++++++++++++++++++++++++++++ src/externalextractor.cpp | 2 -- src/extractors/plaintextextractor.cpp | 2 +- 4 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 autotests/extractorcollectiontest.cpp diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index 5ab742b..5d28bdf 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -104,6 +104,20 @@ ecm_add_test(externalextractortest.cpp ../src/externalextractor.cpp LINK_LIBRARIES Qt5::Test KF5::FileMetaData KF5::I18n ) +# +# Collection +# +set(extractorcollection_SRCS + extractorcollectiontest.cpp + ../src/extractorcollection.cpp + ../src/externalextractor.cpp +) + +ecm_add_test(${extractorcollection_SRCS} + TEST_NAME "extractorcollectiontest" + LINK_LIBRARIES Qt5::Test KF5::FileMetaData +) + ################ # Writer tests # ################ diff --git a/autotests/extractorcollectiontest.cpp b/autotests/extractorcollectiontest.cpp new file mode 100644 index 0000000..dd5f396 --- /dev/null +++ b/autotests/extractorcollectiontest.cpp @@ -0,0 +1,45 @@ +/* + * This file is part of the KDE KFileMetaData project + * Copyright (C) 2014 Vishesh Handa <[email protected]> + * 2017 Igor Poboiko <[email protected]> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include <QObject> +#include <QtTest> +#include <QDebug> + +#include "extractorcollection.h" +#include "extractors/plaintextextractor.h" + +using namespace KFileMetaData; + +class ExtractorCollectionTest : public QObject +{ + Q_OBJECT +private Q_SLOTS: + void testFetchExtractors() + { + ExtractorCollection collection; + QVERIFY(collection.fetchExtractors("unknown/mimetype").isEmpty()); + QVERIFY(!collection.fetchExtractors("text/plain").isEmpty()); + } +}; + +QTEST_MAIN(ExtractorCollectionTest) + +#include "extractorcollectiontest.moc" diff --git a/src/externalextractor.cpp b/src/externalextractor.cpp index 05f0645..1927456 100644 --- a/src/externalextractor.cpp +++ b/src/externalextractor.cpp @@ -30,8 +30,6 @@ #include <QJsonObject> #include <QJsonArray> -#include <KLocalizedString> - #include "properties.h" #include "propertyinfo.h" #include "typeinfo.h" diff --git a/src/extractors/plaintextextractor.cpp b/src/extractors/plaintextextractor.cpp index 26e1247..e53d149 100644 --- a/src/extractors/plaintextextractor.cpp +++ b/src/extractors/plaintextextractor.cpp @@ -43,7 +43,7 @@ PlainTextExtractor::PlainTextExtractor(QObject* parent) QStringList PlainTextExtractor::mimetypes() const { - return QStringList() << QStringLiteral("text/"); + return QStringList() << QStringLiteral("text/plain"); } void PlainTextExtractor::extract(ExtractionResult* result) -- cgit v0.11.2 ++++++ kfilemetadata-5.31.0.tar.xz -> kfilemetadata-5.32.0.tar.xz ++++++ ++++ 5083 lines of diff (skipped)
