Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2018-06-22 13:19:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata5" Fri Jun 22 13:19:52 2018 rev:59 rq:616758 version:5.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2018-05-18 14:21:01.781506023 +0200 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new/kfilemetadata5.changes 2018-06-22 13:19:52.633039531 +0200 @@ -1,0 +2,16 @@ +Tue Jun 12 21:26:04 UTC 2018 - [email protected] + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * Use override + * check that ffmpeg is at least version 3.1 that introduce the API we require + * split tests for better readability + * search for album artist and albumartist tags in taglibextractor + * popplerextractor: don't try to guess the title if there isn't one. +- Dropped patches, superseded by upstream changes: + - ffmpeg-buildrequires.patch + +------------------------------------------------------------------- Old: ---- ffmpeg-buildrequires.patch kfilemetadata-5.46.0.tar.xz New: ---- kfilemetadata-5.47.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.TKaKhd/_old 2018-06-22 13:19:53.768997411 +0200 +++ /var/tmp/diff_new_pack.TKaKhd/_new 2018-06-22 13:19:53.768997411 +0200 @@ -16,15 +16,14 @@ # -%bcond_without ffmpeg %bcond_without lang -%define _tar_path 5.46 +%define _tar_path 5.47 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: kfilemetadata5 -Version: 5.46.0 +Version: 5.47.0 Release: 0 %define kf5_version %{version} Summary: Extract Metadata @@ -33,13 +32,7 @@ Url: http://www.kde.org/ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz Source1: baselibs.conf -Patch0: ffmpeg-buildrequires.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} -%if %{with ffmpeg} -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) -%endif BuildRequires: karchive-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} @@ -50,6 +43,9 @@ BuildRequires: cmake(Qt5Multimedia) >= 5.6.0 BuildRequires: cmake(Qt5Test) >= 5.6.0 BuildRequires: cmake(Qt5Xml) >= 5.6.0 +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(poppler-qt5) Recommends: catdoc Recommends: %{name}-lang @@ -69,9 +65,9 @@ A library for extracting file metadata. Development files %lang_package + %prep %setup -q -n kfilemetadata-%{version} -%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ kfilemetadata-5.46.0.tar.xz -> kfilemetadata-5.47.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/CMakeLists.txt new/kfilemetadata-5.47.0/CMakeLists.txt --- old/kfilemetadata-5.46.0/CMakeLists.txt 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/CMakeLists.txt 2018-06-02 19:54:55.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts -set(KF5_DEP_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts +set(KF5_DEP_VERSION "5.47.0") # handled by release scripts project(KFileMetaData VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -56,7 +56,7 @@ URL "http://www.exiv2.org"; TYPE OPTIONAL PURPOSE "Support for image metadata") -find_package(FFmpeg 1.0) +find_package(FFmpeg 3.1) set_package_properties(FFmpeg PROPERTIES DESCRIPTION "Video Tag reader" URL "http://ffmpeg.org"; TYPE OPTIONAL PURPOSE "Support for video metadata") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/autotests/taglibextractortest.cpp new/kfilemetadata-5.47.0/autotests/taglibextractortest.cpp --- old/kfilemetadata-5.46.0/autotests/taglibextractortest.cpp 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/autotests/taglibextractortest.cpp 2018-06-02 19:54:55.000000000 +0200 @@ -48,7 +48,7 @@ return result; } -void TagLibExtractorTest::test() +void TagLibExtractorTest::testOpus() { TagLibExtractor plugin{this}; @@ -83,6 +83,11 @@ QCOMPARE(resultOpus.properties().value(Property::ReleaseYear).toInt(), 2015); QCOMPARE(resultOpus.properties().value(Property::Channels).toInt(), 1); QCOMPARE(resultOpus.properties().value(Property::DiscNumber).toInt(), 1); +} + +void TagLibExtractorTest::testFlac() +{ + TagLibExtractor plugin{this}; SimpleExtractionResult resultFlac(testFilePath("test.flac"), "audio/flac"); plugin.extract(&resultFlac); @@ -115,6 +120,11 @@ QCOMPARE(resultFlac.properties().value(Property::ReleaseYear).toInt(), 2015); QCOMPARE(resultFlac.properties().value(Property::Channels).toInt(), 1); QCOMPARE(resultFlac.properties().value(Property::DiscNumber).toInt(), 1); +} + +void TagLibExtractorTest::testOgg() +{ + TagLibExtractor plugin{this}; SimpleExtractionResult resultOgg(testFilePath("test.ogg"), "audio/ogg"); plugin.extract(&resultOgg); @@ -147,6 +157,11 @@ QCOMPARE(resultOgg.properties().value(Property::ReleaseYear).toInt(), 2015); QCOMPARE(resultOgg.properties().value(Property::Channels).toInt(), 1); QCOMPARE(resultOgg.properties().value(Property::DiscNumber).toInt(), 1); +} + +void TagLibExtractorTest::testMp3() +{ + TagLibExtractor plugin{this}; SimpleExtractionResult resultMp3(testFilePath("test.mp3"), "audio/mpeg"); plugin.extract(&resultMp3); @@ -170,6 +185,11 @@ QCOMPARE(resultMp3.properties().value(Property::ReleaseYear).toInt(), 2015); QCOMPARE(resultMp3.properties().value(Property::Channels).toInt(), 1); QCOMPARE(resultMp3.properties().value(Property::DiscNumber).toInt(), 1); +} + +void TagLibExtractorTest::testMpc() +{ + TagLibExtractor plugin{this}; SimpleExtractionResult resultMpc(testFilePath("test.mpc"), "audio/x-musepack"); plugin.extract(&resultMpc); @@ -200,6 +220,11 @@ QCOMPARE(resultMpc.properties().value(Property::ReleaseYear).toInt(), 2015); QCOMPARE(resultMpc.properties().value(Property::Channels).toInt(), 1); QCOMPARE(resultMpc.properties().value(Property::DiscNumber).isValid(), false); +} + +void TagLibExtractorTest::testMp4() +{ + TagLibExtractor plugin{this}; SimpleExtractionResult resultMp4(testFilePath("test.m4a"), "audio/mp4"); plugin.extract(&resultMp4); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/autotests/taglibextractortest.h new/kfilemetadata-5.47.0/autotests/taglibextractortest.h --- old/kfilemetadata-5.46.0/autotests/taglibextractortest.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/autotests/taglibextractortest.h 2018-06-02 19:54:55.000000000 +0200 @@ -32,7 +32,12 @@ QString testFilePath(const QString& fileName) const; private Q_SLOTS: - void test(); + void testOpus(); + void testFlac(); + void testOgg(); + void testMpc(); + void testMp3(); + void testMp4(); void testNoMetadata(); void testNoMetadata_data(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/po/de/kfilemetadata5.po new/kfilemetadata-5.47.0/po/de/kfilemetadata5.po --- old/kfilemetadata-5.46.0/po/de/kfilemetadata5.po 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/po/de/kfilemetadata5.po 2018-06-02 19:54:55.000000000 +0200 @@ -1,12 +1,12 @@ -# Burkhard Lück <[email protected]>, 2014, 2015, 2016, 2017. +# Burkhard Lück <[email protected]>, 2014, 2015, 2016, 2017, 2018. # Frederik Schwarzer <[email protected]>, 2016, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-13 03:28+0200\n" -"PO-Revision-Date: 2018-04-18 19:47+0100\n" -"Last-Translator: Frederik Schwarzer <[email protected]>\n" +"PO-Revision-Date: 2018-05-18 12:41+0100\n" +"Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -322,24 +322,22 @@ msgstr "CD-Nummer" #: src/propertyinfo.cpp:370 -#, fuzzy, kde-format -#| msgctxt "@label" -#| msgid "Duration" +#, kde-format msgctxt "@label" msgid "Location" -msgstr "Dauer" +msgstr "Ort" #: src/propertyinfo.cpp:376 #, kde-format msgctxt "@label" msgid "Performer" -msgstr "" +msgstr "Interpret" #: src/propertyinfo.cpp:382 #, kde-format msgctxt "@label" msgid "Ensemble" -msgstr "" +msgstr "Ensemble" #: src/propertyinfo.cpp:388 #, kde-format @@ -357,7 +355,7 @@ #, kde-format msgctxt "@label" msgid "Compilation" -msgstr "" +msgstr "Kompilierung" #: src/propertyinfo.cpp:406 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/po/nn/kfilemetadata5.po new/kfilemetadata-5.47.0/po/nn/kfilemetadata5.po --- old/kfilemetadata-5.46.0/po/nn/kfilemetadata5.po 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/po/nn/kfilemetadata5.po 2018-06-02 19:54:55.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-13 03:28+0200\n" -"PO-Revision-Date: 2018-01-24 20:06+0100\n" +"PO-Revision-Date: 2018-05-19 19:11+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" @@ -287,7 +287,7 @@ #, kde-format msgctxt "@label" msgid "Label" -msgstr "" +msgstr "Merkelapp" #: src/propertyinfo.cpp:333 #, kde-format @@ -329,49 +329,49 @@ #, kde-format msgctxt "@label" msgid "Location" -msgstr "" +msgstr "Plassering" #: src/propertyinfo.cpp:376 #, kde-format msgctxt "@label" msgid "Performer" -msgstr "" +msgstr "Utøvar" #: src/propertyinfo.cpp:382 #, kde-format msgctxt "@label" msgid "Ensemble" -msgstr "" +msgstr "Gruppe" #: src/propertyinfo.cpp:388 #, kde-format msgctxt "@label" msgid "Arranger" -msgstr "" +msgstr "Arrangert av" #: src/propertyinfo.cpp:394 #, kde-format msgctxt "@label" msgid "Conductor" -msgstr "" +msgstr "Dirigent" #: src/propertyinfo.cpp:400 #, kde-format msgctxt "@label" msgid "Compilation" -msgstr "" +msgstr "Samling" #: src/propertyinfo.cpp:406 #, kde-format msgctxt "@label" msgid "License" -msgstr "" +msgstr "Lisens" #: src/propertyinfo.cpp:412 #, kde-format msgctxt "@label" msgid "Opus" -msgstr "" +msgstr "Opus" #: src/propertyinfo.cpp:418 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/po/pt_BR/kfilemetadata5.po new/kfilemetadata-5.47.0/po/pt_BR/kfilemetadata5.po --- old/kfilemetadata-5.46.0/po/pt_BR/kfilemetadata5.po 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/po/pt_BR/kfilemetadata5.po 2018-06-02 19:54:55.000000000 +0200 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # André Marcelo Alvarenga <[email protected]>, 2014, 2015, 2016. -# Luiz Fernando Ranghetti <[email protected]>, 2017. +# Luiz Fernando Ranghetti <[email protected]>, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: kfilemetadata\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-13 03:28+0200\n" -"PO-Revision-Date: 2017-12-12 15:57-0300\n" +"PO-Revision-Date: 2018-06-02 01:06-0300\n" "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" "Language: pt_BR\n" @@ -287,7 +287,7 @@ #, kde-format msgctxt "@label" msgid "Label" -msgstr "" +msgstr "Rótulo" #: src/propertyinfo.cpp:333 #, kde-format @@ -326,18 +326,18 @@ msgstr "Número do disco" #: src/propertyinfo.cpp:370 -#, fuzzy, kde-format +#, kde-format #| msgctxt "@label" #| msgid "Duration" msgctxt "@label" msgid "Location" -msgstr "Duração" +msgstr "Localização" #: src/propertyinfo.cpp:376 #, kde-format msgctxt "@label" msgid "Performer" -msgstr "" +msgstr "Artista" #: src/propertyinfo.cpp:382 #, kde-format @@ -355,19 +355,19 @@ #, kde-format msgctxt "@label" msgid "Conductor" -msgstr "" +msgstr "Condutor" #: src/propertyinfo.cpp:400 #, kde-format msgctxt "@label" msgid "Compilation" -msgstr "" +msgstr "Compilação" #: src/propertyinfo.cpp:406 #, kde-format msgctxt "@label" msgid "License" -msgstr "" +msgstr "Licença" #: src/propertyinfo.cpp:412 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/po/sr/kfilemetadata5.po new/kfilemetadata-5.47.0/po/sr/kfilemetadata5.po --- old/kfilemetadata-5.46.0/po/sr/kfilemetadata5.po 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/po/sr/kfilemetadata5.po 2018-06-02 19:54:55.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kfilemetadata5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-10-17 03:36+0200\n" +"POT-Creation-Date: 2018-04-13 03:28+0200\n" "PO-Revision-Date: 2017-10-30 23:08+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -286,106 +286,162 @@ #: src/propertyinfo.cpp:327 #, kde-format msgctxt "@label" +msgid "Label" +msgstr "" + +#: src/propertyinfo.cpp:333 +#, kde-format +msgctxt "@label" msgid "Release Year" msgstr "година издања" -#: src/propertyinfo.cpp:333 +#: src/propertyinfo.cpp:339 #, kde-format msgctxt "@label" msgid "Sample Rate" msgstr "узорковање" -#: src/propertyinfo.cpp:339 +#: src/propertyinfo.cpp:345 #, kde-format msgctxt "@label" msgid "Subject" msgstr "тема" -#: src/propertyinfo.cpp:346 +#: src/propertyinfo.cpp:352 #, kde-format msgctxt "@label" msgid "Title" msgstr "наслов" -#: src/propertyinfo.cpp:352 +#: src/propertyinfo.cpp:358 #, kde-format msgctxt "@label music track number" msgid "Track Number" msgstr "број нумере" -#: src/propertyinfo.cpp:358 +#: src/propertyinfo.cpp:364 #, kde-format msgctxt "@label music disc number" msgid "Disc Number" msgstr "број диска" -#: src/propertyinfo.cpp:364 +#: src/propertyinfo.cpp:370 +#, fuzzy, kde-format +#| msgctxt "@label" +#| msgid "Duration" +msgctxt "@label" +msgid "Location" +msgstr "трајање" + +#: src/propertyinfo.cpp:376 +#, kde-format +msgctxt "@label" +msgid "Performer" +msgstr "" + +#: src/propertyinfo.cpp:382 +#, kde-format +msgctxt "@label" +msgid "Ensemble" +msgstr "" + +#: src/propertyinfo.cpp:388 +#, kde-format +msgctxt "@label" +msgid "Arranger" +msgstr "" + +#: src/propertyinfo.cpp:394 +#, kde-format +msgctxt "@label" +msgid "Conductor" +msgstr "" + +#: src/propertyinfo.cpp:400 +#, kde-format +msgctxt "@label" +msgid "Compilation" +msgstr "" + +#: src/propertyinfo.cpp:406 +#, kde-format +msgctxt "@label" +msgid "License" +msgstr "" + +#: src/propertyinfo.cpp:412 +#, kde-format +msgctxt "@label" +msgid "Opus" +msgstr "" + +#: src/propertyinfo.cpp:418 #, kde-format msgctxt "@label" msgid "Width" msgstr "ширина" -#: src/propertyinfo.cpp:370 +#: src/propertyinfo.cpp:424 #, kde-format msgctxt "@label number of words" msgid "Word Count" msgstr "број речи" -#: src/propertyinfo.cpp:377 +#: src/propertyinfo.cpp:431 #, kde-format msgctxt "@label number of translatable strings" msgid "Translatable Units" msgstr "преводиве јединице" -#: src/propertyinfo.cpp:384 +#: src/propertyinfo.cpp:438 #, kde-format msgctxt "@label number of translated strings" msgid "Translations" msgstr "преводи" -#: src/propertyinfo.cpp:392 +#: src/propertyinfo.cpp:446 #, kde-format msgctxt "@label number of fuzzy translated strings" msgid "Draft Translations" msgstr "нацрти превода" -#: src/propertyinfo.cpp:399 +#: src/propertyinfo.cpp:453 #, kde-format msgctxt "@label translation author" msgid "Author" msgstr "аутор" -#: src/propertyinfo.cpp:406 +#: src/propertyinfo.cpp:460 #, kde-format msgctxt "@label translations last update" msgid "Last Update" msgstr "последња измена" -#: src/propertyinfo.cpp:413 +#: src/propertyinfo.cpp:467 #, kde-format msgctxt "@label date of template creation8" msgid "Template Creation" msgstr "стварање шаблона" -#: src/propertyinfo.cpp:420 +#: src/propertyinfo.cpp:474 #, kde-format msgctxt "@label the URL a file was originally downloded from" msgid "Downloaded From" msgstr "преузето са" -#: src/propertyinfo.cpp:427 +#: src/propertyinfo.cpp:481 #, kde-format msgctxt "@label the subject of an email this file was attached to" msgid "E-Mail Attachment Subject" msgstr "тема прилога е‑поште" -#: src/propertyinfo.cpp:434 +#: src/propertyinfo.cpp:488 #, kde-format msgctxt "@label the sender of an email this file was attached to" msgid "E-Mail Attachment Sender" msgstr "пошиљалац прилога е‑поште" -#: src/propertyinfo.cpp:441 +#: src/propertyinfo.cpp:495 #, kde-format msgctxt "@label the message ID of an email this file was attached to" msgid "E-Mail Attachment Message ID" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/po/sr@ijekavian/kfilemetadata5.po new/kfilemetadata-5.47.0/po/sr@ijekavian/kfilemetadata5.po --- old/kfilemetadata-5.46.0/po/sr@ijekavian/kfilemetadata5.po 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/po/sr@ijekavian/kfilemetadata5.po 2018-06-02 19:54:55.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kfilemetadata5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-10-17 03:36+0200\n" +"POT-Creation-Date: 2018-04-13 03:28+0200\n" "PO-Revision-Date: 2017-10-30 23:08+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -286,106 +286,162 @@ #: src/propertyinfo.cpp:327 #, kde-format msgctxt "@label" +msgid "Label" +msgstr "" + +#: src/propertyinfo.cpp:333 +#, kde-format +msgctxt "@label" msgid "Release Year" msgstr "година издања" -#: src/propertyinfo.cpp:333 +#: src/propertyinfo.cpp:339 #, kde-format msgctxt "@label" msgid "Sample Rate" msgstr "узорковање" -#: src/propertyinfo.cpp:339 +#: src/propertyinfo.cpp:345 #, kde-format msgctxt "@label" msgid "Subject" msgstr "тема" -#: src/propertyinfo.cpp:346 +#: src/propertyinfo.cpp:352 #, kde-format msgctxt "@label" msgid "Title" msgstr "наслов" -#: src/propertyinfo.cpp:352 +#: src/propertyinfo.cpp:358 #, kde-format msgctxt "@label music track number" msgid "Track Number" msgstr "број нумере" -#: src/propertyinfo.cpp:358 +#: src/propertyinfo.cpp:364 #, kde-format msgctxt "@label music disc number" msgid "Disc Number" msgstr "број диска" -#: src/propertyinfo.cpp:364 +#: src/propertyinfo.cpp:370 +#, fuzzy, kde-format +#| msgctxt "@label" +#| msgid "Duration" +msgctxt "@label" +msgid "Location" +msgstr "трајање" + +#: src/propertyinfo.cpp:376 +#, kde-format +msgctxt "@label" +msgid "Performer" +msgstr "" + +#: src/propertyinfo.cpp:382 +#, kde-format +msgctxt "@label" +msgid "Ensemble" +msgstr "" + +#: src/propertyinfo.cpp:388 +#, kde-format +msgctxt "@label" +msgid "Arranger" +msgstr "" + +#: src/propertyinfo.cpp:394 +#, kde-format +msgctxt "@label" +msgid "Conductor" +msgstr "" + +#: src/propertyinfo.cpp:400 +#, kde-format +msgctxt "@label" +msgid "Compilation" +msgstr "" + +#: src/propertyinfo.cpp:406 +#, kde-format +msgctxt "@label" +msgid "License" +msgstr "" + +#: src/propertyinfo.cpp:412 +#, kde-format +msgctxt "@label" +msgid "Opus" +msgstr "" + +#: src/propertyinfo.cpp:418 #, kde-format msgctxt "@label" msgid "Width" msgstr "ширина" -#: src/propertyinfo.cpp:370 +#: src/propertyinfo.cpp:424 #, kde-format msgctxt "@label number of words" msgid "Word Count" msgstr "број речи" -#: src/propertyinfo.cpp:377 +#: src/propertyinfo.cpp:431 #, kde-format msgctxt "@label number of translatable strings" msgid "Translatable Units" msgstr "преводиве јединице" -#: src/propertyinfo.cpp:384 +#: src/propertyinfo.cpp:438 #, kde-format msgctxt "@label number of translated strings" msgid "Translations" msgstr "преводи" -#: src/propertyinfo.cpp:392 +#: src/propertyinfo.cpp:446 #, kde-format msgctxt "@label number of fuzzy translated strings" msgid "Draft Translations" msgstr "нацрти превода" -#: src/propertyinfo.cpp:399 +#: src/propertyinfo.cpp:453 #, kde-format msgctxt "@label translation author" msgid "Author" msgstr "аутор" -#: src/propertyinfo.cpp:406 +#: src/propertyinfo.cpp:460 #, kde-format msgctxt "@label translations last update" msgid "Last Update" msgstr "последња измена" -#: src/propertyinfo.cpp:413 +#: src/propertyinfo.cpp:467 #, kde-format msgctxt "@label date of template creation8" msgid "Template Creation" msgstr "стварање шаблона" -#: src/propertyinfo.cpp:420 +#: src/propertyinfo.cpp:474 #, kde-format msgctxt "@label the URL a file was originally downloded from" msgid "Downloaded From" msgstr "преузето са" -#: src/propertyinfo.cpp:427 +#: src/propertyinfo.cpp:481 #, kde-format msgctxt "@label the subject of an email this file was attached to" msgid "E-Mail Attachment Subject" msgstr "тема прилога е‑поште" -#: src/propertyinfo.cpp:434 +#: src/propertyinfo.cpp:488 #, kde-format msgctxt "@label the sender of an email this file was attached to" msgid "E-Mail Attachment Sender" msgstr "пошиљалац прилога е‑поште" -#: src/propertyinfo.cpp:441 +#: src/propertyinfo.cpp:495 #, kde-format msgctxt "@label the message ID of an email this file was attached to" msgid "E-Mail Attachment Message ID" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/po/sr@ijekavianlatin/kfilemetadata5.po new/kfilemetadata-5.47.0/po/sr@ijekavianlatin/kfilemetadata5.po --- old/kfilemetadata-5.46.0/po/sr@ijekavianlatin/kfilemetadata5.po 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/po/sr@ijekavianlatin/kfilemetadata5.po 2018-06-02 19:54:55.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kfilemetadata5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-10-17 03:36+0200\n" +"POT-Creation-Date: 2018-04-13 03:28+0200\n" "PO-Revision-Date: 2017-10-30 23:08+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -286,106 +286,162 @@ #: src/propertyinfo.cpp:327 #, kde-format msgctxt "@label" +msgid "Label" +msgstr "" + +#: src/propertyinfo.cpp:333 +#, kde-format +msgctxt "@label" msgid "Release Year" msgstr "godina izdanja" -#: src/propertyinfo.cpp:333 +#: src/propertyinfo.cpp:339 #, kde-format msgctxt "@label" msgid "Sample Rate" msgstr "uzorkovanje" -#: src/propertyinfo.cpp:339 +#: src/propertyinfo.cpp:345 #, kde-format msgctxt "@label" msgid "Subject" msgstr "tema" -#: src/propertyinfo.cpp:346 +#: src/propertyinfo.cpp:352 #, kde-format msgctxt "@label" msgid "Title" msgstr "naslov" -#: src/propertyinfo.cpp:352 +#: src/propertyinfo.cpp:358 #, kde-format msgctxt "@label music track number" msgid "Track Number" msgstr "broj numere" -#: src/propertyinfo.cpp:358 +#: src/propertyinfo.cpp:364 #, kde-format msgctxt "@label music disc number" msgid "Disc Number" msgstr "broj diska" -#: src/propertyinfo.cpp:364 +#: src/propertyinfo.cpp:370 +#, fuzzy, kde-format +#| msgctxt "@label" +#| msgid "Duration" +msgctxt "@label" +msgid "Location" +msgstr "trajanje" + +#: src/propertyinfo.cpp:376 +#, kde-format +msgctxt "@label" +msgid "Performer" +msgstr "" + +#: src/propertyinfo.cpp:382 +#, kde-format +msgctxt "@label" +msgid "Ensemble" +msgstr "" + +#: src/propertyinfo.cpp:388 +#, kde-format +msgctxt "@label" +msgid "Arranger" +msgstr "" + +#: src/propertyinfo.cpp:394 +#, kde-format +msgctxt "@label" +msgid "Conductor" +msgstr "" + +#: src/propertyinfo.cpp:400 +#, kde-format +msgctxt "@label" +msgid "Compilation" +msgstr "" + +#: src/propertyinfo.cpp:406 +#, kde-format +msgctxt "@label" +msgid "License" +msgstr "" + +#: src/propertyinfo.cpp:412 +#, kde-format +msgctxt "@label" +msgid "Opus" +msgstr "" + +#: src/propertyinfo.cpp:418 #, kde-format msgctxt "@label" msgid "Width" msgstr "širina" -#: src/propertyinfo.cpp:370 +#: src/propertyinfo.cpp:424 #, kde-format msgctxt "@label number of words" msgid "Word Count" msgstr "broj reči" -#: src/propertyinfo.cpp:377 +#: src/propertyinfo.cpp:431 #, kde-format msgctxt "@label number of translatable strings" msgid "Translatable Units" msgstr "prevodive jedinice" -#: src/propertyinfo.cpp:384 +#: src/propertyinfo.cpp:438 #, kde-format msgctxt "@label number of translated strings" msgid "Translations" msgstr "prevodi" -#: src/propertyinfo.cpp:392 +#: src/propertyinfo.cpp:446 #, kde-format msgctxt "@label number of fuzzy translated strings" msgid "Draft Translations" msgstr "nacrti prevoda" -#: src/propertyinfo.cpp:399 +#: src/propertyinfo.cpp:453 #, kde-format msgctxt "@label translation author" msgid "Author" msgstr "autor" -#: src/propertyinfo.cpp:406 +#: src/propertyinfo.cpp:460 #, kde-format msgctxt "@label translations last update" msgid "Last Update" msgstr "poslednja izmena" -#: src/propertyinfo.cpp:413 +#: src/propertyinfo.cpp:467 #, kde-format msgctxt "@label date of template creation8" msgid "Template Creation" msgstr "stvaranje šablona" -#: src/propertyinfo.cpp:420 +#: src/propertyinfo.cpp:474 #, kde-format msgctxt "@label the URL a file was originally downloded from" msgid "Downloaded From" msgstr "preuzeto sa" -#: src/propertyinfo.cpp:427 +#: src/propertyinfo.cpp:481 #, kde-format msgctxt "@label the subject of an email this file was attached to" msgid "E-Mail Attachment Subject" msgstr "tema priloga e‑pošte" -#: src/propertyinfo.cpp:434 +#: src/propertyinfo.cpp:488 #, kde-format msgctxt "@label the sender of an email this file was attached to" msgid "E-Mail Attachment Sender" msgstr "pošiljalac priloga e‑pošte" -#: src/propertyinfo.cpp:441 +#: src/propertyinfo.cpp:495 #, kde-format msgctxt "@label the message ID of an email this file was attached to" msgid "E-Mail Attachment Message ID" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/po/sr@latin/kfilemetadata5.po new/kfilemetadata-5.47.0/po/sr@latin/kfilemetadata5.po --- old/kfilemetadata-5.46.0/po/sr@latin/kfilemetadata5.po 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/po/sr@latin/kfilemetadata5.po 2018-06-02 19:54:55.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kfilemetadata5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-10-17 03:36+0200\n" +"POT-Creation-Date: 2018-04-13 03:28+0200\n" "PO-Revision-Date: 2017-10-30 23:08+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -286,106 +286,162 @@ #: src/propertyinfo.cpp:327 #, kde-format msgctxt "@label" +msgid "Label" +msgstr "" + +#: src/propertyinfo.cpp:333 +#, kde-format +msgctxt "@label" msgid "Release Year" msgstr "godina izdanja" -#: src/propertyinfo.cpp:333 +#: src/propertyinfo.cpp:339 #, kde-format msgctxt "@label" msgid "Sample Rate" msgstr "uzorkovanje" -#: src/propertyinfo.cpp:339 +#: src/propertyinfo.cpp:345 #, kde-format msgctxt "@label" msgid "Subject" msgstr "tema" -#: src/propertyinfo.cpp:346 +#: src/propertyinfo.cpp:352 #, kde-format msgctxt "@label" msgid "Title" msgstr "naslov" -#: src/propertyinfo.cpp:352 +#: src/propertyinfo.cpp:358 #, kde-format msgctxt "@label music track number" msgid "Track Number" msgstr "broj numere" -#: src/propertyinfo.cpp:358 +#: src/propertyinfo.cpp:364 #, kde-format msgctxt "@label music disc number" msgid "Disc Number" msgstr "broj diska" -#: src/propertyinfo.cpp:364 +#: src/propertyinfo.cpp:370 +#, fuzzy, kde-format +#| msgctxt "@label" +#| msgid "Duration" +msgctxt "@label" +msgid "Location" +msgstr "trajanje" + +#: src/propertyinfo.cpp:376 +#, kde-format +msgctxt "@label" +msgid "Performer" +msgstr "" + +#: src/propertyinfo.cpp:382 +#, kde-format +msgctxt "@label" +msgid "Ensemble" +msgstr "" + +#: src/propertyinfo.cpp:388 +#, kde-format +msgctxt "@label" +msgid "Arranger" +msgstr "" + +#: src/propertyinfo.cpp:394 +#, kde-format +msgctxt "@label" +msgid "Conductor" +msgstr "" + +#: src/propertyinfo.cpp:400 +#, kde-format +msgctxt "@label" +msgid "Compilation" +msgstr "" + +#: src/propertyinfo.cpp:406 +#, kde-format +msgctxt "@label" +msgid "License" +msgstr "" + +#: src/propertyinfo.cpp:412 +#, kde-format +msgctxt "@label" +msgid "Opus" +msgstr "" + +#: src/propertyinfo.cpp:418 #, kde-format msgctxt "@label" msgid "Width" msgstr "širina" -#: src/propertyinfo.cpp:370 +#: src/propertyinfo.cpp:424 #, kde-format msgctxt "@label number of words" msgid "Word Count" msgstr "broj reči" -#: src/propertyinfo.cpp:377 +#: src/propertyinfo.cpp:431 #, kde-format msgctxt "@label number of translatable strings" msgid "Translatable Units" msgstr "prevodive jedinice" -#: src/propertyinfo.cpp:384 +#: src/propertyinfo.cpp:438 #, kde-format msgctxt "@label number of translated strings" msgid "Translations" msgstr "prevodi" -#: src/propertyinfo.cpp:392 +#: src/propertyinfo.cpp:446 #, kde-format msgctxt "@label number of fuzzy translated strings" msgid "Draft Translations" msgstr "nacrti prevoda" -#: src/propertyinfo.cpp:399 +#: src/propertyinfo.cpp:453 #, kde-format msgctxt "@label translation author" msgid "Author" msgstr "autor" -#: src/propertyinfo.cpp:406 +#: src/propertyinfo.cpp:460 #, kde-format msgctxt "@label translations last update" msgid "Last Update" msgstr "poslednja izmena" -#: src/propertyinfo.cpp:413 +#: src/propertyinfo.cpp:467 #, kde-format msgctxt "@label date of template creation8" msgid "Template Creation" msgstr "stvaranje šablona" -#: src/propertyinfo.cpp:420 +#: src/propertyinfo.cpp:474 #, kde-format msgctxt "@label the URL a file was originally downloded from" msgid "Downloaded From" msgstr "preuzeto sa" -#: src/propertyinfo.cpp:427 +#: src/propertyinfo.cpp:481 #, kde-format msgctxt "@label the subject of an email this file was attached to" msgid "E-Mail Attachment Subject" msgstr "tema priloga e‑pošte" -#: src/propertyinfo.cpp:434 +#: src/propertyinfo.cpp:488 #, kde-format msgctxt "@label the sender of an email this file was attached to" msgid "E-Mail Attachment Sender" msgstr "pošiljalac priloga e‑pošte" -#: src/propertyinfo.cpp:441 +#: src/propertyinfo.cpp:495 #, kde-format msgctxt "@label the message ID of an email this file was attached to" msgid "E-Mail Attachment Message ID" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/po/zh_CN/kfilemetadata5.po new/kfilemetadata-5.47.0/po/zh_CN/kfilemetadata5.po --- old/kfilemetadata-5.46.0/po/zh_CN/kfilemetadata5.po 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/po/zh_CN/kfilemetadata5.po 2018-06-02 19:54:55.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-04-13 03:28+0200\n" -"PO-Revision-Date: 2018-04-26 05:22-0400\n" +"PO-Revision-Date: 2018-05-18 06:23-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -339,7 +339,7 @@ #, kde-format msgctxt "@label" msgid "Performer" -msgstr "演出者" +msgstr "演绎者" #: src/propertyinfo.cpp:382 #, kde-format @@ -369,7 +369,7 @@ #, kde-format msgctxt "@label" msgid "License" -msgstr "许可" +msgstr "许可证" #: src/propertyinfo.cpp:412 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/externalextractor.h new/kfilemetadata-5.47.0/src/externalextractor.h --- old/kfilemetadata-5.46.0/src/externalextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/externalextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -37,8 +37,8 @@ ExternalExtractor(const QString& pluginPath); virtual ~ExternalExtractor(); - QStringList mimetypes() const Q_DECL_OVERRIDE; - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; + QStringList mimetypes() const override; + void extract(ExtractionResult* result) override; private: class ExternalExtractorPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/externalwriter.h new/kfilemetadata-5.47.0/src/externalwriter.h --- old/kfilemetadata-5.46.0/src/externalwriter.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/externalwriter.h 2018-06-02 19:54:55.000000000 +0200 @@ -37,8 +37,8 @@ explicit ExternalWriter(const QString& pluginPath); virtual ~ExternalWriter(); - void write(const WriteData& data) Q_DECL_OVERRIDE; - QStringList writeMimetypes() const Q_DECL_OVERRIDE; + void write(const WriteData& data) override; + QStringList writeMimetypes() const override; private: bool runtimeInstalled() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/epubextractor.h new/kfilemetadata-5.47.0/src/extractors/epubextractor.h --- old/kfilemetadata-5.46.0/src/extractors/epubextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/epubextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -34,8 +34,8 @@ public: explicit EPubExtractor(QObject* parent = nullptr); - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; - QStringList mimetypes() const Q_DECL_OVERRIDE; + void extract(ExtractionResult* result) override; + QStringList mimetypes() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/exiv2extractor.h new/kfilemetadata-5.47.0/src/extractors/exiv2extractor.h --- old/kfilemetadata-5.46.0/src/extractors/exiv2extractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/exiv2extractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -36,8 +36,8 @@ public: explicit Exiv2Extractor(QObject* parent = nullptr); - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; - QStringList mimetypes() const Q_DECL_OVERRIDE; + void extract(ExtractionResult* result) override; + QStringList mimetypes() const override; private: void add(ExtractionResult* result, const Exiv2::ExifData& data, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/ffmpegextractor.h new/kfilemetadata-5.47.0/src/extractors/ffmpegextractor.h --- old/kfilemetadata-5.46.0/src/extractors/ffmpegextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/ffmpegextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -34,8 +34,8 @@ public: explicit FFmpegExtractor(QObject* parent = nullptr); - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; - QStringList mimetypes() const Q_DECL_OVERRIDE; + void extract(ExtractionResult* result) override; + QStringList mimetypes() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/mobiextractor.h new/kfilemetadata-5.47.0/src/extractors/mobiextractor.h --- old/kfilemetadata-5.46.0/src/extractors/mobiextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/mobiextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -35,8 +35,8 @@ public: explicit MobiExtractor(QObject* parent = nullptr); - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; - QStringList mimetypes() const Q_DECL_OVERRIDE; + void extract(ExtractionResult* result) override; + QStringList mimetypes() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/odfextractor.h new/kfilemetadata-5.47.0/src/extractors/odfextractor.h --- old/kfilemetadata-5.46.0/src/extractors/odfextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/odfextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -35,8 +35,8 @@ public: explicit OdfExtractor(QObject* parent = nullptr); - QStringList mimetypes() const Q_DECL_OVERRIDE; - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; + QStringList mimetypes() const override; + void extract(ExtractionResult* result) override; private: }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/office2007extractor.h new/kfilemetadata-5.47.0/src/extractors/office2007extractor.h --- old/kfilemetadata-5.46.0/src/extractors/office2007extractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/office2007extractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -39,8 +39,8 @@ public: explicit Office2007Extractor(QObject* parent = nullptr); - QStringList mimetypes() const Q_DECL_OVERRIDE; - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; + QStringList mimetypes() const override; + void extract(ExtractionResult* result) override; private: void extractTextWithTag(QIODevice* device, const QString& tag, ExtractionResult* result); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/officeextractor.h new/kfilemetadata-5.47.0/src/extractors/officeextractor.h --- old/kfilemetadata-5.46.0/src/extractors/officeextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/officeextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -35,8 +35,8 @@ public: explicit OfficeExtractor(QObject* parent = nullptr); - QStringList mimetypes() const Q_DECL_OVERRIDE; - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; + QStringList mimetypes() const override; + void extract(ExtractionResult* result) override; private: void findExe(const QString& mimeType, const QString& name, QString& fullPath); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/plaintextextractor.h new/kfilemetadata-5.47.0/src/extractors/plaintextextractor.h --- old/kfilemetadata-5.46.0/src/extractors/plaintextextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/plaintextextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -35,8 +35,8 @@ public: explicit PlainTextExtractor(QObject* parent = nullptr); - QStringList mimetypes() const Q_DECL_OVERRIDE; - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; + QStringList mimetypes() const override; + void extract(ExtractionResult* result) override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/poextractor.h new/kfilemetadata-5.47.0/src/extractors/poextractor.h --- old/kfilemetadata-5.46.0/src/extractors/poextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/poextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -38,8 +38,8 @@ public: explicit POExtractor(QObject* parent = nullptr); - QStringList mimetypes() const Q_DECL_OVERRIDE; - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; + QStringList mimetypes() const override; + void extract(ExtractionResult* result) override; private: void endMessage(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/popplerextractor.cpp new/kfilemetadata-5.47.0/src/extractors/popplerextractor.cpp --- old/kfilemetadata-5.46.0/src/extractors/popplerextractor.cpp 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/popplerextractor.cpp 2018-06-02 19:54:55.000000000 +0200 @@ -54,17 +54,6 @@ QString title = pdfDoc->info(QStringLiteral("Title")).trimmed(); - // The title extracted from the pdf metadata is in many cases not the real title - // of the document. Especially for research papers that are exported to pdf. - // As mostly the title of a pdf document is written on the first page in the biggest font - // we use this if the pdfDoc title is considered junk - if (title.isEmpty() || - !title.contains(QLatin1Char(' ')) || // very unlikely the title of a document does only contain one word. - title.contains(QStringLiteral("Microsoft"), Qt::CaseInsensitive)) { // most research papers i found written with microsoft word - // have a garbage title of the pdf creator rather than the real document title - title = parseFirstPage(pdfDoc.data(), fileUrl); - } - if (!title.isEmpty()) { result->add(Property::Title, title); } @@ -103,80 +92,3 @@ result->append(page->text(QRectF())); } } - -QString PopplerExtractor::parseFirstPage(Poppler::Document* pdfDoc, const QString& fileUrl) -{ - QScopedPointer<Poppler::Page> p(pdfDoc->page(0)); - - if (!p) { - qWarning() << "Could not read page content from" << fileUrl; - return QString(); - } - - QList<Poppler::TextBox*> tbList = p->textList(); - QMap<int, QString> possibleTitleMap; - - int currentLargestChar = 0; - int skipTextboxes = 0; - - // Iterate over all textboxes. Each textbox can be a single character/word or textblock - // Here we combine the etxtboxes back together based on the textsize - // Important are the words with the biggest font size - foreach(Poppler::TextBox * tb, tbList) { - - // if we added followup words, skip the textboxes here now - if (skipTextboxes > 0) { - skipTextboxes--; - continue; - } - - int height = tb->charBoundingBox(0).height(); - - // if the following text is smaller than the biggest we found up to now, ignore it - if (height >= currentLargestChar) { - QString possibleTitle; - possibleTitle.append(tb->text()); - currentLargestChar = height; - - // if the text has follow up words add them to to create the full title - Poppler::TextBox* next = tb->nextWord(); - while (next) { - possibleTitle.append(QLatin1Char(' ')); - possibleTitle.append(next->text()); - next = next->nextWord(); - skipTextboxes++; - } - - // now combine text for each font size together, very likeley it must be connected - QString existingTitlePart = possibleTitleMap.value(currentLargestChar, QString()); - existingTitlePart.append(QLatin1Char(' ')); - existingTitlePart.append(possibleTitle); - possibleTitleMap.insert(currentLargestChar, existingTitlePart); - } - } - - qDeleteAll(tbList); - - QList<int> titleSizes = possibleTitleMap.keys(); - qSort(titleSizes.begin(), titleSizes.end(), qGreater<int>()); - - QString newPossibleTitle; - - // find the text with the largest font that is not just 1 character - foreach(int i, titleSizes) { - QString title = possibleTitleMap.value(i); - - // sometime the biggest part is a single letter - // as a starting paragraph letter - if (title.size() < 5) { - continue; - } else { - newPossibleTitle = title.trimmed(); - break; - } - } - - // Sometimes the titles that are extracted are too large. This is a way of trimming them. - newPossibleTitle.truncate(50); - return newPossibleTitle; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/popplerextractor.h new/kfilemetadata-5.47.0/src/extractors/popplerextractor.h --- old/kfilemetadata-5.46.0/src/extractors/popplerextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/popplerextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -36,8 +36,8 @@ public: explicit PopplerExtractor(QObject* parent = nullptr); - QStringList mimetypes() const Q_DECL_OVERRIDE; - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; + QStringList mimetypes() const override; + void extract(ExtractionResult* result) override; private: QString parseFirstPage(Poppler::Document* pdfDoc, const QString& fileUrl); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/taglibextractor.cpp new/kfilemetadata-5.47.0/src/extractors/taglibextractor.cpp --- old/kfilemetadata-5.46.0/src/extractors/taglibextractor.cpp 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/taglibextractor.cpp 2018-06-02 19:54:55.000000000 +0200 @@ -270,7 +270,10 @@ data.artists += (*itMPC).second.toString(); } - itMPC = lstMusepack.find("ALBUM ARTIST"); + itMPC = lstMusepack.find("ALBUMARTIST"); + if (itMPC == lstMusepack.end()) { + itMPC = lstMusepack.find("ALBUM ARTIST"); + } if (itMPC != lstMusepack.end()) { if(!data.albumArtists.isEmpty()) { data.albumArtists += ", "; @@ -445,6 +448,9 @@ } itOgg = lstOgg.find("ALBUMARTIST"); + if (itOgg == lstOgg.end()) { + itOgg = lstOgg.find("ALBUM ARTIST"); + } if (itOgg != lstOgg.end()) { if (!data.albumArtists.isEmpty()) { data.albumArtists += ", "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/extractors/taglibextractor.h new/kfilemetadata-5.47.0/src/extractors/taglibextractor.h --- old/kfilemetadata-5.46.0/src/extractors/taglibextractor.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/extractors/taglibextractor.h 2018-06-02 19:54:55.000000000 +0200 @@ -38,8 +38,8 @@ public: explicit TagLibExtractor(QObject* parent = nullptr); - void extract(ExtractionResult* result) Q_DECL_OVERRIDE; - QStringList mimetypes() const Q_DECL_OVERRIDE; + void extract(ExtractionResult* result) override; + QStringList mimetypes() const override; private: struct ExtractedData { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/simpleextractionresult.h new/kfilemetadata-5.47.0/src/simpleextractionresult.h --- old/kfilemetadata-5.46.0/src/simpleextractionresult.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/simpleextractionresult.h 2018-06-02 19:54:55.000000000 +0200 @@ -46,9 +46,9 @@ SimpleExtractionResult& operator=(const SimpleExtractionResult& rhs); bool operator==(const SimpleExtractionResult& rhs) const; - void add(Property::Property property, const QVariant& value) Q_DECL_OVERRIDE; - void addType(Type::Type type) Q_DECL_OVERRIDE; - void append(const QString& text) Q_DECL_OVERRIDE; + void add(Property::Property property, const QVariant& value) override; + void addType(Type::Type type) override; + void append(const QString& text) override; PropertyMap properties() const; QString text() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.46.0/src/writers/taglibwriter.h new/kfilemetadata-5.47.0/src/writers/taglibwriter.h --- old/kfilemetadata-5.46.0/src/writers/taglibwriter.h 2018-05-05 14:57:34.000000000 +0200 +++ new/kfilemetadata-5.47.0/src/writers/taglibwriter.h 2018-06-02 19:54:55.000000000 +0200 @@ -15,8 +15,8 @@ public: TagLibWriter(QObject* parent = nullptr); - void write(const WriteData& data) Q_DECL_OVERRIDE; - QStringList writeMimetypes() const Q_DECL_OVERRIDE; + void write(const WriteData& data) override; + QStringList writeMimetypes() const override; }; }
