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/plasma-workspace/, kde-plasma/plasma-workspace/files/
Date: Thu, 31 Aug 2017 20:55:00
Message-Id: 1504212831.20d6b0ac776026c2da57b4a8669bda248c5bacef.asturm@gentoo
1 commit: 20d6b0ac776026c2da57b4a8669bda248c5bacef
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 31 19:48:10 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 31 20:53:51 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d6b0ac
7
8 kde-plasma/plasma-workspace: Fix device notifier size, add USE=appstream
9
10 Upstream commit a59b9e61897887ea93cf736aff99243facdc45d9
11
12 Package-Manager: Portage-2.3.8, Repoman-2.3.3
13
14 .../plasma-workspace-5.10.5-devicenotifier.patch | 32 ++++
15 kde-plasma/plasma-workspace/metadata.xml | 1 +
16 .../plasma-workspace-5.10.5-r1.ebuild | 173 +++++++++++++++++++++
17 3 files changed, 206 insertions(+)
18
19 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.5-devicenotifier.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.5-devicenotifier.patch
20 new file mode 100644
21 index 00000000000..978f326e620
22 --- /dev/null
23 +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10.5-devicenotifier.patch
24 @@ -0,0 +1,32 @@
25 +From b8f263cd9939530a6634a1ddb9533bf473a67805 Mon Sep 17 00:00:00 2001
26 +From: Kai Uwe Broulik <kde@××××××××××××××.de>
27 +Date: Wed, 23 Aug 2017 11:10:34 +0200
28 +Subject: [Device Notifier] Set preferred size for ActionItem
29 +
30 +In QtQuick Layouts implicit size (set by IconItem to the SVG's natural size) takes
31 +precedence over width/height. This was fixed in DeviceItem but forgotten here.
32 +
33 +BUG: 382541
34 +FIXED-IN: 5.8.8
35 +---
36 + applets/devicenotifier/package/contents/ui/ActionItem.qml | 4 ++--
37 + 1 file changed, 2 insertions(+), 2 deletions(-)
38 +
39 +diff --git a/applets/devicenotifier/package/contents/ui/ActionItem.qml b/applets/devicenotifier/package/contents/ui/ActionItem.qml
40 +index 5e54866..df28365 100644
41 +--- a/applets/devicenotifier/package/contents/ui/ActionItem.qml
42 ++++ b/applets/devicenotifier/package/contents/ui/ActionItem.qml
43 +@@ -56,8 +56,8 @@ MouseArea {
44 +
45 + PlasmaCore.IconItem {
46 + source: area.icon
47 +- width: units.iconSizes.smallMedium
48 +- height: width
49 ++ Layout.preferredWidth: units.iconSizes.smallMedium
50 ++ Layout.preferredHeight: width
51 + }
52 +
53 + PlasmaComponents.Label {
54 +--
55 +cgit v0.11.2
56 +
57
58 diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
59 index bc65a860b67..7c6938f31a7 100644
60 --- a/kde-plasma/plasma-workspace/metadata.xml
61 +++ b/kde-plasma/plasma-workspace/metadata.xml
62 @@ -6,6 +6,7 @@
63 <name>Gentoo KDE Project</name>
64 </maintainer>
65 <use>
66 + <flag name="appstream">Enable AppStream software metadata support</flag>
67 <flag name="geolocation">Enables dataengine providing location information</flag>
68 <flag name="prison">Enable support for barcodes/QRcodes</flag>
69 <flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
70
71 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.10.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.10.5-r1.ebuild
72 new file mode 100644
73 index 00000000000..eff5dff8c70
74 --- /dev/null
75 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.10.5-r1.ebuild
76 @@ -0,0 +1,173 @@
77 +# Copyright 1999-2017 Gentoo Foundation
78 +# Distributed under the terms of the GNU General Public License v2
79 +
80 +EAPI=6
81 +
82 +KDE_HANDBOOK="forceoptional"
83 +KDE_TEST="forceoptional"
84 +VIRTUALX_REQUIRED="test"
85 +inherit kde5 qmake-utils
86 +
87 +DESCRIPTION="KDE Plasma workspace"
88 +KEYWORDS="~amd64 ~arm ~arm64 ~x86"
89 +IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop"
90 +
91 +REQUIRED_USE="gps? ( geolocation )"
92 +
93 +COMMON_DEPEND="
94 + $(add_frameworks_dep kactivities)
95 + $(add_frameworks_dep kauth)
96 + $(add_frameworks_dep kbookmarks)
97 + $(add_frameworks_dep kcompletion)
98 + $(add_frameworks_dep kconfig)
99 + $(add_frameworks_dep kconfigwidgets)
100 + $(add_frameworks_dep kcoreaddons)
101 + $(add_frameworks_dep kcrash)
102 + $(add_frameworks_dep kdbusaddons)
103 + $(add_frameworks_dep kdeclarative)
104 + $(add_frameworks_dep kdelibs4support)
105 + $(add_frameworks_dep kglobalaccel)
106 + $(add_frameworks_dep kguiaddons)
107 + $(add_frameworks_dep ki18n)
108 + $(add_frameworks_dep kiconthemes)
109 + $(add_frameworks_dep kidletime)
110 + $(add_frameworks_dep kio)
111 + $(add_frameworks_dep kitemmodels)
112 + $(add_frameworks_dep kitemviews)
113 + $(add_frameworks_dep kjobwidgets)
114 + $(add_frameworks_dep kjs)
115 + $(add_frameworks_dep kjsembed)
116 + $(add_frameworks_dep knewstuff)
117 + $(add_frameworks_dep knotifications)
118 + $(add_frameworks_dep knotifyconfig)
119 + $(add_frameworks_dep kpackage)
120 + $(add_frameworks_dep krunner)
121 + $(add_frameworks_dep kservice)
122 + $(add_frameworks_dep ktexteditor)
123 + $(add_frameworks_dep ktextwidgets)
124 + $(add_frameworks_dep kwallet)
125 + $(add_frameworks_dep kwayland)
126 + $(add_frameworks_dep kwidgetsaddons)
127 + $(add_frameworks_dep kwindowsystem)
128 + $(add_frameworks_dep kxmlgui)
129 + $(add_frameworks_dep kxmlrpcclient)
130 + $(add_frameworks_dep plasma)
131 + $(add_frameworks_dep solid)
132 + $(add_plasma_dep kscreenlocker)
133 + $(add_plasma_dep kwin)
134 + $(add_plasma_dep libksysguard)
135 + $(add_qt_dep qtdbus)
136 + $(add_qt_dep qtdeclarative 'widgets')
137 + $(add_qt_dep qtgui 'jpeg')
138 + $(add_qt_dep qtnetwork)
139 + $(add_qt_dep qtscript)
140 + $(add_qt_dep qtsql)
141 + $(add_qt_dep qtwidgets)
142 + $(add_qt_dep qtx11extras)
143 + $(add_qt_dep qtxml)
144 + media-libs/phonon[qt5(+)]
145 + sys-libs/zlib
146 + x11-libs/libICE
147 + x11-libs/libSM
148 + x11-libs/libX11
149 + x11-libs/libXau
150 + x11-libs/libxcb
151 + x11-libs/libXfixes
152 + x11-libs/libXrender
153 + x11-libs/libXtst
154 + x11-libs/xcb-util
155 + x11-libs/xcb-util-image
156 + appstream? ( dev-libs/appstream[qt5] )
157 + calendar? ( $(add_kdeapps_dep kholidays) )
158 + geolocation? ( $(add_frameworks_dep networkmanager-qt) )
159 + gps? ( sci-geosciences/gpsd )
160 + prison? ( $(add_frameworks_dep prison) )
161 + qalculate? ( sci-libs/libqalculate:= )
162 + semantic-desktop? ( $(add_frameworks_dep baloo) )
163 +"
164 +RDEPEND="${COMMON_DEPEND}
165 + $(add_frameworks_dep kded)
166 + $(add_frameworks_dep kdesu)
167 + $(add_kdeapps_dep kio-extras)
168 + $(add_plasma_dep kde-cli-tools)
169 + $(add_plasma_dep ksysguard)
170 + $(add_plasma_dep milou)
171 + $(add_plasma_dep plasma-integration)
172 + $(add_qt_dep qdbus)
173 + $(add_qt_dep qtgraphicaleffects)
174 + $(add_qt_dep qtpaths)
175 + $(add_qt_dep qtquickcontrols 'widgets')
176 + app-text/iso-codes
177 + x11-apps/mkfontdir
178 + x11-apps/xmessage
179 + x11-apps/xprop
180 + x11-apps/xrdb
181 + x11-apps/xset
182 + x11-apps/xsetroot
183 + !dev-libs/xembed-sni-proxy
184 + !kde-plasma/freespacenotifier:4
185 + !kde-plasma/libtaskmanager:4
186 + !kde-plasma/kcminit:4
187 + !kde-plasma/kdebase-startkde:4
188 + !kde-plasma/klipper:4
189 + !kde-plasma/krunner:4
190 + !kde-plasma/ksmserver:4
191 + !kde-plasma/ksplash:4
192 + !kde-plasma/plasma-workspace:4
193 +"
194 +DEPEND="${COMMON_DEPEND}
195 + $(add_qt_dep qtconcurrent)
196 + x11-proto/xproto
197 +"
198 +
199 +PATCHES=(
200 + "${FILESDIR}/${PN}-5.4-startkde-script.patch"
201 + "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
202 + "${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
203 + "${FILESDIR}/${P}-devicenotifier.patch"
204 +)
205 +
206 +RESTRICT+=" test"
207 +
208 +src_prepare() {
209 + kde5_src_prepare
210 +
211 + sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
212 + -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
213 +}
214 +
215 +src_configure() {
216 + local mycmakeargs=(
217 + $(cmake-utils_use_find_package appstream AppStreamQt)
218 + $(cmake-utils_use_find_package calendar KF5Holidays)
219 + $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
220 + $(cmake-utils_use_find_package prison KF5Prison)
221 + $(cmake-utils_use_find_package qalculate Qalculate)
222 + $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
223 + )
224 +
225 + use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
226 +
227 + kde5_src_configure
228 +}
229 +
230 +src_install() {
231 + kde5_src_install
232 +
233 + # startup and shutdown scripts
234 + insinto /etc/plasma/startup
235 + doins "${FILESDIR}/10-agent-startup.sh"
236 +
237 + insinto /etc/plasma/shutdown
238 + doins "${FILESDIR}/10-agent-shutdown.sh"
239 +}
240 +
241 +pkg_postinst () {
242 + kde5_pkg_postinst
243 +
244 + echo
245 + elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
246 + elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
247 + elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
248 + echo
249 +}