Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2021-12-13 20:40:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata5" Mon Dec 13 20:40:48 2021 rev:103 rq:939211 version:5.89.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2021-11-15 15:26:26.421824170 +0100 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new.2520/kfilemetadata5.changes 2021-12-13 20:44:08.636483223 +0100 @@ -1,0 +2,13 @@ +Sat Dec 4 22:56:36 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.89.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.89.0 +- Changes since 5.88.0: + * KFileMetaData::Property: Deprecate toVariantMap and toPropertyMap methods + * Port deprecated QMap methods to QMultiMap + * Put code of public header depending on deprecated Qt API in deprecation wrapper + * [PopplerExtractor] extract pageCount + +------------------------------------------------------------------- Old: ---- kfilemetadata-5.88.0.tar.xz kfilemetadata-5.88.0.tar.xz.sig New: ---- kfilemetadata-5.89.0.tar.xz kfilemetadata-5.89.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.HWqBSv/_old 2021-12-13 20:44:09.264483300 +0100 +++ /var/tmp/diff_new_pack.HWqBSv/_new 2021-12-13 20:44:09.272483301 +0100 @@ -16,7 +16,7 @@ # -%define _tar_path 5.88 +%define _tar_path 5.89 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -24,7 +24,7 @@ %bcond_without ffmpeg %bcond_without lang Name: kfilemetadata5 -Version: 5.88.0 +Version: 5.89.0 Release: 0 Summary: Library for extracting Metadata License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-only ++++++ kfilemetadata-5.88.0.tar.xz -> kfilemetadata-5.89.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/CMakeLists.txt new/kfilemetadata-5.89.0/CMakeLists.txt --- old/kfilemetadata-5.88.0/CMakeLists.txt 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/CMakeLists.txt 2021-12-04 19:36:12.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.88.0") # handled by release scripts -set(KF_DEP_VERSION "5.87.0") # handled by release scripts +set(KF_VERSION "5.89.0") # handled by release scripts +set(KF_DEP_VERSION "5.89.0") # handled by release scripts project(KFileMetaData VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.87.0 NO_MODULE) +find_package(ECM 5.89.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/LICENSES/CC0-1.0.txt new/kfilemetadata-5.89.0/LICENSES/CC0-1.0.txt --- old/kfilemetadata-5.88.0/LICENSES/CC0-1.0.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kfilemetadata-5.89.0/LICENSES/CC0-1.0.txt 2021-12-04 19:36:12.000000000 +0100 @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/autotests/epubextractortest.cpp new/kfilemetadata-5.89.0/autotests/epubextractortest.cpp --- old/kfilemetadata-5.88.0/autotests/epubextractortest.cpp 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/autotests/epubextractortest.cpp 2021-12-04 19:36:12.000000000 +0100 @@ -87,7 +87,7 @@ QCOMPARE(result.properties().value(Property::Author), QVariant(QStringLiteral("Happy Man"))); QCOMPARE(result.properties().value(Property::Publisher), QVariant(QStringLiteral("Happy Publisher"))); QCOMPARE(result.properties().value(Property::Title), QVariant(QStringLiteral("The Big Brown Bear"))); - QCOMPARE(result.properties().values(Property::Subject), + QCOMPARE(result.properties(KFileMetaData::MultiMap).values(Property::Subject), QVariantList({QStringLiteral("Test with repeated keys"), QStringLiteral("Baloo KFileMetaData")}) ); QCOMPARE(result.properties().value(Property::Description), QVariant(QStringLiteral("Honey"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/autotests/popplerextractortest.cpp new/kfilemetadata-5.89.0/autotests/popplerextractortest.cpp --- old/kfilemetadata-5.88.0/autotests/popplerextractortest.cpp 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/autotests/popplerextractortest.cpp 2021-12-04 19:36:12.000000000 +0100 @@ -57,12 +57,12 @@ QCOMPARE(result.properties().value(Property::Title), QVariant(QStringLiteral("The Big Brown Bear"))); QCOMPARE(result.properties().value(Property::Subject), QVariant(QStringLiteral("PDF Metadata"))); QCOMPARE(result.properties().value(Property::Generator), QVariant(QStringLiteral("LibreOffice 4.2"))); - + QCOMPARE(result.properties().value(Property::PageCount), 1); QDateTime dt(QDate(2014, 07, 01), QTime(13, 38, 50)); dt.setTimeSpec(Qt::UTC); QCOMPARE(result.properties().value(Property::CreationDate), QVariant(dt)); - QCOMPARE(result.properties().size(), 5); + QCOMPARE(result.properties().size(), 6); } void PopplerExtractorTest::testMetaDataOnly() @@ -74,7 +74,7 @@ QCOMPARE(result.types().size(), 1); QVERIFY(result.text().isEmpty()); - QCOMPARE(result.properties().size(), 5); + QCOMPARE(result.properties().size(), 6); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/autotests/taglibextractortest.cpp new/kfilemetadata-5.89.0/autotests/taglibextractortest.cpp --- old/kfilemetadata-5.88.0/autotests/taglibextractortest.cpp 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/autotests/taglibextractortest.cpp 2021-12-04 19:36:12.000000000 +0100 @@ -235,8 +235,8 @@ SimpleExtractionResult result(testFilePath(fileName), mimeType); plugin.extract(&result); - QCOMPARE(result.properties().values(Property::Artist), QVariantList({QStringLiteral("Artist1"), QStringLiteral("Artist2")})); - QCOMPARE(result.properties().values(Property::Genre), QVariantList({QStringLiteral("Genre1"), QStringLiteral("Genre2")})); + QCOMPARE(result.properties(KFileMetaData::MultiMap).values(Property::Artist), QVariantList({QStringLiteral("Artist1"), QStringLiteral("Artist2")})); + QCOMPARE(result.properties(KFileMetaData::MultiMap).values(Property::Genre), QVariantList({QStringLiteral("Genre1"), QStringLiteral("Genre2")})); } void TagLibExtractorTest::testVorbisCommentMultivalue_data() @@ -610,7 +610,7 @@ SimpleExtractionResult extracted(path, mimeType); plugin.extract(&extracted); - const auto resultList = extracted.properties(); + const auto resultList = extracted.properties(KFileMetaData::MultiMap); const auto resultKeys = resultList.uniqueKeys(); const QSet<KFileMetaData::Property::Property> resultKeySet(resultKeys.begin(), resultKeys.end()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/po/hu/kfilemetadata5.po new/kfilemetadata-5.89.0/po/hu/kfilemetadata5.po --- old/kfilemetadata-5.88.0/po/hu/kfilemetadata5.po 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/po/hu/kfilemetadata5.po 2021-12-04 19:36:12.000000000 +0100 @@ -3,13 +3,13 @@ # # Bal??zs ??r <urbal...@gmail.com>, 2014. # Krist??f Kiszel <ulys...@kubuntu.org>, 2014, 2015. -# Kristof Kiszel <kiszel.kris...@gmail.com>, 2018. +# Kristof Kiszel <kiszel.kris...@gmail.com>, 2018, 2021. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-09 02:02+0200\n" -"PO-Revision-Date: 2018-10-23 19:00+0200\n" +"PO-Revision-Date: 2021-11-08 11:12+0100\n" "Last-Translator: Kristof Kiszel <kiszel.kris...@gmail.com>\n" "Language-Team: Hungarian <kde-l10n...@kde.org>\n" "Language: hu\n" @@ -17,293 +17,289 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.08.3\n" #: src/formatstrings.cpp:64 #, kde-format msgctxt "@label bitrate (per second)" msgid "%1/s" -msgstr "" +msgstr "%1/s" #: src/formatstrings.cpp:78 #, kde-format msgctxt "Description of image orientation" msgid "Unchanged" -msgstr "" +msgstr "V??ltozatlan" #: src/formatstrings.cpp:79 #, kde-format msgctxt "Description of image orientation" msgid "Horizontally flipped" -msgstr "" +msgstr "V??zszintesen t??kr??zve" #: src/formatstrings.cpp:80 #, kde-format msgctxt "Description of image orientation" msgid "180?? rotated" -msgstr "" +msgstr "180??-kal elforgatva" #: src/formatstrings.cpp:81 #, kde-format msgctxt "Description of image orientation" msgid "Vertically flipped" -msgstr "" +msgstr "F??gg??legesen t??kr??zve" #: src/formatstrings.cpp:82 -#, fuzzy, kde-format -#| msgctxt "@label number of translated strings" -#| msgid "Translations" +#, kde-format msgctxt "Description of image orientation" msgid "Transposed" -msgstr "Ford??t??sok" +msgstr "Transzpon??lva" #: src/formatstrings.cpp:83 #, kde-format msgctxt "Description of image orientation, counter clock-wise rotated" msgid "90?? rotated CCW " -msgstr "" +msgstr "90??-kal elforgatva balra " #: src/formatstrings.cpp:84 #, kde-format msgctxt "Description of image orientation" msgid "Transversed" -msgstr "" +msgstr "Fekv??" #: src/formatstrings.cpp:85 #, kde-format msgctxt "Description of image orientation, counter clock-wise rotated" msgid "270?? rotated CCW" -msgstr "" +msgstr "270??-kal elforgatva balra" #: src/formatstrings.cpp:96 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Flash" +#, kde-format msgctxt "Description of photo flash" msgid "No flash" -msgstr "F??nyk??p vaku" +msgstr "Nincs vaku" #: src/formatstrings.cpp:97 #, kde-format msgctxt "Description of photo flash" msgid "Fired" -msgstr "" +msgstr "Els??tve" #: src/formatstrings.cpp:98 #, kde-format msgctxt "Description of photo flash" msgid "Fired, return light not detected" -msgstr "" +msgstr "Els??tve, nincs visszat??r?? f??ny" #: src/formatstrings.cpp:99 #, kde-format msgctxt "Description of photo flash" msgid "Fired, return light detected" -msgstr "" +msgstr "Els??tve, visszat??r?? f??ny ??szlelve" #: src/formatstrings.cpp:100 #, kde-format msgctxt "Description of photo flash" msgid "Yes, did not fire" -msgstr "" +msgstr "Igen, nem s??t??tte el" #: src/formatstrings.cpp:101 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory" -msgstr "" +msgstr "Igen, k??telez??en" #: src/formatstrings.cpp:102 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, return light not detected" -msgstr "" +msgstr "Igen, k??telez??en, nincs visszat??r?? f??ny" #: src/formatstrings.cpp:103 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, return light detected" -msgstr "" +msgstr "Igen, k??telez??en, visszat??r?? f??ny ??szlelve" #: src/formatstrings.cpp:104 #, kde-format msgctxt "Description of photo flash" msgid "No, compulsory" -msgstr "" +msgstr "Nem, k??telez??en" #: src/formatstrings.cpp:105 #, kde-format msgctxt "Description of photo flash" msgid "No, did not fire, return light not detected" -msgstr "" +msgstr "Nem, nincs els??tve, nincs visszat??r?? f??ny" #: src/formatstrings.cpp:106 #, kde-format msgctxt "Description of photo flash" msgid "No, auto" -msgstr "" +msgstr "Nem, automatikus" #: src/formatstrings.cpp:107 #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto" -msgstr "" +msgstr "Igen, automatikus" #: src/formatstrings.cpp:108 #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto, return light not detected" -msgstr "" +msgstr "Igen, automatikus, nincs visszat??r?? f??ny" #: src/formatstrings.cpp:109 #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto, return light detected" -msgstr "" +msgstr "Igen, automatikus, visszat??r?? f??ny ??szlelve" #: src/formatstrings.cpp:110 #, kde-format msgctxt "Description of photo flash" msgid "No flash function" -msgstr "" +msgstr "Nincs vaku funkci??" #: src/formatstrings.cpp:111 #, kde-format msgctxt "Description of photo flash" msgid "No, no flash function" -msgstr "" +msgstr "Nem, nincs vaku funkci??" #: src/formatstrings.cpp:112 #, kde-format msgctxt "Description of photo flash" msgid "Yes, red-eye reduction" -msgstr "" +msgstr "Igen, v??r??sszem-cs??kkent??s" #: src/formatstrings.cpp:113 #, kde-format msgctxt "Description of photo flash" msgid "Yes, red-eye reduction, return light not detected" -msgstr "" +msgstr "Igen, v??r??sszem-cs??kkent??s, nincs visszat??r?? f??ny" #: src/formatstrings.cpp:114 #, kde-format msgctxt "Description of photo flash" msgid "Yes, red-eye reduction, return light detected" -msgstr "" +msgstr "Igen, v??r??sszem-cs??kkent??s, visszat??r?? f??ny ??szlelve" #: src/formatstrings.cpp:115 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, red-eye reduction" -msgstr "" +msgstr "Igen, k??telez??en, v??r??sszem-cs??kkent??s" #: src/formatstrings.cpp:116 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, red-eye reduction, return light not detected" -msgstr "" +msgstr "Igen, k??telez??en, v??r??sszem-cs??kkent??s, nincs visszat??r?? f??ny" #: src/formatstrings.cpp:117 #, kde-format msgctxt "Description of photo flash" msgid "Yes, compulsory, red-eye reduction, return light detected" -msgstr "" +msgstr "Igen, k??telez??en, v??r??sszem-cs??kkent??s, visszat??r?? f??ny ??szlelve" #: src/formatstrings.cpp:118 #, kde-format msgctxt "Description of photo flash" msgid "No, red-eye reduction" -msgstr "" +msgstr "Nem, v??r??sszem-cs??kkent??s" #: src/formatstrings.cpp:119 #, kde-format msgctxt "Description of photo flash" msgid "No, auto, red-eye reduction" -msgstr "" +msgstr "Nem, automatikus, v??r??sszem-cs??kkent??s" #: src/formatstrings.cpp:120 #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto, red-eye reduction" -msgstr "" +msgstr "Igen, automatikus, v??r??sszem-cs??kkent??s" #: src/formatstrings.cpp:121 #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto, red-eye reduction, return light not detected" -msgstr "" +msgstr "Igen, automatikus, v??r??sszem-cs??kkent??s, nincs visszat??r?? f??ny" #: src/formatstrings.cpp:122 #, kde-format msgctxt "Description of photo flash" msgid "Yes, auto, red-eye reduction, return light detected" -msgstr "" +msgstr "Igen, automatikus, v??r??sszem-cs??kkent??s, visszat??r?? f??ny ??szlelve" #: src/formatstrings.cpp:127 #, kde-format msgid "Unknown" -msgstr "" +msgstr "Ismeretlen" #: src/formatstrings.cpp:134 #, kde-format msgctxt "Symbol of degree, no space" msgid "%1??" -msgstr "" +msgstr "%1??" #: src/formatstrings.cpp:145 #, kde-format msgctxt "Focal length given in mm" msgid "%1 mm" -msgstr "" +msgstr "%1 mm" #: src/formatstrings.cpp:150 #, kde-format msgctxt "Symbol of frames per second, with space" msgid "%1 fps" -msgstr "" +msgstr "%1 fps" #: src/formatstrings.cpp:160 #, kde-format msgctxt "Time period given in seconds as rational number, denominator is given" msgid "1/%1 s" -msgstr "" +msgstr "1/%1 s" #: src/formatstrings.cpp:163 #, kde-format msgctxt "Time period given in seconds" msgid "%1 s" -msgstr "" +msgstr "%1 s" #: src/formatstrings.cpp:179 #, kde-format msgctxt "Exposure bias/compensation in exposure value (EV)" msgid "%1 EV" -msgstr "" +msgstr "%1 EV" #: src/formatstrings.cpp:193 #, kde-format msgctxt "" "Exposure compensation given as integral with fraction, in exposure value (EV)" msgid "%1 %2/%3 EV" -msgstr "" +msgstr "%1 %2/%3 EV" #: src/formatstrings.cpp:196 #, kde-format msgctxt "Exposure compensation given as rational, in exposure value (EV)" msgid "%1/%2 EV" -msgstr "" +msgstr "%1/%2 EV" #: src/formatstrings.cpp:201 #, kde-format msgctxt "Aspect ratio, normalized to one" msgid "%1:1" -msgstr "" +msgstr "%1:1" #: src/formatstrings.cpp:206 #, kde-format msgctxt "F number for photographs" msgid "f/%1" -msgstr "" +msgstr "f/%1" #: src/propertyinfo.cpp:49 #, kde-format @@ -417,15 +413,13 @@ #, kde-format msgctxt "@label EXIF" msgid "Manufacturer" -msgstr "" +msgstr "Gy??rt??" #: src/propertyinfo.cpp:179 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Image Model" +#, kde-format msgctxt "@label EXIF" msgid "Model" -msgstr "K??p modell" +msgstr "Modell" #: src/propertyinfo.cpp:186 #, kde-format @@ -464,148 +458,112 @@ msgstr "Oldalsz??m" #: src/propertyinfo.cpp:225 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Aperture Value" +#, kde-format msgctxt "@label EXIF" msgid "Aperture Value" -msgstr "F??nyk??p apert??ra??rt??k" +msgstr "Rekesz??rt??k" #: src/propertyinfo.cpp:232 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Original Date Time" +#, kde-format msgctxt "@label EXIF" msgid "Original Date Time" -msgstr "F??nyk??p eredeti d??tum ??s id??" +msgstr "Eredeti d??tum ??s id??" #: src/propertyinfo.cpp:239 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Exposure Bias" +#, kde-format msgctxt "@label EXIF" msgid "Exposure Bias" -msgstr "F??nyk??p expoz??ci?? torz??t??s" +msgstr "Expoz??ci?? torz??t??s" #: src/propertyinfo.cpp:246 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Exposure Time" +#, kde-format msgctxt "@label EXIF" msgid "Exposure Time" -msgstr "F??nyk??p expon??l??si id??" +msgstr "Expon??l??si id??" #: src/propertyinfo.cpp:253 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Flash" +#, kde-format msgctxt "@label EXIF" msgid "Flash" -msgstr "F??nyk??p vaku" +msgstr "Vaku" #: src/propertyinfo.cpp:260 -#, fuzzy, kde-format -#| msgctxt "@label music disc number" -#| msgid "Disc Number" +#, kde-format msgctxt "@label EXIF" msgid "F Number" -msgstr "Lemez sorsz??m" +msgstr "Rekesz" #: src/propertyinfo.cpp:267 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Focal Length" +#, kde-format msgctxt "@label EXIF" msgid "Focal Length" -msgstr "F??nyk??p f??kuszt??vols??g" +msgstr "F??kuszt??vols??g" #: src/propertyinfo.cpp:274 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Focal Length 35mm" +#, kde-format msgctxt "@label EXIF" msgid "Focal Length 35mm" -msgstr "F??nyk??p 35mm f??kuszt??vols??g" +msgstr "35 mm-es f??kuszt??vols??g" #: src/propertyinfo.cpp:281 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo GPS Latitude" +#, kde-format msgctxt "@label EXIF" msgid "GPS Latitude" -msgstr "F??nyk??p GPS sz??less??g" +msgstr "GPS sz??less??g" #: src/propertyinfo.cpp:288 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo GPS Longitude" +#, kde-format msgctxt "@label EXIF" msgid "GPS Longitude" -msgstr "F??nyk??p GPS hossz??s??g" +msgstr "GPS hossz??s??g" #: src/propertyinfo.cpp:295 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo GPS Altitude" +#, kde-format msgctxt "@label EXIF" msgid "GPS Altitude" -msgstr "F??nyk??p GPS magass??g" +msgstr "GPS magass??g" #: src/propertyinfo.cpp:302 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo ISO Speed Rating" +#, kde-format msgctxt "@label EXIF" msgid "ISO Speed Rating" -msgstr "F??nyk??p ISO-sebess??g ar??ny" +msgstr "ISO-sebess??g ar??ny" #: src/propertyinfo.cpp:308 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Metering Mode" +#, kde-format msgctxt "@label EXIF" msgid "Metering Mode" -msgstr "F??nyk??p m??r??si m??d" +msgstr "M??r??si m??d" #: src/propertyinfo.cpp:314 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo X Dimension" +#, kde-format msgctxt "@label EXIF" msgid "X Dimension" -msgstr "F??nyk??p X dimenzi??" +msgstr "X dimenzi??" #: src/propertyinfo.cpp:320 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Y Dimension" +#, kde-format msgctxt "@label EXIF" msgid "Y Dimension" -msgstr "F??nyk??p Y dimenzi??" +msgstr "Y dimenzi??" #: src/propertyinfo.cpp:326 -#, fuzzy, kde-format -#| msgctxt "@label" -#| msgid "Duration" +#, kde-format msgctxt "@label EXIF" msgid "Saturation" -msgstr "Id??tartam" +msgstr "Tel??tetts??g" #: src/propertyinfo.cpp:332 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo Sharpness" +#, kde-format msgctxt "@label EXIF" msgid "Sharpness" -msgstr "F??nyk??p ??less??g" +msgstr "??less??g" #: src/propertyinfo.cpp:338 -#, fuzzy, kde-format -#| msgctxt "@label EXIF" -#| msgid "Photo White Balance" +#, kde-format msgctxt "@label EXIF" msgid "White Balance" -msgstr "F??nyk??p feh??regyens??ly" +msgstr "Feh??regyens??ly" #: src/propertyinfo.cpp:344 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/po/zh_CN/kfilemetadata5.po new/kfilemetadata-5.89.0/po/zh_CN/kfilemetadata5.po --- old/kfilemetadata-5.88.0/po/zh_CN/kfilemetadata5.po 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/po/zh_CN/kfilemetadata5.po 2021-12-04 19:36:12.000000000 +0100 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-09 02:02+0200\n" -"PO-Revision-Date: 2021-10-29 13:24\n" +"PO-Revision-Date: 2021-11-30 15:21\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/src/CMakeLists.txt new/kfilemetadata-5.89.0/src/CMakeLists.txt --- old/kfilemetadata-5.88.0/src/CMakeLists.txt 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/src/CMakeLists.txt 2021-12-04 19:36:12.000000000 +0100 @@ -48,7 +48,7 @@ GROUP_BASE_NAME KF VERSION ${KF_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.50 5.60 5.76 5.82 + DEPRECATION_VERSIONS 5.50 5.60 5.76 5.82 5.89 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/src/externalwriter.cpp new/kfilemetadata-5.89.0/src/externalwriter.cpp --- old/kfilemetadata-5.88.0/src/externalwriter.cpp 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/src/externalwriter.cpp 2021-12-04 19:36:12.000000000 +0100 @@ -89,7 +89,7 @@ QByteArray output; QByteArray errorOutput; - const QMap<Property::Property, QVariant> properties = data.getAllProperties(); + const PropertyMultiMap properties = data.properties(); for (auto i = properties.constBegin(); i != properties.constEnd(); ++i) { PropertyInfo propertyInfo(i.key()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/src/extractors/popplerextractor.cpp new/kfilemetadata-5.89.0/src/extractors/popplerextractor.cpp --- old/kfilemetadata-5.88.0/src/extractors/popplerextractor.cpp 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/src/extractors/popplerextractor.cpp 2021-12-04 19:36:12.000000000 +0100 @@ -65,6 +65,11 @@ if (!creationDate.isNull()) { result->add(Property::CreationDate, creationDate); } + + const int numPages = pdfDoc->numPages(); + if (numPages > 0) { + result->add(Property::PageCount, numPages); + } } if (!(result->inputFlags() & ExtractionResult::ExtractPlainText)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/src/properties.h new/kfilemetadata-5.89.0/src/properties.h --- old/kfilemetadata-5.88.0/src/properties.h 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/src/properties.h 2021-12-04 19:36:12.000000000 +0100 @@ -382,7 +382,15 @@ } // namespace Property typedef QMap<Property::Property, QVariant> PropertyMap; +using PropertyMultiMap = QMultiMap<Property::Property, QVariant>; +#if QT_DEPRECATED_SINCE(5, 15) +#if KFILEMETADATA_ENABLE_DEPRECATED_SINCE(5, 89) +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wdeprecated-declarations") +QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations") + +KFILEMETADATA_DEPRECATED_VERSION(5, 89, "Deprecated for lack of usage, manaully convert the data if needed") inline QVariantMap toVariantMap(const PropertyMap& propMap) { QVariantMap varMap; PropertyMap::const_iterator it = propMap.constBegin(); @@ -394,6 +402,7 @@ return varMap; } +KFILEMETADATA_DEPRECATED_VERSION(5, 89, "Deprecated for lack of usage, manaully convert the data if needed") inline PropertyMap toPropertyMap(const QVariantMap& varMap) { PropertyMap propMap; QVariantMap::const_iterator it = varMap.constBegin(); @@ -404,6 +413,9 @@ return propMap; } +QT_WARNING_POP +#endif +#endif } // namespace KFileMetaData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/src/simpleextractionresult.cpp new/kfilemetadata-5.89.0/src/simpleextractionresult.cpp --- old/kfilemetadata-5.88.0/src/simpleextractionresult.cpp 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/src/simpleextractionresult.cpp 2021-12-04 19:36:12.000000000 +0100 @@ -11,7 +11,7 @@ class Q_DECL_HIDDEN SimpleExtractionResult::Private { public: - PropertyMap m_properties; + PropertyMultiMap m_properties; QString m_text; QVector<Type::Type> m_types; }; @@ -47,7 +47,7 @@ void SimpleExtractionResult::add(Property::Property property, const QVariant& value) { - d->m_properties.insertMulti(property, value); + d->m_properties.insert(property, value); } void SimpleExtractionResult::addType(Type::Type type) @@ -61,10 +61,17 @@ d->m_text.append(QLatin1Char(' ')); } +#if KFILEMETADATA_BUILD_DEPRECATED_SINCE(5, 89) PropertyMap SimpleExtractionResult::properties() const { return d->m_properties; } +#endif + +PropertyMultiMap SimpleExtractionResult::properties(PropertiesMapType) const +{ + return d->m_properties; +} QString SimpleExtractionResult::text() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/src/simpleextractionresult.h new/kfilemetadata-5.89.0/src/simpleextractionresult.h --- old/kfilemetadata-5.88.0/src/simpleextractionresult.h 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/src/simpleextractionresult.h 2021-12-04 19:36:12.000000000 +0100 @@ -12,6 +12,7 @@ #include <QString> namespace KFileMetaData { +enum PropertiesMapType { MultiMap }; /** * \class SimpleExtractionResult simpleextractionresult.h <KFileMetaData/SimpleExtractionResult> @@ -37,7 +38,29 @@ void addType(Type::Type type) override; void append(const QString& text) override; +#if KFILEMETADATA_ENABLE_DEPRECATED_SINCE(5, 89) + /// @deprecated Since 5.89, use properties(PropertiesMapType) overload instead + KFILEMETADATA_DEPRECATED_VERSION(5, 89, "Use properties(PropertiesMapType) overload instead") PropertyMap properties() const; +#endif + + /** + * Returns the properties of the extraction result. + * Because QMap::insertMulti is deprecated, this overload returns a QMultiMap. + * To automaticalls use the overload with the default value, define the KFILEMETADATA_DISABLE_DEPRECATED_BEFORE_AND_AT + * in the cmake code to the deprecating version of this method or greater. + * For example: + * @code + * add_definitions(-DKFILEMETADATA_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) + * @endcode + * @since 5.89 + */ +#if KFILEMETADATA_ENABLE_DEPRECATED_SINCE(5, 89) + PropertyMultiMap properties(PropertiesMapType) const; +#else + PropertyMultiMap properties(PropertiesMapType = PropertiesMapType::MultiMap) const; +#endif + QString text() const; QVector<Type::Type> types() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/src/writedata.cpp new/kfilemetadata-5.89.0/src/writedata.cpp --- old/kfilemetadata-5.88.0/src/writedata.cpp 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/src/writedata.cpp 2021-12-04 19:36:12.000000000 +0100 @@ -17,7 +17,7 @@ public: QString url; QString mimetype; - PropertyMap properties; + PropertyMultiMap properties; QMap<EmbeddedImageData::ImageType, QByteArray> images; }; @@ -53,7 +53,7 @@ void WriteData::add(Property::Property property, const QVariant& value) { Q_D(WriteData); - d->properties.insertMulti(property, value); + d->properties.insert(property, value); } void WriteData::addImageData(const QMap<EmbeddedImageData::ImageType, QByteArray>& images) @@ -85,9 +85,16 @@ return d->mimetype; } -PropertyMap WriteData::getAllProperties() const +PropertyMultiMap WriteData::properties() const { Q_D(const WriteData); return d->properties; } +#if KFILEMETADATA_BUILD_DEPRECATED_SINCE(5, 89) +PropertyMap WriteData::getAllProperties() const +{ + Q_D(const WriteData); + return d->properties; +} +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/src/writedata.h new/kfilemetadata-5.89.0/src/writedata.h --- old/kfilemetadata-5.88.0/src/writedata.h 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/src/writedata.h 2021-12-04 19:36:12.000000000 +0100 @@ -12,7 +12,7 @@ #include "kfilemetadata_export.h" #include <QString> -#include <QMap> +#include <QMultiMap> #include <QVariant> #include "embeddedimagedata.h" @@ -40,7 +40,15 @@ void add(Property::Property property, const QVariant& value); void addImageData(const QMap<EmbeddedImageData::ImageType, QByteArray>& images); + /// @since 5.89 + PropertyMultiMap properties() const; + +#if KFILEMETADATA_ENABLE_DEPRECATED_SINCE(5, 89) + /// @seprecated Since 5.89, use properties() instead + KFILEMETADATA_DEPRECATED_VERSION(5, 89, "Use properties() instead") QMap<Property::Property, QVariant> getAllProperties() const; +#endif + QMap<EmbeddedImageData::ImageType, QByteArray> imageData() const; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.88.0/src/writers/taglibwriter.cpp new/kfilemetadata-5.89.0/src/writers/taglibwriter.cpp --- old/kfilemetadata-5.88.0/src/writers/taglibwriter.cpp 2021-11-06 14:18:54.000000000 +0100 +++ new/kfilemetadata-5.89.0/src/writers/taglibwriter.cpp 2021-12-04 19:36:12.000000000 +0100 @@ -507,7 +507,7 @@ void TagLibWriter::write(const WriteData& data) { const QString fileUrl = data.inputUrl(); - const PropertyMap properties = data.getAllProperties(); + const PropertyMap properties = data.properties(); const QString mimeType = data.inputMimetype(); #if defined Q_OS_WINDOWS
