diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-16 17:34:21 +0000 |
commit | 02e2208f46f4e2c00fb9743cbc47350bdd233bfa (patch) | |
tree | 132dd60828854db4f65f30f9230f43d9602507ff /kde-plasma/kwin/files | |
parent | 8be70107efbb417f839292165ee39d07a062046f (diff) |
gentoo resync : 16.01.2018
Diffstat (limited to 'kde-plasma/kwin/files')
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch | 49 |
1 files changed, 49 insertions, 0 deletions
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 + |