[gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     7a032cfe2cf568e79295de64bce575f9b3cd8811
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 00:16:37 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 00:17:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a032cfe

kde-plasma/kwin: Fix build w/ cmake-3.10

Reported-by: Mike Lothian <mike <AT> fireburn.co.uk>
Closes: https://bugs.gentoo.org/644604
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch | 49 ++++++++++++++++++++++
 kde-plasma/kwin/kwin-5.11.5.ebuild                 |  5 ++-
 2 files changed, 53 insertions(+), 1 deletion(-)

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 00000000000..1b7c6145578
--- /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 1a238668058..3cffda51d8d 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