Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/qguiplatformplugin_kde/files/, kde-plasma/qguiplatformplugin_kde/
Date: Fri, 05 Jan 2018 00:35:14
Message-Id: 1515112467.a321a66e1bccc885db3b2d0d56a5eca348e0b2c4.asturm@gentoo
1 commit: a321a66e1bccc885db3b2d0d56a5eca348e0b2c4
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 20:46:34 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 5 00:34:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a321a66e
7
8 kde-plasma/qguiplatformplugin_kde: Switch to kde4-base, EAPI 6
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 .../files/qguiplatformplugin_kde-4.11.22-cmake.patch | 17 +++++++++++++++++
13 .../qguiplatformplugin_kde-4.11.22.ebuild | 12 ++++++++----
14 2 files changed, 25 insertions(+), 4 deletions(-)
15
16 diff --git a/kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch b/kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch
17 new file mode 100644
18 index 00000000000..defd44f2651
19 --- /dev/null
20 +++ b/kde-plasma/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.22-cmake.patch
21 @@ -0,0 +1,17 @@
22 +Standalone build of the plugin.
23 +
24 +--- a/CMakeLists.txt 2018-01-04 21:38:30.921464554 +0100
25 ++++ b/CMakeLists.txt 2018-01-04 21:38:30.890464324 +0100
26 +@@ -1,5 +1,12 @@
27 ++cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
28 ++
29 + project(qguiplatformplugin_kde)
30 +
31 ++find_package(KDE4 4.9.4 REQUIRED)
32 ++include(KDE4Defaults)
33 ++add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
34 ++include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
35 ++
36 + set(kde_SOURCES qguiplatformplugin_kde.cpp)
37 + qt4_generate_moc(qguiplatformplugin_kde.cpp ${CMAKE_CURRENT_BINARY_DIR}/qguiplatformplugin_kde.moc)
38 +
39
40 diff --git a/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild b/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
41 index 0c587aa1716..a192beace50 100644
42 --- a/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
43 +++ b/kde-plasma/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
44 @@ -1,11 +1,15 @@
45 -# Copyright 1999-2016 Gentoo Foundation
46 +# Copyright 1999-2018 Gentoo Foundation
47 # Distributed under the terms of the GNU General Public License v2
48
49 -EAPI=5
50 +EAPI=6
51
52 KMNAME="kde-workspace"
53 -inherit kde4-meta
54 +inherit kde4-base
55
56 -DESCRIPTION="Helps integration of pure Qt applications with KDE Plasma"
57 +DESCRIPTION="Helps integration of pure Qt4 applications with KDE Plasma"
58 KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
59 IUSE="debug"
60 +
61 +S="${WORKDIR}/${KMNAME}-${PV}/qguiplatformplugin_kde"
62 +
63 +PATCHES=( "${FILESDIR}/${P}-cmake.patch" )