gentoo resync : 28.04.2019

3 files changed, 47 insertions, 2 deletions

diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 854258acf5bf..8fdc2619d6eb 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,6 @@
+AUX kpackage-5.57.0-runtime-crashfix.patch 1391 BLAKE2B d67afbbeefba387176a5ac24345e44994360490de8c0af3f851726941872de7a2d4169b14ade3dcb64a6eb871cd8e3bce748cff1d78219e9ab1f92df5aedb326 SHA512 8b053d3dab2cb93920c3712bb14d75ec8a3af392fe05fbdcdd65faf50ecbcda2ae78c1759a7d0ef742698b111881df57785399e558b450af17e5b0a4c7b1bed4
 DIST kpackage-5.54.0.tar.xz 132812 BLAKE2B e4a788c305b193132767820fc17465a216cb1faf929eae7ed97500d0beb5bc3c7d63269d5b2fddbb3445f3824168ddc90ff78685aa1ca6eb0771754563c9cd12 SHA512 d26f5dad3634a442d55bae94903ec6d781fa1984a780eec4b1f9ea0f9d3ae50b0defd3ddb078d7b0410626250ded1ee1e5ca1f5ea7ecee1ede4a0ef30463a8c8
-DIST kpackage-5.56.0.tar.xz 132728 BLAKE2B 39bf8ba3879dd9f7a87b59390f784ce4a50d8abbeb00053371ba9916f3f5820798621fda82ac1cf9e86dea2e1d51e94a0124b8e0e4a50092f107ea2c6a215bd2 SHA512 e5fb656be09fd6292387b3b7eaeffb65d5e6681143f0e36c164462000821c76713d668e430819fa5fb0c487037a03618875f1ee73f998f2bc411d005cf14fa10
+DIST kpackage-5.57.0.tar.xz 133456 BLAKE2B 72c295fe68a2afb5d93acd411344b3617c0c85286201541088e4afa0fc2bb8c58633c583f5b572b9e9fc4bbfcb55956cc4cf57355cf9271b1f0afe42fc4330f9 SHA512 bd133f60e8a09e1802354118832ad939235570dea7b8eba028d8144366769626b7f8830cc5486ac0791c21523ea06c284ae8b9b08b2d3a526b43e636698ad360
 EBUILD kpackage-5.54.0.ebuild 653 BLAKE2B fe439f78fe820882a4a6b7d08ba7ad3f44e8afb47378b145766bf3bc69ed384a0296a4fb77183c200eb7bda2bb7bd8bf2c661ccad787e6cc2347e4461d5a5ccd SHA512 18f5d19df1c460a51d6a8eae3874c05e3408f9936542bc6643a98b9b80af9c0db39a681462c14b89fe91e98363dda78fbce1429ab8f03340862f3942637e70e6
-EBUILD kpackage-5.56.0.ebuild 665 BLAKE2B e2d96c0c6ed6441cae1bd2360b7d3f62f22c5aae4fb56a29726e478db21874f102c076ed36301a4574606956a6cc44391b07b7da54924a2761d3b103d5da58fd SHA512 ebbe419ae19780525b4e156c348e1c6d65b1274d89eb3764038b486615dc16394dc3e136c15cdf42c5ea953101ad86dbc6d7b43df1229deb4de7dcc9cdb07357
+EBUILD kpackage-5.57.0-r1.ebuild 720 BLAKE2B 97712d051adb40912f09d391f96ec9610d763be7cb06268a6f0c420b9a04fa7f96469954ecb2621326e235464212b4e4e86a322c01d5945f450db21dd02c1413 SHA512 44c609e778ba758e283b8fa1a3b8472c7a5b5410c4397d784e290a30d86a6f0569f05722391d45cdbe21798549a11b588395921baac71509503d8ab488090778
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kpackage/files/kpackage-5.57.0-runtime-crashfix.patch b/kde-frameworks/kpackage/files/kpackage-5.57.0-runtime-crashfix.patch
new file mode 100644
index 000000000000..5d13d3f8c3a3
--- /dev/null
+++ b/kde-frameworks/kpackage/files/kpackage-5.57.0-runtime-crashfix.patch
@@ -0,0 +1,42 @@
+From c3e896e02f9a8dc92d6e26cdbc87fe5c6b9cf3bf Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 14 Apr 2019 19:44:50 +0200
+Subject: Don't use qAsConst over a temporary variable
+
+Summary:
+(will crash because the temporary will be destroyed before being used)
+
+Detected with
+  ag -sr qAsConst'\([^)]*\(' .
+
+Test Plan: builds
+
+Reviewers: mlaurent, cfeck, apol
+
+Reviewed By: mlaurent
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D20552
+---
+ src/kpackage/package.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
+index 130eec6..801f1c2 100644
+--- a/src/kpackage/package.cpp
++++ b/src/kpackage/package.cpp
+@@ -429,7 +429,8 @@ QStringList Package::entryList(const QByteArray &key) const
+     QStringList list;
+     for (const QString &prefix : qAsConst(d->contentsPrefixPaths)) {
+         //qCDebug(KPACKAGE_LOG) << "     looking in" << prefix;
+-        for (const QString &path : qAsConst(it.value().paths)) {
++        const QStringList paths = it.value().paths;
++        for (const QString &path : paths) {
+             //qCDebug(KPACKAGE_LOG) << "         looking in" << path;
+             if (it.value().directory) {
+                 //qCDebug(KPACKAGE_LOG) << "it's a directory, so trying out" << d->path + prefix + path;
+-- 
+cgit v1.1
diff --git a/kde-frameworks/kpackage/kpackage-5.56.0.ebuild b/kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild
index bcf035400b5a..a65b0d91a0dc 100644
--- a/kde-frameworks/kpackage/kpackage-5.56.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.57.0-r1.ebuild
@@ -20,6 +20,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-runtime-crashfix.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package man KF5DocTools)