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: Tue, 11 Sep 2018 17:47:08
Message-Id: 1536687092.1e10a827bb558a47393dc8d4f7b36b925e3a1c10.asturm@gentoo
1 commit: 1e10a827bb558a47393dc8d4f7b36b925e3a1c10
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 11 17:31:07 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 11 17:31:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e10a827
7
8 kde-plasma/plasma-workspace: MPRIS - change int to double for positions
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 .../plasma-workspace-5.13.5-double-positions.patch | 31 ++++
13 .../plasma-workspace-5.13.5-r1.ebuild | 174 +++++++++++++++++++++
14 2 files changed, 205 insertions(+)
15
16 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.13.5-double-positions.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.13.5-double-positions.patch
17 new file mode 100644
18 index 00000000000..0c294af670a
19 --- /dev/null
20 +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.13.5-double-positions.patch
21 @@ -0,0 +1,31 @@
22 +From 1bb02b98cfedfd6b51ac8de0c34a5778659433f7 Mon Sep 17 00:00:00 2001
23 +From: Arsen Arsen <arsenarsentmc@×××××××.com>
24 +Date: Thu, 6 Sep 2018 10:29:09 +0200
25 +Subject: [Media Player] Change int to double for positions
26 +
27 +In previous versions of Plasma, media player had an overflow bug in positions, leading to the player resetting to 00:00.
28 +This only affects files longer than around 33 minutes 20 seconds.
29 +
30 +BUG: 397591
31 +FIXED-IN: 5.12.7
32 +
33 +Differential Revision: https://phabricator.kde.org/D15311
34 +---
35 + applets/mediacontroller/contents/ui/ExpandedRepresentation.qml | 2 +-
36 + 1 file changed, 1 insertion(+), 1 deletion(-)
37 +
38 +diff --git a/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml b/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
39 +index 2922f99..904fe49 100644
40 +--- a/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
41 ++++ b/applets/mediacontroller/contents/ui/ExpandedRepresentation.qml
42 +@@ -35,7 +35,7 @@ Item {
43 +
44 + readonly property int controlSize: Math.min(height, width) / 4
45 +
46 +- property int position: mpris2Source.currentData.Position || 0
47 ++ property double position: mpris2Source.currentData.Position || 0
48 + readonly property real rate: mpris2Source.currentData.Rate || 1
49 + readonly property double length: currentMetadata ? currentMetadata["mpris:length"] || 0 : 0
50 +
51 +--
52 +cgit v0.11.2
53
54 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
55 new file mode 100644
56 index 00000000000..eed111285bb
57 --- /dev/null
58 +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.13.5-r1.ebuild
59 @@ -0,0 +1,174 @@
60 +# Copyright 1999-2018 Gentoo Foundation
61 +# Distributed under the terms of the GNU General Public License v2
62 +
63 +EAPI=6
64 +
65 +KDE_HANDBOOK="forceoptional"
66 +KDE_TEST="forceoptional"
67 +VIRTUALX_REQUIRED="test"
68 +inherit kde5 qmake-utils
69 +
70 +DESCRIPTION="KDE Plasma workspace"
71 +KEYWORDS="~amd64 ~arm ~arm64 ~x86"
72 +IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
73 +
74 +REQUIRED_USE="gps? ( geolocation )"
75 +
76 +COMMON_DEPEND="
77 + $(add_frameworks_dep kactivities)
78 + $(add_frameworks_dep kauth)
79 + $(add_frameworks_dep kbookmarks)
80 + $(add_frameworks_dep kcompletion)
81 + $(add_frameworks_dep kconfig)
82 + $(add_frameworks_dep kconfigwidgets)
83 + $(add_frameworks_dep kcoreaddons)
84 + $(add_frameworks_dep kcrash)
85 + $(add_frameworks_dep kdbusaddons)
86 + $(add_frameworks_dep kdeclarative)
87 + $(add_frameworks_dep kdelibs4support)
88 + $(add_frameworks_dep kglobalaccel)
89 + $(add_frameworks_dep kguiaddons)
90 + $(add_frameworks_dep ki18n)
91 + $(add_frameworks_dep kiconthemes)
92 + $(add_frameworks_dep kidletime)
93 + $(add_frameworks_dep kio)
94 + $(add_frameworks_dep kitemmodels)
95 + $(add_frameworks_dep kitemviews)
96 + $(add_frameworks_dep kjobwidgets)
97 + $(add_frameworks_dep kjs)
98 + $(add_frameworks_dep kjsembed)
99 + $(add_frameworks_dep knewstuff)
100 + $(add_frameworks_dep knotifications)
101 + $(add_frameworks_dep knotifyconfig)
102 + $(add_frameworks_dep kpackage)
103 + $(add_frameworks_dep krunner)
104 + $(add_frameworks_dep kservice)
105 + $(add_frameworks_dep ktexteditor)
106 + $(add_frameworks_dep ktextwidgets)
107 + $(add_frameworks_dep kwallet)
108 + $(add_frameworks_dep kwayland)
109 + $(add_frameworks_dep kwidgetsaddons)
110 + $(add_frameworks_dep kwindowsystem)
111 + $(add_frameworks_dep kxmlgui)
112 + $(add_frameworks_dep plasma)
113 + $(add_frameworks_dep solid)
114 + $(add_plasma_dep kscreenlocker)
115 + $(add_plasma_dep kwin)
116 + $(add_plasma_dep libksysguard)
117 + $(add_qt_dep qtdbus)
118 + $(add_qt_dep qtdeclarative 'widgets')
119 + $(add_qt_dep qtgui 'jpeg')
120 + $(add_qt_dep qtnetwork)
121 + $(add_qt_dep qtscript)
122 + $(add_qt_dep qtsql)
123 + $(add_qt_dep qtwidgets)
124 + $(add_qt_dep qtx11extras)
125 + $(add_qt_dep qtxml)
126 + media-libs/phonon[qt5(+)]
127 + sys-libs/zlib
128 + x11-libs/libICE
129 + x11-libs/libSM
130 + x11-libs/libX11
131 + x11-libs/libXau
132 + x11-libs/libxcb
133 + x11-libs/libXfixes
134 + x11-libs/libXrender
135 + x11-libs/libXtst
136 + x11-libs/xcb-util
137 + x11-libs/xcb-util-image
138 + appstream? ( dev-libs/appstream[qt5] )
139 + calendar? ( $(add_frameworks_dep kholidays) )
140 + geolocation? ( $(add_frameworks_dep networkmanager-qt) )
141 + gps? ( sci-geosciences/gpsd )
142 + prison? ( $(add_frameworks_dep prison) )
143 + qalculate? ( sci-libs/libqalculate:= )
144 + semantic-desktop? ( $(add_frameworks_dep baloo) )
145 +"
146 +DEPEND="${COMMON_DEPEND}
147 + $(add_qt_dep qtconcurrent)
148 + x11-base/xorg-proto
149 +"
150 +RDEPEND="${COMMON_DEPEND}
151 + $(add_frameworks_dep kded)
152 + $(add_frameworks_dep kdesu)
153 + $(add_kdeapps_dep kio-extras)
154 + $(add_plasma_dep ksysguard)
155 + $(add_plasma_dep milou)
156 + $(add_plasma_dep plasma-integration)
157 + $(add_qt_dep qdbus)
158 + $(add_qt_dep qtgraphicaleffects)
159 + $(add_qt_dep qtpaths)
160 + $(add_qt_dep qtquickcontrols 'widgets')
161 + app-text/iso-codes
162 + x11-apps/mkfontdir
163 + x11-apps/xmessage
164 + x11-apps/xprop
165 + x11-apps/xrdb
166 + x11-apps/xset
167 + x11-apps/xsetroot
168 + systemd? ( sys-apps/dbus[user-session] )
169 + !systemd? ( sys-apps/dbus )
170 + !dev-libs/xembed-sni-proxy
171 + !kde-plasma/freespacenotifier:4
172 + !kde-plasma/libtaskmanager:4
173 + !kde-plasma/kcminit:4
174 + !kde-plasma/kdebase-startkde:4
175 + !kde-plasma/klipper:4
176 + !kde-plasma/krunner:4
177 + !kde-plasma/ksmserver:4
178 + !kde-plasma/ksplash:4
179 + !kde-plasma/plasma-workspace:4
180 +"
181 +PDEPEND="
182 + $(add_plasma_dep kde-cli-tools)
183 +"
184 +
185 +PATCHES=(
186 + "${FILESDIR}/${PN}-5.4-startkde-script.patch"
187 + "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
188 + "${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
189 + "${FILESDIR}/${P}-double-positions.patch"
190 +)
191 +
192 +RESTRICT+=" test"
193 +
194 +src_prepare() {
195 + kde5_src_prepare
196 +
197 + sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
198 + -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
199 +}
200 +
201 +src_configure() {
202 + local mycmakeargs=(
203 + $(cmake-utils_use_find_package appstream AppStreamQt)
204 + $(cmake-utils_use_find_package calendar KF5Holidays)
205 + $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
206 + $(cmake-utils_use_find_package prison KF5Prison)
207 + $(cmake-utils_use_find_package qalculate Qalculate)
208 + $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
209 + )
210 +
211 + use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
212 +
213 + kde5_src_configure
214 +}
215 +
216 +src_install() {
217 + kde5_src_install
218 +
219 + # startup and shutdown scripts
220 + insinto /etc/plasma/startup
221 + doins "${FILESDIR}/10-agent-startup.sh"
222 +
223 + insinto /etc/plasma/shutdown
224 + doins "${FILESDIR}/10-agent-shutdown.sh"
225 +}
226 +
227 +pkg_postinst () {
228 + kde5_pkg_postinst
229 +
230 + elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
231 + elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
232 + elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
233 +}