[gentoo-commits] proj/kde:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/

[Michael Palimaka]

commit:     4894513b82f91be1407465aeb78744b20bd46778
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Dec 27 21:41:45 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 12:48:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4894513b

kde-apps/umbrello: Remove unused include, fix build

Package-Manager: portage-2.2.24

 .../files/umbrello-15.12.0-fix-compile.patch       | 24 ++++++++++++++++++++++
 kde-apps/umbrello/umbrello-15.12.0.ebuild          |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/kde-apps/umbrello/files/umbrello-15.12.0-fix-compile.patch b/kde-apps/umbrello/files/umbrello-15.12.0-fix-compile.patch
new file mode 100644
index 0000000..fd0e888
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-15.12.0-fix-compile.patch
@@ -0,0 +1,24 @@
+commit 1948e771e0e54ef0dd8290ef31cb5b09ee59f1aa
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
+Date:   Mon Dec 28 16:50:07 2015 +0100
+
+    Remove unused header from frameworks build
+
+diff --git a/umbrello/main.cpp b/umbrello/main.cpp
+index 80a9337..1a68163 100644
+--- a/umbrello/main.cpp
++++ b/umbrello/main.cpp
+@@ -26,11 +26,12 @@
+ #include <kconfig.h>
+ #include <KLocalizedString>
+ #include <ktip.h>
+-#include <kwindowsystem.h>
+ 
+ #if QT_VERSION >= 0x050000
+ #include <QApplication>
+ #include <QCommandLineParser>
++#else
++#include <kwindowsystem.h>
+ #endif
+ 
+ #include <unistd.h>

diff --git a/kde-apps/umbrello/umbrello-15.12.0.ebuild b/kde-apps/umbrello/umbrello-15.12.0.ebuild
index 8a7285e..88e8905 100644
--- a/kde-apps/umbrello/umbrello-15.12.0.ebuild
+++ b/kde-apps/umbrello/umbrello-15.12.0.ebuild
@@ -41,6 +41,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-fix-compile.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_KF5=ON