gentoo resync : 04.05.2019

4 files changed, 50 insertions, 1 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 110aaf901813..ee0b0adce842 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index 7a89b8cf623b..49b90e0dc53f 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,6 @@
+AUX kfilemetadata-5.57.0-non-speex-files-crash.patch 1648 BLAKE2B f6a43d3d4b4503075eb0196ca85a6f7622cfb294473f492a044e48b4bcb96a135e939122855563946cbdafe954b8c203400abd50f687da97f4ead6a8220b1006 SHA512 8f29fcc30343697787f6baae65a6cd12fd9cce89aa0ebc50b8ef157662d8336bc2dc7d2956cc3ca2364da7eef8c9beacfa63adecb66d4aca41526d58f7200b47
 DIST kfilemetadata-5.54.0.tar.xz 302204 BLAKE2B ecf9a4fac9fcf18fc5344fd29eb2e28bebc1e65762c9f62b1e07abf67e2a55bd677b16a02fafa2308a63757f0adcc35e4dac47244a05df067026c0da11553c40 SHA512 bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801
 DIST kfilemetadata-5.57.0.tar.xz 410556 BLAKE2B 988f822829c294f2c1dd6f88d8a395f8cb07709a46b79754cf782bc426faa89688cc78159fb0172499be53f1c4526df722166297dfc687388a36290c31732c3c SHA512 a513a9e850758647e098177eeea793a2672644de531293b37d57ee216fd3048c124dbea99c5b469ce110fc538169fe72fcfd1b72a1296360d1f111d14bcf2b8e
 EBUILD kfilemetadata-5.54.0.ebuild 1630 BLAKE2B ad286b0e4506ac364adfec6112f0724dbf6c2751427f775e4c5928bca0e53400e9c46547e3cddb4f45c4ecee182074f35e07e5d4c4e6d43c3989d06dbf7a3b13 SHA512 1eb2545f4539820dd2810bdadf4d0be69045720b10a450c49e5300a4d40ac3d5f882d5f50c298fb8f07e5da877cb6f28d4052ec00f47b6264c209590efd46286
-EBUILD kfilemetadata-5.57.0.ebuild 1679 BLAKE2B a7ff8d5b49267ad6c472b6f419eb578e9058b5c20190fe9c3cb7635cb4c220f9dc9812f7e087f5859bd46f7c81f002b9a37e91e4e5237478ee943624547b5c20 SHA512 0d170b508a5141f72c5968dec33eb5a35ec4e21454e2485aa16b5379214eb39a63e59dd007f66f48a3af649512961b650681acd90f08fec8730827ea9ac7de08
+EBUILD kfilemetadata-5.57.0-r1.ebuild 1739 BLAKE2B 50effafc6e9ed827626a7c8d0bc7ce6499a554cb3a0fe28befe234ffbd317497da4d39fc0b37304a83ea803d37746439bb61c0c41f828739e1cd38079fe988fb SHA512 197d248623cb4eecc0f6db2ca9cc55f87cb37cdbeaf3d10e6e75a768f913d9eef936a8fff61a03eb47996ae51cd200c25890b9de41d83dc1fad675fb8b08cd8f
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.57.0-non-speex-files-crash.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.57.0-non-speex-files-crash.patch
new file mode 100644
index 000000000000..5664cf024b22
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.57.0-non-speex-files-crash.patch
@@ -0,0 +1,46 @@
+From 61b1916c3e87c3b8f4fc3d1f1d19bf427b9247da Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Tue, 30 Apr 2019 03:51:14 +0200
+Subject: [TagLibExtractor] Fix crash on invalid Speex files
+
+Summary:
+TagLib::Ogg::Speex::File::isValid() returns true even for invalid files,
+but tag() only returns a valid XiphComment when the file is valid.
+
+Other TagLib::Ogg::* classes properly clear the valid flag when
+encountering files.
+
+See https://github.com/taglib/taglib/issues/902
+
+BUG: 403902
+
+Reviewers: #baloo, #frameworks, ngraham, astippich
+
+Reviewed By: #baloo, ngraham, astippich
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks, #baloo
+
+Differential Revision: https://phabricator.kde.org/D20913
+---
+ src/extractors/taglibextractor.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/extractors/taglibextractor.cpp b/src/extractors/taglibextractor.cpp
+index 1954cac..e355907 100644
+--- a/src/extractors/taglibextractor.cpp
++++ b/src/extractors/taglibextractor.cpp
+@@ -476,7 +476,9 @@ void TagLibExtractor::extract(ExtractionResult* result)
+         }
+     } else if (mimeType == QLatin1String("audio/speex") || mimeType == QLatin1String("audio/x-speex+ogg")) {
+         TagLib::Ogg::Speex::File file(&stream, true);
+-        if (file.isValid()) {
++        // Workaround for buggy taglib:
++        // isValid() returns true for invalid files, but XiphComment* tag() returns a nullptr
++        if (file.isValid() && file.tag()) {
+             extractAudioProperties(&file, result);
+             readGenericProperties(file.properties(), result);
+         }
+-- 
+cgit v1.1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0-r1.ebuild
index 542d913a78d1..92679579c665 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.57.0-r1.ebuild
@@ -31,6 +31,8 @@ DEPEND="${RDEPEND}
 	kernel_linux? ( sys-apps/attr )
 "
 
+PATCHES=( "${FILESDIR}/${P}-non-speex-files-crash.patch" )
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 	kde5_pkg_setup