gentoo resync : 29.10.2017

3 files changed, 31 insertions, 2 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index a080243ec5c1..26e29b8ec4a8 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,8 @@
+AUX kdeplasma-addons-5.11.2-qt-5.7.patch 1000 SHA256 7ae862e26d712e54cd9c775bba3faa89a28fcfe3fbb2979b40a1d285ef86ff22 SHA512 cec5bc0bebd88dc2bb0a8d53d80b795188c95d74ce18a539b1b18496dc53a4156a0b8758641b975105c49c98f7a6645d5d181d7401d6e069cd4b846a944132f9 WHIRLPOOL ba67900026c11d1c146e281c2f24eb1fb7960fa8fdb753800136395cfe3f9ab0d89ed2e656e7c29dc5293193b9fbac93eaa4cc42f1a1dc59a01f4f928947e0d1
 DIST kdeplasma-addons-5.10.5.tar.xz 1373676 SHA256 25af1f57b594a4b2a5c629b012b48c5db8d3300b9decd8cd25a20313d150baf5 SHA512 dc9ee0cfa52333b98afe3281914e0ece38caeeb9c29b3fd8a63e5ad657fd68aeeaa4eaf10e7f8ee9470d4b76493ae7249889efb810426b708a213ba4e3c95942 WHIRLPOOL e1ecd7c93aa11947164c6995ed33898708f0ab4b81eacc6c806093d21535a6af7612bf1860f06998e1e4829fc998e1f9f98fd07a37294e311b49037812f2f1d4
-DIST kdeplasma-addons-5.11.1.tar.xz 1382120 SHA256 967eb0f08195e4a8b8b2f3b6c42b6afa18106974276dbfda9e3bc6a842abbc25 SHA512 bb2a8384407c68c12921f9ec26ec53b36e21493dd3f3752fc50408cfca825ffafa518df2a77756fd21353fab8426b2f7a314145f8be9c6355363a8d107f24328 WHIRLPOOL 468494ef4bee9224f7571e3469ac24730e33c1aec308d404e69e13d7287df32703640d822acca6da6b82d5a46922cd4b0ee3cba4d0359814c8146f5cba5cf1b9
+DIST kdeplasma-addons-5.11.2.tar.xz 1378952 SHA256 06af9117a8bfda573141073b73aa5f1755566904866dec92673bb16cd97e3474 SHA512 51ab71a52e7402f7a97f3cfd523176637230570f27bf87c4706d519255725462e1220a3e86d0ff002ce5f74b16b17d72bc071ed3f032a3f9aed494c917afd735 WHIRLPOOL 648b796cdc363d6e6d96d0a5615319874a72f0db1178ac28d695e474d969798783e4817a32d530608a1bf0e533f920771ea7464c864e4ef7ef28b8a02e0abc3c
 EBUILD kdeplasma-addons-5.10.5.ebuild 1428 SHA256 819ed4c9bd96fd15f49ed5d977cf7e7903dcb80fa2fc392f1914383b1de19d61 SHA512 59baaf03c04dc4d304fb42add096afd1ffba9f9a416fab7c1ffd8ff79506bd3e0a12948708e2842319d2e020af5621c1fba695d6da8b39af9fa4ca4558a071c1 WHIRLPOOL 28b5f82c1b9dbc0a5ae0db58e29fed4636d41c9055c89d64cdde809b7b207b83740be43e24e6b1cd443f09d96169c72ab9e7477e8eb39a02ceba7b7f183496f0
-EBUILD kdeplasma-addons-5.11.1.ebuild 1430 SHA256 d1774f16bb874715751d59757b7870e4989ae89ea9e6f7d4112a26bb3349a80e SHA512 a510e2a283055ec74c2be0a453739811c90b26684c8b784bc76a0d6ab42ebd470451af0ed0e9830ba707c42707f780a1aa0833acf31bbb45b5c3a1c44e71e9dd WHIRLPOOL 77629f3b4676f176fdfa289a6d789eb61590fb6b3d4ce62da7f446318340adefded1f047ffc92b890da3ca631d09fdb99e86952bfcea81f5b1be3588c990d63a
+EBUILD kdeplasma-addons-5.11.2.ebuild 1475 SHA256 a37e2f5e6656694b1fa340736de33ef4f5fe683eef91deb81b32d44e044e452b SHA512 4fb8f3efdf75eb7aaee6ed1b7e63bcaf67653f87b7dab2cb52e9d54e21188a57cce7078afd8f8d3cd4b8166b2da3f6d77c9a24a17aba47fe295dc838da422cf5 WHIRLPOOL 9f06c65932409546a0f9487c2acc3b5bcd390046a8c33c675a5fd0ecf09d9dd926ba43d54840411a3bcef02a65362c4f2604dbd813603675d0ca4fca3389fa56
 MISC ChangeLog 14277 SHA256 c356a58b52d5c875540a281e457942db93382c3c1827e8263012724d306df68c SHA512 349891700e3b0c884775a99dffe0148977f6dbd55bb9e6da4d9a70b2133dd47d07b765ba3c7c4112eaa6d0ca400ca31ebffa8904e40bed966e6aff2119ec0e8d WHIRLPOOL cfa135e1fd4bf150f434c016b93823dd7ed231afc3d50169d99ca628ec4eea66a18087d44229ae0b1ef8433a1ac4aead8edecf01a6530e898be48243ddfbef0b
 MISC ChangeLog-2015 766 SHA256 8f5af8ca19fb5ea2f2dc1e64ba256a274323ccbd90bf815e7ff781fc7c9c9235 SHA512 71e1a3db72cce4bc1a2def8e4b7af382ee80e8b9efd42ac71f72d83625cd8b465b5c6b9d1e5276b51290e7da6c0f1dad0243f960e08329ff5c4e15fbd8e4960d WHIRLPOOL 0d0260035858743328c13984c6321f96e35d8be3b12911398a1bd437496d41f1b73ddde97869b40da4b2c74f9d6d2a5f16abef0ff90c95a833a2c30f50088a26
 MISC metadata.xml 355 SHA256 b086e710575447a41d93f1a4cc8668741f764d5f6fa22ec3c63d10f7698eaf2e SHA512 bd9ac9458ccd15750d9659d507459a09c4b5a3297ed6dc91ebec544cff055438a79a28868623cec7e2c08ddcc1352287cbc7dfb9c93774efd14062993f2738ab WHIRLPOOL 1e17db5e7cab457f9df512746b0565a090d8fd315f44e5d82f7054914d6dd7f6399d32d3d467e621fa02c58a712c35d36dbcb2bd7452128ffb27f9741aad99fc
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch
new file mode 100644
index 000000000000..b4afa3c04f5e
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.11.2-qt-5.7.patch
@@ -0,0 +1,26 @@
+From 961078337c823e22691d74925a698d1f28f20ac0 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Wed, 25 Oct 2017 12:36:08 +0200
+Subject: Use wakeOne() instead of notify_one()
+
+The latter was only introduced in Qt 5.8
+---
+ runners/dictionary/dictionarymatchengine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runners/dictionary/dictionarymatchengine.cpp b/runners/dictionary/dictionarymatchengine.cpp
+index 85346d5..27d2228 100644
+--- a/runners/dictionary/dictionarymatchengine.cpp
++++ b/runners/dictionary/dictionarymatchengine.cpp
+@@ -73,7 +73,7 @@ void DictionaryMatchEngine::dataUpdated(const QString &source, const Plasma::Dat
+         /* Because of QString's CoW semantics, we don't have to worry about
+          * the overhead of assigning this to every item. */
+         data->definition = definition;
+-        data->waitCondition.notify_one();
++        data->waitCondition.wakeOne();
+     }
+     m_wordLock.unlock();
+ }
+-- 
+cgit v0.11.2
+
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild
index 881f2a38fd29..79320367019f 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.2.ebuild
@@ -47,6 +47,8 @@ RDEPEND="${DEPEND}
 	!kde-plasma/kdeplasma-addons:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.7.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package share KDEExperimentalPurpose)