From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6074D138206 for ; Mon, 15 Jan 2018 00:17:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4BADE0951; Mon, 15 Jan 2018 00:17:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 94F1BE0951 for ; Mon, 15 Jan 2018 00:17:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B3BE335C43 for ; Mon, 15 Jan 2018 00:17:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDAFF126 for ; Mon, 15 Jan 2018 00:17:48 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1515975452.7a032cfe2cf568e79295de64bce575f9b3cd8811.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/files/, kde-plasma/kwin/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch kde-plasma/kwin/kwin-5.11.5.ebuild X-VCS-Directories: kde-plasma/kwin/files/ kde-plasma/kwin/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7a032cfe2cf568e79295de64bce575f9b3cd8811 X-VCS-Branch: master Date: Mon, 15 Jan 2018 00:17:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c783227c-896b-4316-8b36-ceb19f2d231d X-Archives-Hash: cdbf9026e0567d752cf0fd6d4a36ce60 commit: 7a032cfe2cf568e79295de64bce575f9b3cd8811 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 15 00:16:37 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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("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