Hello community, here is the log from the commit of package kfilemetadata5 for openSUSE:Factory checked in at 2017-10-27 13:54:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilemetadata5 (Old) and /work/SRC/openSUSE:Factory/.kfilemetadata5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kfilemetadata5" Fri Oct 27 13:54:52 2017 rev:51 rq:536322 version:5.39.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfilemetadata5/kfilemetadata5.changes 2017-09-19 16:23:40.688920678 +0200 +++ /work/SRC/openSUSE:Factory/.kfilemetadata5.new/kfilemetadata5.changes 2017-10-27 13:54:54.486284862 +0200 @@ -1,0 +2,10 @@ +Mon Oct 23 06:41:40 CEST 2017 - lbeltr...@kde.org + +- Update to 5.39.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.39.0.php +- Changes since 5.38.0: + * fix crash when more than one instances of ExtractorCollection are destructed + +------------------------------------------------------------------- Old: ---- kfilemetadata-5.38.0.tar.xz New: ---- kfilemetadata-5.39.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilemetadata5.spec ++++++ --- /var/tmp/diff_new_pack.PFBh80/_old 2017-10-27 13:54:55.330245413 +0200 +++ /var/tmp/diff_new_pack.PFBh80/_new 2017-10-27 13:54:55.330245413 +0200 @@ -18,13 +18,13 @@ %bcond_without ffmpeg %bcond_without lang -%define _tar_path 5.38 +%define _tar_path 5.39 # 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.38.0 +Version: 5.39.0 Release: 0 %define kf5_version %{version} Summary: Extract Metadata ++++++ kfilemetadata-5.38.0.tar.xz -> kfilemetadata-5.39.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.38.0/CMakeLists.txt new/kfilemetadata-5.39.0/CMakeLists.txt --- old/kfilemetadata-5.38.0/CMakeLists.txt 2017-09-03 10:06:02.000000000 +0200 +++ new/kfilemetadata-5.39.0/CMakeLists.txt 2017-10-07 21:14:16.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.38.0") # handled by release scripts -set(KF5_DEP_VERSION "5.38.0") # handled by release scripts +set(KF5_VERSION "5.39.0") # handled by release scripts +set(KF5_DEP_VERSION "5.39.0") # handled by release scripts project(KFileMetaData VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.38.0 NO_MODULE) +find_package(ECM 5.39.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.38.0/autotests/extractorcollectiontest.cpp new/kfilemetadata-5.39.0/autotests/extractorcollectiontest.cpp --- old/kfilemetadata-5.38.0/autotests/extractorcollectiontest.cpp 2017-09-03 10:06:02.000000000 +0200 +++ new/kfilemetadata-5.39.0/autotests/extractorcollectiontest.cpp 2017-10-07 21:14:16.000000000 +0200 @@ -39,6 +39,19 @@ QVERIFY(collection.fetchExtractors("unknown/mimetype").isEmpty()); QVERIFY(!collection.fetchExtractors("text/plain").isEmpty()); } + + void testMultipleExtractorCollections() + { + QCoreApplication::setLibraryPaths({QCoreApplication::applicationDirPath()}); + ExtractorCollection collection; + QVERIFY(collection.fetchExtractors("unknown/mimetype").isEmpty()); + QVERIFY(!collection.fetchExtractors("text/plain").isEmpty()); + ExtractorCollection collection2; + QVERIFY(collection.fetchExtractors("unknown/mimetype").isEmpty()); + QVERIFY(!collection.fetchExtractors("text/plain").isEmpty()); + QVERIFY(collection2.fetchExtractors("unknown/mimetype").isEmpty()); + QVERIFY(!collection2.fetchExtractors("text/plain").isEmpty()); + } }; QTEST_GUILESS_MAIN(ExtractorCollectionTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.38.0/po/nb/kfilemetadata5.po new/kfilemetadata-5.39.0/po/nb/kfilemetadata5.po --- old/kfilemetadata-5.38.0/po/nb/kfilemetadata5.po 2017-09-03 10:06:02.000000000 +0200 +++ new/kfilemetadata-5.39.0/po/nb/kfilemetadata5.po 2017-10-07 21:14:16.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-02-06 03:57+0100\n" +"POT-Creation-Date: 2017-08-16 06:51+0200\n" "PO-Revision-Date: 2014-11-05 13:42+0100\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" @@ -19,427 +19,427 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: src/propertyinfo.cpp:47 +#: src/propertyinfo.cpp:48 #, kde-format msgctxt "@label music album" msgid "Album" msgstr "Album" -#: src/propertyinfo.cpp:53 +#: src/propertyinfo.cpp:54 #, kde-format msgctxt "@label" msgid "Album Artist" msgstr "Album artist" -#: src/propertyinfo.cpp:59 +#: src/propertyinfo.cpp:60 #, kde-format msgctxt "@label" msgid "Artist" msgstr "Artist" -#: src/propertyinfo.cpp:65 +#: src/propertyinfo.cpp:66 #, kde-format msgctxt "@label" msgid "Aspect Ratio" msgstr "Bredde/høyde-forhold" -#: src/propertyinfo.cpp:71 +#: src/propertyinfo.cpp:72 #, kde-format msgctxt "@label" msgid "Author" msgstr "Forfatter" -#: src/propertyinfo.cpp:77 +#: src/propertyinfo.cpp:78 #, kde-format msgctxt "@label" msgid "Bitrate" msgstr "Bitrate" -#: src/propertyinfo.cpp:83 +#: src/propertyinfo.cpp:84 #, kde-format msgctxt "@label" msgid "Channels" msgstr "Kanaler" -#: src/propertyinfo.cpp:89 +#: src/propertyinfo.cpp:90 #, kde-format msgctxt "@label" msgid "Comment" msgstr "Kommentar" -#: src/propertyinfo.cpp:96 +#: src/propertyinfo.cpp:97 #, kde-format msgctxt "@label" msgid "Composer" msgstr "Komponist" -#: src/propertyinfo.cpp:103 +#: src/propertyinfo.cpp:104 #, kde-format msgctxt "@label" msgid "Copyright" msgstr "Opphavsrett" -#: src/propertyinfo.cpp:110 +#: src/propertyinfo.cpp:111 #, kde-format msgctxt "@label" msgid "Creation Date" msgstr "Opprettelsesdato" -#: src/propertyinfo.cpp:116 +#: src/propertyinfo.cpp:117 #, kde-format msgctxt "@label" msgid "Duration" msgstr "Varighet" -#: src/propertyinfo.cpp:127 +#: src/propertyinfo.cpp:128 #, kde-format msgctxt "@label" msgid "Frame Rate" msgstr "Rutefrekvens" -#: src/propertyinfo.cpp:133 +#: src/propertyinfo.cpp:134 #, kde-format msgctxt "@label" msgid "Software used to Generate the document" msgstr "Program som er brukt til å generere dokumentet" -#: src/propertyinfo.cpp:140 +#: src/propertyinfo.cpp:141 #, kde-format msgctxt "@label music genre" msgid "Genre" msgstr "Sjanger" -#: src/propertyinfo.cpp:147 +#: src/propertyinfo.cpp:148 #, kde-format msgctxt "@label" msgid "Height" msgstr "Høyde" -#: src/propertyinfo.cpp:153 +#: src/propertyinfo.cpp:154 #, kde-format msgctxt "@label EXIF" msgid "Image Date Time" msgstr "Dato og klokkeslett" -#: src/propertyinfo.cpp:159 +#: src/propertyinfo.cpp:160 #, kde-format msgctxt "@label EXIF" msgid "Image Make" msgstr "Bilde" -#: src/propertyinfo.cpp:166 +#: src/propertyinfo.cpp:167 #, kde-format msgctxt "@label EXIF" msgid "Image Model" msgstr "Modell" -#: src/propertyinfo.cpp:173 +#: src/propertyinfo.cpp:174 #, kde-format msgctxt "@label EXIF" msgid "Image Orientation" msgstr "Bilderetning" -#: src/propertyinfo.cpp:179 +#: src/propertyinfo.cpp:180 #, kde-format msgctxt "@label" msgid "Keywords" msgstr "Nøkkelord" -#: src/propertyinfo.cpp:186 +#: src/propertyinfo.cpp:187 #, kde-format msgctxt "@label" msgid "Language" msgstr "Språk" -#: src/propertyinfo.cpp:193 +#: src/propertyinfo.cpp:194 #, kde-format msgctxt "@label number of lines" msgid "Line Count" msgstr "Antall linjer" -#: src/propertyinfo.cpp:199 +#: src/propertyinfo.cpp:200 #, kde-format msgctxt "@label" msgid "Lyricist" msgstr "Tekstforfatter" -#: src/propertyinfo.cpp:206 +#: src/propertyinfo.cpp:207 #, kde-format msgctxt "@label" msgid "Page Count" msgstr "Antall sider" -#: src/propertyinfo.cpp:212 +#: src/propertyinfo.cpp:213 #, kde-format msgctxt "@label EXIF" msgid "Photo Aperture Value" msgstr "Foto blenderåpning" -#: src/propertyinfo.cpp:218 +#: src/propertyinfo.cpp:219 #, kde-format msgctxt "@label EXIF" msgid "Photo Original Date Time" msgstr "Opprinnelig dato og tidspunkt for foto" -#: src/propertyinfo.cpp:224 +#: src/propertyinfo.cpp:225 #, kde-format msgctxt "@label EXIF" msgid "Photo Exposure Bias" msgstr "Foto eksponeringskompensasjon" -#: src/propertyinfo.cpp:230 +#: src/propertyinfo.cpp:231 #, kde-format msgctxt "@label EXIF" msgid "Photo Exposure Time" msgstr "Foto eksponeringstid" -#: src/propertyinfo.cpp:236 +#: src/propertyinfo.cpp:237 #, kde-format msgctxt "@label EXIF" msgid "Photo Flash" msgstr "Fotoblits" -#: src/propertyinfo.cpp:242 +#: src/propertyinfo.cpp:243 #, kde-format msgctxt "@label EXIF" msgid "Photo F Number" msgstr "Foto F-tall" -#: src/propertyinfo.cpp:248 +#: src/propertyinfo.cpp:249 #, kde-format msgctxt "@label EXIF" msgid "Photo Focal Length" msgstr "Foto brennvidde" -#: src/propertyinfo.cpp:254 +#: src/propertyinfo.cpp:255 #, kde-format msgctxt "@label EXIF" msgid "Photo Focal Length 35mm" msgstr "Foto brennvidde 35mm" -#: src/propertyinfo.cpp:260 +#: src/propertyinfo.cpp:261 #, kde-format msgctxt "@label EXIF" msgid "Photo GPS Latitude" msgstr "GPS-bredde for bildet" -#: src/propertyinfo.cpp:266 +#: src/propertyinfo.cpp:267 #, kde-format msgctxt "@label EXIF" msgid "Photo GPS Longitude" msgstr "GPS-lengde for bildet" -#: src/propertyinfo.cpp:272 +#: src/propertyinfo.cpp:273 #, kde-format msgctxt "@label EXIF" msgid "Photo GPS Altitude" msgstr "GPS-høyde for bildet" -#: src/propertyinfo.cpp:278 +#: src/propertyinfo.cpp:279 #, kde-format msgctxt "@label EXIF" msgid "Photo ISO Speed Rating" msgstr "Foto ISO-hastighet" -#: src/propertyinfo.cpp:284 +#: src/propertyinfo.cpp:285 #, kde-format msgctxt "@label EXIF" msgid "Photo Metering Mode" msgstr "Foto målemodus" -#: src/propertyinfo.cpp:290 +#: src/propertyinfo.cpp:291 #, kde-format msgctxt "@label EXIF" msgid "Photo X Dimension" msgstr "Foto x-dimensjon" -#: src/propertyinfo.cpp:296 +#: src/propertyinfo.cpp:297 #, kde-format msgctxt "@label EXIF" msgid "Photo Y Dimension" msgstr "Foto y-dimensjon" -#: src/propertyinfo.cpp:302 +#: src/propertyinfo.cpp:303 #, kde-format msgctxt "@label EXIF" msgid "Photo Saturation" msgstr "Foto metning" -#: src/propertyinfo.cpp:308 +#: src/propertyinfo.cpp:309 #, kde-format msgctxt "@label EXIF" msgid "Photo Sharpness" msgstr "Foto skarphet" -#: src/propertyinfo.cpp:314 +#: src/propertyinfo.cpp:315 #, kde-format msgctxt "@label EXIF" msgid "Photo White Balance" msgstr "Foto hvitbalanse" -#: src/propertyinfo.cpp:320 +#: src/propertyinfo.cpp:321 #, kde-format msgctxt "@label" msgid "Publisher" msgstr "Utgiver" -#: src/propertyinfo.cpp:326 +#: src/propertyinfo.cpp:327 #, kde-format msgctxt "@label" msgid "Release Year" msgstr "Slipp-år" -#: src/propertyinfo.cpp:332 +#: src/propertyinfo.cpp:333 #, kde-format msgctxt "@label" msgid "Sample Rate" msgstr "Samplingsrate" -#: src/propertyinfo.cpp:338 +#: src/propertyinfo.cpp:339 #, kde-format msgctxt "@label" msgid "Subject" msgstr "Emne" -#: src/propertyinfo.cpp:345 +#: src/propertyinfo.cpp:346 #, kde-format msgctxt "@label" msgid "Title" msgstr "Tittel" -#: src/propertyinfo.cpp:351 +#: src/propertyinfo.cpp:352 #, kde-format msgctxt "@label music track number" msgid "Track Number" msgstr "Spornummer" -#: src/propertyinfo.cpp:357 +#: src/propertyinfo.cpp:358 #, kde-format msgctxt "@label music disc number" msgid "Disc Number" msgstr "" -#: src/propertyinfo.cpp:363 +#: src/propertyinfo.cpp:364 #, kde-format msgctxt "@label" msgid "Width" msgstr "Bredde" -#: src/propertyinfo.cpp:369 +#: src/propertyinfo.cpp:370 #, kde-format msgctxt "@label number of words" msgid "Word Count" msgstr "Antall ord" -#: src/propertyinfo.cpp:376 +#: src/propertyinfo.cpp:377 #, kde-format msgctxt "@label number of translatable strings" msgid "Translatable Units" msgstr "" -#: src/propertyinfo.cpp:383 +#: src/propertyinfo.cpp:384 #, kde-format msgctxt "@label number of translated strings" msgid "Translations" msgstr "" -#: src/propertyinfo.cpp:391 +#: src/propertyinfo.cpp:392 #, kde-format msgctxt "@label number of fuzzy translated strings" msgid "Draft Translations" msgstr "" -#: src/propertyinfo.cpp:398 +#: src/propertyinfo.cpp:399 #, kde-format msgctxt "@label translation author" msgid "Author" msgstr "" -#: src/propertyinfo.cpp:405 +#: src/propertyinfo.cpp:406 #, kde-format msgctxt "@label translations last update" msgid "Last Update" msgstr "" -#: src/propertyinfo.cpp:412 +#: src/propertyinfo.cpp:413 #, kde-format msgctxt "@label date of template creation8" msgid "Template Creation" msgstr "" -#: src/propertyinfo.cpp:419 +#: src/propertyinfo.cpp:420 #, kde-format msgctxt "@label the URL a file was originally downloded from" msgid "Downloaded From" msgstr "" -#: src/propertyinfo.cpp:426 +#: src/propertyinfo.cpp:427 #, kde-format msgctxt "@label the subject of an email this file was attached to" msgid "E-Mail Attachment Subject" msgstr "" -#: src/propertyinfo.cpp:433 +#: src/propertyinfo.cpp:434 #, kde-format msgctxt "@label the sender of an email this file was attached to" msgid "E-Mail Attachment Sender" msgstr "" -#: src/propertyinfo.cpp:440 +#: src/propertyinfo.cpp:441 #, kde-format msgctxt "@label the message ID of an email this file was attached to" msgid "E-Mail Attachment Message ID" msgstr "" -#: src/typeinfo.cpp:47 +#: src/typeinfo.cpp:48 #, kde-format msgctxt "@label" msgid "Archive" msgstr "Arkiv" -#: src/typeinfo.cpp:52 +#: src/typeinfo.cpp:53 #, kde-format msgctxt "@label" msgid "Audio" msgstr "Lyd" -#: src/typeinfo.cpp:57 +#: src/typeinfo.cpp:58 #, kde-format msgctxt "@label" msgid "Document" msgstr "Dokument" -#: src/typeinfo.cpp:62 +#: src/typeinfo.cpp:63 #, kde-format msgctxt "@label" msgid "Image" msgstr "Bilde" -#: src/typeinfo.cpp:67 +#: src/typeinfo.cpp:68 #, kde-format msgctxt "@label" msgid "Presentation" msgstr "Presentasjon" -#: src/typeinfo.cpp:72 +#: src/typeinfo.cpp:73 #, kde-format msgctxt "@label" msgid "Spreadsheet" msgstr "Regneark" -#: src/typeinfo.cpp:77 +#: src/typeinfo.cpp:78 #, kde-format msgctxt "@label" msgid "Text" msgstr "Tekst" -#: src/typeinfo.cpp:82 +#: src/typeinfo.cpp:83 #, kde-format msgctxt "@label" msgid "Video" msgstr "Video" -#: src/typeinfo.cpp:87 +#: src/typeinfo.cpp:88 #, kde-format msgctxt "@label" msgid "Folder" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.38.0/po/nn/kfilemetadata5.po new/kfilemetadata-5.39.0/po/nn/kfilemetadata5.po --- old/kfilemetadata-5.38.0/po/nn/kfilemetadata5.po 2017-09-03 10:06:02.000000000 +0200 +++ new/kfilemetadata-5.39.0/po/nn/kfilemetadata5.po 2017-10-07 21:14:16.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-02-06 03:57+0100\n" +"POT-Creation-Date: 2017-08-16 06:51+0200\n" "PO-Revision-Date: 2017-02-22 19:18+0100\n" "Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n" @@ -19,427 +19,427 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: src/propertyinfo.cpp:47 +#: src/propertyinfo.cpp:48 #, kde-format msgctxt "@label music album" msgid "Album" msgstr "Album" -#: src/propertyinfo.cpp:53 +#: src/propertyinfo.cpp:54 #, kde-format msgctxt "@label" msgid "Album Artist" msgstr "Albumartist" -#: src/propertyinfo.cpp:59 +#: src/propertyinfo.cpp:60 #, kde-format msgctxt "@label" msgid "Artist" msgstr "Artist" -#: src/propertyinfo.cpp:65 +#: src/propertyinfo.cpp:66 #, kde-format msgctxt "@label" msgid "Aspect Ratio" msgstr "Breidd/høgd-forhold" -#: src/propertyinfo.cpp:71 +#: src/propertyinfo.cpp:72 #, kde-format msgctxt "@label" msgid "Author" msgstr "Forfattar" -#: src/propertyinfo.cpp:77 +#: src/propertyinfo.cpp:78 #, kde-format msgctxt "@label" msgid "Bitrate" msgstr "Bitrate" -#: src/propertyinfo.cpp:83 +#: src/propertyinfo.cpp:84 #, kde-format msgctxt "@label" msgid "Channels" msgstr "Kanalar" -#: src/propertyinfo.cpp:89 +#: src/propertyinfo.cpp:90 #, kde-format msgctxt "@label" msgid "Comment" msgstr "Merknad" -#: src/propertyinfo.cpp:96 +#: src/propertyinfo.cpp:97 #, kde-format msgctxt "@label" msgid "Composer" msgstr "Komponist" -#: src/propertyinfo.cpp:103 +#: src/propertyinfo.cpp:104 #, kde-format msgctxt "@label" msgid "Copyright" msgstr "Opphavsrett" -#: src/propertyinfo.cpp:110 +#: src/propertyinfo.cpp:111 #, kde-format msgctxt "@label" msgid "Creation Date" msgstr "Opprettingsdato" -#: src/propertyinfo.cpp:116 +#: src/propertyinfo.cpp:117 #, kde-format msgctxt "@label" msgid "Duration" msgstr "Tid" -#: src/propertyinfo.cpp:127 +#: src/propertyinfo.cpp:128 #, kde-format msgctxt "@label" msgid "Frame Rate" msgstr "Bilete per sekund" -#: src/propertyinfo.cpp:133 +#: src/propertyinfo.cpp:134 #, kde-format msgctxt "@label" msgid "Software used to Generate the document" msgstr "Programvare brukt til å laga dokumentet" -#: src/propertyinfo.cpp:140 +#: src/propertyinfo.cpp:141 #, kde-format msgctxt "@label music genre" msgid "Genre" msgstr "Sjanger" -#: src/propertyinfo.cpp:147 +#: src/propertyinfo.cpp:148 #, kde-format msgctxt "@label" msgid "Height" msgstr "Høgd" -#: src/propertyinfo.cpp:153 +#: src/propertyinfo.cpp:154 #, kde-format msgctxt "@label EXIF" msgid "Image Date Time" msgstr "Bilete: dato og klokkeslett" -#: src/propertyinfo.cpp:159 +#: src/propertyinfo.cpp:160 #, kde-format msgctxt "@label EXIF" msgid "Image Make" msgstr "Bilete: utstyrsprodusent" -#: src/propertyinfo.cpp:166 +#: src/propertyinfo.cpp:167 #, kde-format msgctxt "@label EXIF" msgid "Image Model" msgstr "Bilete: utstyrsmodell" -#: src/propertyinfo.cpp:173 +#: src/propertyinfo.cpp:174 #, kde-format msgctxt "@label EXIF" msgid "Image Orientation" msgstr "Biletretning" -#: src/propertyinfo.cpp:179 +#: src/propertyinfo.cpp:180 #, kde-format msgctxt "@label" msgid "Keywords" msgstr "Nøkkelord" -#: src/propertyinfo.cpp:186 +#: src/propertyinfo.cpp:187 #, kde-format msgctxt "@label" msgid "Language" msgstr "Språk" -#: src/propertyinfo.cpp:193 +#: src/propertyinfo.cpp:194 #, kde-format msgctxt "@label number of lines" msgid "Line Count" msgstr "Linjetal" -#: src/propertyinfo.cpp:199 +#: src/propertyinfo.cpp:200 #, kde-format msgctxt "@label" msgid "Lyricist" msgstr "Tekstforfattar" -#: src/propertyinfo.cpp:206 +#: src/propertyinfo.cpp:207 #, kde-format msgctxt "@label" msgid "Page Count" msgstr "Sidetal" -#: src/propertyinfo.cpp:212 +#: src/propertyinfo.cpp:213 #, kde-format msgctxt "@label EXIF" msgid "Photo Aperture Value" msgstr "Photo: blenderopning" -#: src/propertyinfo.cpp:218 +#: src/propertyinfo.cpp:219 #, kde-format msgctxt "@label EXIF" msgid "Photo Original Date Time" msgstr "Foto: opphavleg dato og klokkeslett" -#: src/propertyinfo.cpp:224 +#: src/propertyinfo.cpp:225 #, kde-format msgctxt "@label EXIF" msgid "Photo Exposure Bias" msgstr "Foto: eksponeringsbias" -#: src/propertyinfo.cpp:230 +#: src/propertyinfo.cpp:231 #, kde-format msgctxt "@label EXIF" msgid "Photo Exposure Time" msgstr "Foto: lukkertid" -#: src/propertyinfo.cpp:236 +#: src/propertyinfo.cpp:237 #, kde-format msgctxt "@label EXIF" msgid "Photo Flash" msgstr "Foto: blits" -#: src/propertyinfo.cpp:242 +#: src/propertyinfo.cpp:243 #, kde-format msgctxt "@label EXIF" msgid "Photo F Number" msgstr "Foto: F-nummer" -#: src/propertyinfo.cpp:248 +#: src/propertyinfo.cpp:249 #, kde-format msgctxt "@label EXIF" msgid "Photo Focal Length" msgstr "Foto: brennvidd" -#: src/propertyinfo.cpp:254 +#: src/propertyinfo.cpp:255 #, kde-format msgctxt "@label EXIF" msgid "Photo Focal Length 35mm" msgstr "Foto: brennvidd 35 mm" -#: src/propertyinfo.cpp:260 +#: src/propertyinfo.cpp:261 #, kde-format msgctxt "@label EXIF" msgid "Photo GPS Latitude" msgstr "Foto: GPS-breiddegrad" -#: src/propertyinfo.cpp:266 +#: src/propertyinfo.cpp:267 #, kde-format msgctxt "@label EXIF" msgid "Photo GPS Longitude" msgstr "Foto: GPS-lengdegrad" -#: src/propertyinfo.cpp:272 +#: src/propertyinfo.cpp:273 #, kde-format msgctxt "@label EXIF" msgid "Photo GPS Altitude" msgstr "Foto: GPS-høgd" -#: src/propertyinfo.cpp:278 +#: src/propertyinfo.cpp:279 #, kde-format msgctxt "@label EXIF" msgid "Photo ISO Speed Rating" msgstr "Foto: ISO-verdi" -#: src/propertyinfo.cpp:284 +#: src/propertyinfo.cpp:285 #, kde-format msgctxt "@label EXIF" msgid "Photo Metering Mode" msgstr "Foto: lysmåling" -#: src/propertyinfo.cpp:290 +#: src/propertyinfo.cpp:291 #, kde-format msgctxt "@label EXIF" msgid "Photo X Dimension" msgstr "Foto: vassrett oppløysing" -#: src/propertyinfo.cpp:296 +#: src/propertyinfo.cpp:297 #, kde-format msgctxt "@label EXIF" msgid "Photo Y Dimension" msgstr "Foto: loddrett oppløysing" -#: src/propertyinfo.cpp:302 +#: src/propertyinfo.cpp:303 #, kde-format msgctxt "@label EXIF" msgid "Photo Saturation" msgstr "Foto: fargemetting" -#: src/propertyinfo.cpp:308 +#: src/propertyinfo.cpp:309 #, kde-format msgctxt "@label EXIF" msgid "Photo Sharpness" msgstr "Foto: skarpleik" -#: src/propertyinfo.cpp:314 +#: src/propertyinfo.cpp:315 #, kde-format msgctxt "@label EXIF" msgid "Photo White Balance" msgstr "Foto: kvitbalanse" -#: src/propertyinfo.cpp:320 +#: src/propertyinfo.cpp:321 #, kde-format msgctxt "@label" msgid "Publisher" msgstr "Utgjevar" -#: src/propertyinfo.cpp:326 +#: src/propertyinfo.cpp:327 #, kde-format msgctxt "@label" msgid "Release Year" msgstr "Utgjevingsår" -#: src/propertyinfo.cpp:332 +#: src/propertyinfo.cpp:333 #, kde-format msgctxt "@label" msgid "Sample Rate" msgstr "Samplingsrate" -#: src/propertyinfo.cpp:338 +#: src/propertyinfo.cpp:339 #, kde-format msgctxt "@label" msgid "Subject" msgstr "Emne" -#: src/propertyinfo.cpp:345 +#: src/propertyinfo.cpp:346 #, kde-format msgctxt "@label" msgid "Title" msgstr "Tittel" -#: src/propertyinfo.cpp:351 +#: src/propertyinfo.cpp:352 #, kde-format msgctxt "@label music track number" msgid "Track Number" msgstr "Spornummer" -#: src/propertyinfo.cpp:357 +#: src/propertyinfo.cpp:358 #, kde-format msgctxt "@label music disc number" msgid "Disc Number" msgstr "Platenummer" -#: src/propertyinfo.cpp:363 +#: src/propertyinfo.cpp:364 #, kde-format msgctxt "@label" msgid "Width" msgstr "Breidd" -#: src/propertyinfo.cpp:369 +#: src/propertyinfo.cpp:370 #, kde-format msgctxt "@label number of words" msgid "Word Count" msgstr "Ordteljing" -#: src/propertyinfo.cpp:376 +#: src/propertyinfo.cpp:377 #, kde-format msgctxt "@label number of translatable strings" msgid "Translatable Units" msgstr "Omsetbare einingar" -#: src/propertyinfo.cpp:383 +#: src/propertyinfo.cpp:384 #, kde-format msgctxt "@label number of translated strings" msgid "Translations" msgstr "Omsetjingar" -#: src/propertyinfo.cpp:391 +#: src/propertyinfo.cpp:392 #, kde-format msgctxt "@label number of fuzzy translated strings" msgid "Draft Translations" msgstr "Omsetjingsframlegg" -#: src/propertyinfo.cpp:398 +#: src/propertyinfo.cpp:399 #, kde-format msgctxt "@label translation author" msgid "Author" msgstr "Forfattar" -#: src/propertyinfo.cpp:405 +#: src/propertyinfo.cpp:406 #, kde-format msgctxt "@label translations last update" msgid "Last Update" msgstr "Sist oppdatert" -#: src/propertyinfo.cpp:412 +#: src/propertyinfo.cpp:413 #, kde-format msgctxt "@label date of template creation8" msgid "Template Creation" msgstr "Mal oppretta" -#: src/propertyinfo.cpp:419 +#: src/propertyinfo.cpp:420 #, kde-format msgctxt "@label the URL a file was originally downloded from" msgid "Downloaded From" msgstr "Lasta ned frå" -#: src/propertyinfo.cpp:426 +#: src/propertyinfo.cpp:427 #, kde-format msgctxt "@label the subject of an email this file was attached to" msgid "E-Mail Attachment Subject" msgstr "Emne til e-postvedlegg" -#: src/propertyinfo.cpp:433 +#: src/propertyinfo.cpp:434 #, kde-format msgctxt "@label the sender of an email this file was attached to" msgid "E-Mail Attachment Sender" msgstr "Avsendar av e-postvedlegg" -#: src/propertyinfo.cpp:440 +#: src/propertyinfo.cpp:441 #, kde-format msgctxt "@label the message ID of an email this file was attached to" msgid "E-Mail Attachment Message ID" msgstr "Meldings-ID til e-postvedlegg" -#: src/typeinfo.cpp:47 +#: src/typeinfo.cpp:48 #, kde-format msgctxt "@label" msgid "Archive" msgstr "Arkiv" -#: src/typeinfo.cpp:52 +#: src/typeinfo.cpp:53 #, kde-format msgctxt "@label" msgid "Audio" msgstr "Lyd" -#: src/typeinfo.cpp:57 +#: src/typeinfo.cpp:58 #, kde-format msgctxt "@label" msgid "Document" msgstr "Dokument" -#: src/typeinfo.cpp:62 +#: src/typeinfo.cpp:63 #, kde-format msgctxt "@label" msgid "Image" msgstr "Bilete" -#: src/typeinfo.cpp:67 +#: src/typeinfo.cpp:68 #, kde-format msgctxt "@label" msgid "Presentation" msgstr "Presentasjon" -#: src/typeinfo.cpp:72 +#: src/typeinfo.cpp:73 #, kde-format msgctxt "@label" msgid "Spreadsheet" msgstr "Rekneark" -#: src/typeinfo.cpp:77 +#: src/typeinfo.cpp:78 #, kde-format msgctxt "@label" msgid "Text" msgstr "Tekst" -#: src/typeinfo.cpp:82 +#: src/typeinfo.cpp:83 #, kde-format msgctxt "@label" msgid "Video" msgstr "Video" -#: src/typeinfo.cpp:87 +#: src/typeinfo.cpp:88 #, kde-format msgctxt "@label" msgid "Folder" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.38.0/po/zh_CN/kfilemetadata5.po new/kfilemetadata-5.39.0/po/zh_CN/kfilemetadata5.po --- old/kfilemetadata-5.38.0/po/zh_CN/kfilemetadata5.po 2017-09-03 10:06:02.000000000 +0200 +++ new/kfilemetadata-5.39.0/po/zh_CN/kfilemetadata5.po 2017-10-07 21:14:16.000000000 +0200 @@ -1,9 +1,16 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Feng Chao <chaofeng...@gmail.com>, 2014. +# Lie Ex <lilith...@gmail.com>, 2014. +# Xuetian Weng <xw...@cs.stonybrook.edu>, 2014. +# Weng Xuetian <wen...@gmail.com>, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-08-16 06:51+0200\n" -"PO-Revision-Date: 2017-08-31 05:10-0400\n" +"PO-Revision-Date: 2017-09-30 17:44-0400\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.38.0/src/extractor.cpp new/kfilemetadata-5.39.0/src/extractor.cpp --- old/kfilemetadata-5.38.0/src/extractor.cpp 2017-09-03 10:06:02.000000000 +0200 +++ new/kfilemetadata-5.39.0/src/extractor.cpp 2017-10-07 21:14:16.000000000 +0200 @@ -31,7 +31,10 @@ Extractor::~Extractor() { - delete d->m_plugin; + if (d->m_autoDeletePlugin == AutoDeletePlugin) { + delete d->m_plugin; + } + delete d; } @@ -44,3 +47,13 @@ { return d->m_plugin->mimetypes(); } + +void Extractor::setExtractorPlugin(ExtractorPlugin *extractorPlugin) +{ + d->m_plugin = extractorPlugin; +} + +void Extractor::setAutoDeletePlugin(ExtractorPluginOwnership autoDelete) +{ + d->m_autoDeletePlugin = autoDelete; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.38.0/src/extractor.h new/kfilemetadata-5.39.0/src/extractor.h --- old/kfilemetadata-5.38.0/src/extractor.h 2017-09-03 10:06:02.000000000 +0200 +++ new/kfilemetadata-5.39.0/src/extractor.h 2017-10-07 21:14:16.000000000 +0200 @@ -28,12 +28,19 @@ class ExtractionResult; class ExtractorCollection; -class ExtractorPrivate; +class ExtractorPlugin; class KFILEMETADATA_EXPORT Extractor { + class ExtractorPrivate; + + enum ExtractorPluginOwnership { + AutoDeletePlugin, + DoNotDeletePlugin, + }; + public: - virtual ~Extractor(); + virtual ~Extractor() noexcept; void extract(ExtractionResult* result); QStringList mimetypes() const; @@ -44,6 +51,10 @@ void operator =(const Extractor&); + void setExtractorPlugin(ExtractorPlugin *extractorPlugin); + + void setAutoDeletePlugin(ExtractorPluginOwnership autoDelete); + ExtractorPrivate *d; friend class ExtractorCollection; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.38.0/src/extractor_p.h new/kfilemetadata-5.39.0/src/extractor_p.h --- old/kfilemetadata-5.38.0/src/extractor_p.h 2017-09-03 10:06:02.000000000 +0200 +++ new/kfilemetadata-5.39.0/src/extractor_p.h 2017-10-07 21:14:16.000000000 +0200 @@ -25,10 +25,14 @@ class ExtractorPlugin; -class ExtractorPrivate +class Extractor::ExtractorPrivate { public: - ExtractorPlugin *m_plugin; + + ExtractorPlugin *m_plugin = nullptr; + + ExtractorPluginOwnership m_autoDeletePlugin = AutoDeletePlugin; + }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kfilemetadata-5.38.0/src/extractorcollection.cpp new/kfilemetadata-5.39.0/src/extractorcollection.cpp --- old/kfilemetadata-5.38.0/src/extractorcollection.cpp 2017-09-03 10:06:02.000000000 +0200 +++ new/kfilemetadata-5.39.0/src/extractorcollection.cpp 2017-10-07 21:14:16.000000000 +0200 @@ -22,7 +22,6 @@ #include "extractor.h" #include "extractorplugin.h" #include "extractorcollection.h" -#include "extractor_p.h" #include "externalextractor.h" #include <QDebug> @@ -120,7 +119,8 @@ ExtractorPlugin* plugin = qobject_cast<ExtractorPlugin*>(obj); if (plugin) { Extractor* ex= new Extractor; - ex->d->m_plugin = plugin; + ex->setExtractorPlugin(plugin); + ex->setAutoDeletePlugin(Extractor::DoNotDeletePlugin); extractors << ex; } else { @@ -136,7 +136,8 @@ Q_FOREACH (const QString& externalPluginPath, externalPluginPaths) { ExternalExtractor *plugin = new ExternalExtractor(externalPluginPath); Extractor* extractor = new Extractor; - extractor->d->m_plugin = plugin; + extractor->setExtractorPlugin(plugin); + extractor->setAutoDeletePlugin(Extractor::AutoDeletePlugin); extractors << extractor; }
