gentoo resync : 16.01.2018

3 files changed, 55 insertions, 2 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 7572c8bf1148..e5ed48c264d9 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,9 @@
 AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771c4557c65f68dfe8cd5e6dcb55f6f65d5e1d0b220cde0901f56baeb8ffd194c604115f64c6d6496b19be6e9254cf37f567d SHA512 e564dc6c0e28762917713d37aec099d1ff522f64e26aabc906ffbb7dd4056316bbab43b1b3c71e1f55659471e270f17afe8673a76dcd75efa1a5c8e399bdd7f5
+AUX kwin-5.11.5-cmake-3.10.patch 1547 BLAKE2B 581f27ce23adfa92353b61bf0a58e1c945e56e27f3cf5dddc0ab558f8bddc3d81045711c24077f9da2821bfba17d1ca841f3aad9989d55f4211344f28e158983 SHA512 adf58db9d06ebefd66e0af20eee67c11ecb9e6ff8dabd848021bf8587d1e7fa7924561fbed39308c0ab214d5a4c4e130166ad008e8d30590b697cd4fb33454d7
 AUX kwin-5.8.7-glibc-sysmacros.patch 1016 BLAKE2B db65f2af7eb305398649e3f73445a3e658725fca426fa4d3785e3a1aae669005b776499c21237ecfb834e1b4b95664dce754e367452ac33a346084453f7eae1b SHA512 9b8d8754a4e0c8a9421bc7bf04932b5dabfd9c0c7f56fc1ebe6562afcdbb2d3495c009f4cbfa0a8a665e363ffeb9ac9bf3c7a5fbba7f7d1da7571f7cab6908a7
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.10.5.tar.xz 4674932 BLAKE2B 5e10f20220f750e49394395e3070ae4259aae3fc6109dbbb5540a92b6ecafbacc8c1ab2187be17413abd60a0d9b01071b2216bc44a80cbe3754ee13311dfb980 SHA512 b679dac07b7cc71c9ac7f4755282f8e30d5c2757c7cf9f29ed4f7653c70832140171e1227299a726af8aef1919db83b115dc4091ff80851b0afc53a4cf06840a
 DIST kwin-5.11.5.tar.xz 4965516 BLAKE2B 1e9fcc3c97f1a714925b9f33c5741cffd91ffd080698def2693b94c2b8a07d7526566637aeffdbc54b19136144d29327e5a9dad3165f099e95e79e4bd41262ff SHA512 fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2
 EBUILD kwin-5.10.5.ebuild 2344 BLAKE2B 0bd5e7f96a3acb77f99944a96cf26748cac7ec7ac48288bbb29d1f10584d31a88bbea908821c9a3764d2848bc1fbc78ac72d41cd70936e1e1947f598cb46e889 SHA512 d8194a55406f9299772e80cde1afa6363b689efb7bc7a289c72925f92351adbb18c688e7908ccab476eca40a35561a0ef9eb0a2f435b70ee08459268ea20c5a5
-EBUILD kwin-5.11.5.ebuild 2369 BLAKE2B d949027948431953041ee953f3f20f7ff2822c1be686ff54d72212d1f5665bf34c1a1aede9febf26bf5403a770228badd6e9730b45c7f42a18ad678364488ce6 SHA512 479f0aa42fcf82db72ef9e3a71f645186108ec4b1716f0d11d011f6182208892732c44cb029376d81bd9b8b65044b0994b8e49fdeecd6deb1a81d904ddc7bced
+EBUILD kwin-5.11.5.ebuild 2415 BLAKE2B 7c8fc3fe3b2602e78c43f2499df414e45dc0231722bfd6589930d16c16fa1e25bea5016984f3d20589119526cde0dc40ef742fa26d89d9d967f5e28ba80b32c3 SHA512 8c974a79b1559f4cb4a60fc0a62f98d19d9ad0c0f97e7c86d83a17910350678167a00ca7d29d8a56e687ca586262d044c9afc41f21e9485718f33dafe32f99d0
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch b/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch
new file mode 100644
index 000000000000..1b7c61455783
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch
@@ -0,0 +1,49 @@
+From cd544890ced4192d07467c89e23adbb62d8cea5c Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Mon, 18 Dec 2017 11:40:35 +0100
+Subject: Fix build with CMake 3.10
+
+Looks like a classic false-positive, but this makes the compile
+pass for me without making the code harder to read:
+
+AutoMoc error
+-------------
+  "/ssd/milian/projects/kf5/src/kde/workspace/kwin/kcmkwin/kwinscripts/main.cpp"
+The file contains a K_PLUGIN_FACTORY macro, but does not include "main.moc"!
+Consider to
+ - add #include "main.moc"
+ - enable SKIP_AUTOMOC for this file
+
+So we just add the include and then get rid of the duplicate
+definition of the plugin factory and the problem is resolved.
+---
+ kcmkwin/kwinscripts/main.cpp   | 2 ++
+ kcmkwin/kwinscripts/module.cpp | 2 --
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kcmkwin/kwinscripts/main.cpp b/kcmkwin/kwinscripts/main.cpp
+index f5ee04b..baa5175 100644
+--- a/kcmkwin/kwinscripts/main.cpp
++++ b/kcmkwin/kwinscripts/main.cpp
+@@ -22,3 +22,5 @@
+ 
+ K_PLUGIN_FACTORY(KcmKWinScriptsFactory,
+                  registerPlugin<Module>("kwin-scripts");)
++
++#include "main.moc"
+diff --git a/kcmkwin/kwinscripts/module.cpp b/kcmkwin/kwinscripts/module.cpp
+index a0d698e..ccf7d41 100644
+--- a/kcmkwin/kwinscripts/module.cpp
++++ b/kcmkwin/kwinscripts/module.cpp
+@@ -40,8 +40,6 @@
+ 
+ #include "version.h"
+ 
+-K_PLUGIN_FACTORY_DECLARATION(KcmKWinScriptsFactory)
+-
+ Module::Module(QWidget *parent, const QVariantList &args) :
+     KCModule(parent, args),
+     ui(new Ui::Module),
+-- 
+cgit v0.11.2
+
diff --git a/kde-plasma/kwin/kwin-5.11.5.ebuild b/kde-plasma/kwin/kwin-5.11.5.ebuild
index 1a2386680586..3cffda51d8d3 100644
--- a/kde-plasma/kwin/kwin-5.11.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.11.5.ebuild
@@ -84,7 +84,10 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-5.10.95-test-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.10.95-test-optional.patch"
+	"${FILESDIR}/${PN}-5.11.5-cmake-3.10.patch"
+)
 
 src_prepare() {
 	kde5_src_prepare