1 |
commit: ef4dd781b1d8199027f0b0c55004446e5d3bd10d |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 15 16:58:39 2017 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 15 16:58:49 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4dd781 |
7 |
|
8 |
kde-plasma/plasma-desktop: Fix folder view script execution |
9 |
|
10 |
Revision bump backport upstream patch to fix upstream bug #375793. |
11 |
|
12 |
Gentoo-bug: 609404 |
13 |
|
14 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
15 |
|
16 |
...esktop-5.8.5-folder-view-script-execution.patch | 28 ++++ |
17 |
.../plasma-desktop/plasma-desktop-5.8.5-r2.ebuild | 166 +++++++++++++++++++++ |
18 |
2 files changed, 194 insertions(+) |
19 |
|
20 |
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-folder-view-script-execution.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-folder-view-script-execution.patch |
21 |
new file mode 100644 |
22 |
index 0000000000..d8376d87d5 |
23 |
--- /dev/null |
24 |
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.8.5-folder-view-script-execution.patch |
25 |
@@ -0,0 +1,28 @@ |
26 |
+commit 771e57f3b2c19f4e6f867c01c2457ec87531b4cf |
27 |
+Author: Kai Uwe Broulik <kde@××××××××××××××.de> |
28 |
+Date: Tue Jan 31 15:07:42 2017 +0100 |
29 |
+ |
30 |
+ [Folder View] show script execution prompt when clicking item |
31 |
+ |
32 |
+ When clicking a file in FolderView, we should ask for whether to open or run a script depending on user settings. |
33 |
+ This is what Dolphin does. |
34 |
+ |
35 |
+ BUG: 375793 |
36 |
+ FIXED-IN: 5.8.6 |
37 |
+ |
38 |
+ Differential Revision: https://phabricator.kde.org/D4367 |
39 |
+ |
40 |
+diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp |
41 |
+index 758f7f35..1ba12450 100644 |
42 |
+--- a/containments/desktop/plugins/folder/foldermodel.cpp |
43 |
++++ b/containments/desktop/plugins/folder/foldermodel.cpp |
44 |
+@@ -509,7 +509,8 @@ void FolderModel::run(int row) |
45 |
+ url.setScheme(QStringLiteral("file")); |
46 |
+ } |
47 |
+ |
48 |
+- new KRun(url, 0); |
49 |
++ KRun *run = new KRun(url, 0); |
50 |
++ run->setShowScriptExecutionPrompt(true); |
51 |
+ } |
52 |
+ |
53 |
+ void FolderModel::rename(int row, const QString& name) |
54 |
|
55 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r2.ebuild |
56 |
new file mode 100644 |
57 |
index 0000000000..c5eca0fd3d |
58 |
--- /dev/null |
59 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.8.5-r2.ebuild |
60 |
@@ -0,0 +1,166 @@ |
61 |
+# Copyright 1999-2017 Gentoo Foundation |
62 |
+# Distributed under the terms of the GNU General Public License v2 |
63 |
+# $Id$ |
64 |
+ |
65 |
+EAPI=6 |
66 |
+ |
67 |
+KDE_HANDBOOK="forceoptional" |
68 |
+KDE_TEST="true" |
69 |
+VIRTUALX_REQUIRED="test" |
70 |
+inherit kde5 |
71 |
+ |
72 |
+DESCRIPTION="KDE Plasma desktop" |
73 |
+KEYWORDS="~amd64 ~arm ~x86" |
74 |
+IUSE="+fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus |
75 |
+legacy-systray packagekit pulseaudio +qt4 scim +semantic-desktop" |
76 |
+ |
77 |
+COMMON_DEPEND=" |
78 |
+ $(add_frameworks_dep attica) |
79 |
+ $(add_frameworks_dep kactivities) |
80 |
+ $(add_frameworks_dep kactivities-stats) |
81 |
+ $(add_frameworks_dep karchive) |
82 |
+ $(add_frameworks_dep kauth) |
83 |
+ $(add_frameworks_dep kbookmarks) |
84 |
+ $(add_frameworks_dep kcmutils) |
85 |
+ $(add_frameworks_dep kcodecs) |
86 |
+ $(add_frameworks_dep kcompletion) |
87 |
+ $(add_frameworks_dep kconfig) |
88 |
+ $(add_frameworks_dep kconfigwidgets) |
89 |
+ $(add_frameworks_dep kcoreaddons) |
90 |
+ $(add_frameworks_dep kdbusaddons) |
91 |
+ $(add_frameworks_dep kdeclarative) |
92 |
+ $(add_frameworks_dep kded) |
93 |
+ $(add_frameworks_dep kdelibs4support) |
94 |
+ $(add_frameworks_dep kemoticons) |
95 |
+ $(add_frameworks_dep kglobalaccel) |
96 |
+ $(add_frameworks_dep kguiaddons) |
97 |
+ $(add_frameworks_dep ki18n) |
98 |
+ $(add_frameworks_dep kiconthemes) |
99 |
+ $(add_frameworks_dep kio) |
100 |
+ $(add_frameworks_dep kitemmodels) |
101 |
+ $(add_frameworks_dep kitemviews) |
102 |
+ $(add_frameworks_dep kjobwidgets) |
103 |
+ $(add_frameworks_dep knewstuff) |
104 |
+ $(add_frameworks_dep knotifications) |
105 |
+ $(add_frameworks_dep knotifyconfig) |
106 |
+ $(add_frameworks_dep kparts) |
107 |
+ $(add_frameworks_dep kpeople) |
108 |
+ $(add_frameworks_dep krunner) |
109 |
+ $(add_frameworks_dep kservice) |
110 |
+ $(add_frameworks_dep kwallet) |
111 |
+ $(add_frameworks_dep kwidgetsaddons) |
112 |
+ $(add_frameworks_dep kwindowsystem) |
113 |
+ $(add_frameworks_dep kxmlgui) |
114 |
+ $(add_frameworks_dep plasma) |
115 |
+ $(add_frameworks_dep solid) |
116 |
+ $(add_frameworks_dep sonnet) |
117 |
+ $(add_plasma_dep kwin) |
118 |
+ $(add_plasma_dep plasma-workspace) |
119 |
+ $(add_qt_dep qtconcurrent) |
120 |
+ $(add_qt_dep qtdbus) |
121 |
+ $(add_qt_dep qtdeclarative) |
122 |
+ $(add_qt_dep qtgui) |
123 |
+ $(add_qt_dep qtnetwork) |
124 |
+ $(add_qt_dep qtprintsupport) |
125 |
+ $(add_qt_dep qtsql) |
126 |
+ $(add_qt_dep qtsvg) |
127 |
+ $(add_qt_dep qtwidgets) |
128 |
+ $(add_qt_dep qtx11extras) |
129 |
+ $(add_qt_dep qtxml) |
130 |
+ media-libs/phonon[qt5] |
131 |
+ x11-libs/libX11 |
132 |
+ x11-libs/libXcursor |
133 |
+ x11-libs/libXfixes |
134 |
+ x11-libs/libXi |
135 |
+ x11-libs/libxcb |
136 |
+ x11-libs/libxkbfile |
137 |
+ fontconfig? ( |
138 |
+ media-libs/fontconfig |
139 |
+ media-libs/freetype |
140 |
+ x11-libs/libXft |
141 |
+ x11-libs/xcb-util-image |
142 |
+ ) |
143 |
+ ibus? ( |
144 |
+ $(add_qt_dep qtx11extras) |
145 |
+ app-i18n/ibus |
146 |
+ dev-libs/glib:2 |
147 |
+ x11-libs/libxcb |
148 |
+ x11-libs/xcb-util-keysyms |
149 |
+ ) |
150 |
+ input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) |
151 |
+ packagekit? ( >=app-admin/packagekit-qt-0.9.6 ) |
152 |
+ pulseaudio? ( |
153 |
+ dev-libs/glib:2 |
154 |
+ media-libs/libcanberra |
155 |
+ media-sound/pulseaudio |
156 |
+ ) |
157 |
+ scim? ( app-i18n/scim ) |
158 |
+ semantic-desktop? ( $(add_frameworks_dep baloo) ) |
159 |
+" |
160 |
+RDEPEND="${COMMON_DEPEND} |
161 |
+ $(add_plasma_dep breeze) |
162 |
+ $(add_plasma_dep kde-cli-tools) |
163 |
+ $(add_plasma_dep oxygen) |
164 |
+ $(add_qt_dep qtgraphicaleffects) |
165 |
+ sys-apps/accountsservice |
166 |
+ x11-apps/setxkbmap |
167 |
+ legacy-systray? ( |
168 |
+ gtk2? ( dev-libs/libappindicator:2 ) |
169 |
+ gtk3? ( dev-libs/libappindicator:3 ) |
170 |
+ qt4? ( dev-libs/sni-qt ) |
171 |
+ ) |
172 |
+ pulseaudio? ( $(add_plasma_dep plasma-pa ) ) |
173 |
+ qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) |
174 |
+ !kde-apps/kcontrol |
175 |
+ !kde-apps/kdepasswd:4 |
176 |
+ !kde-apps/knetattach[handbook] |
177 |
+ !kde-base/plasma-desktop:4 |
178 |
+ !kde-plasma/plasma-workspace:4 |
179 |
+ !kde-plasma/solid-actions-kcm:4 |
180 |
+ !kde-plasma/systemsettings:4 |
181 |
+ !kde-misc/kcm_touchpad |
182 |
+ !kde-misc/kcm-touchpad |
183 |
+ !kde-plasma/kcm-touchpad |
184 |
+ !<kde-plasma/kdeplasma-addons-5.5.50 |
185 |
+" |
186 |
+DEPEND="${COMMON_DEPEND} |
187 |
+ dev-libs/boost |
188 |
+ x11-proto/xproto |
189 |
+ fontconfig? ( x11-libs/libXrender ) |
190 |
+ input_devices_evdev? ( x11-drivers/xf86-input-evdev ) |
191 |
+" |
192 |
+ |
193 |
+REQUIRED_USE="legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )" |
194 |
+ |
195 |
+PATCHES=( |
196 |
+ # stable branch |
197 |
+ "${FILESDIR}/${P}-hover-state.patch" |
198 |
+ "${FILESDIR}/${P}-taskman-memleak.patch" |
199 |
+ "${FILESDIR}/${P}-crashfix.patch" |
200 |
+ "${FILESDIR}/${P}-folder-view-script-execution.patch" |
201 |
+ #master |
202 |
+ "${FILESDIR}/${PN}-5.7.90-baloo-optional.patch" |
203 |
+) |
204 |
+ |
205 |
+pkg_setup() { |
206 |
+ if has_version net-im/skype && use legacy-systray && use amd64; then |
207 |
+ einfo |
208 |
+ elog "You need to install dev-libs/sni-qt[abi_x86_32] as skype is a 32-bit binary." |
209 |
+ einfo |
210 |
+ fi |
211 |
+} |
212 |
+ |
213 |
+src_configure() { |
214 |
+ local mycmakeargs=( |
215 |
+ $(cmake-utils_use_find_package fontconfig Fontconfig) |
216 |
+ $(cmake-utils_use_find_package ibus IBus) |
217 |
+ $(cmake-utils_use_find_package input_devices_evdev Evdev) |
218 |
+ $(cmake-utils_use_find_package input_devices_synaptics Synaptics) |
219 |
+ $(cmake-utils_use_find_package packagekit PackageKitQt5) |
220 |
+ $(cmake-utils_use_find_package pulseaudio PulseAudio) |
221 |
+ $(cmake-utils_use_find_package scim SCIM) |
222 |
+ $(cmake-utils_use_find_package semantic-desktop KF5Baloo) |
223 |
+ ) |
224 |
+ |
225 |
+ kde5_src_configure |
226 |
+} |