1 |
commit: 84e00ceb0272cbc8da051a00a00b9cf531b6a10e |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 3 20:19:16 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 3 20:55:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e00ceb |
7 |
|
8 |
gnome-base/gnome-shell: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
.../gnome-shell/files/3.22.3-CVE-2017-8288.patch | 45 ----- |
13 |
.../gnome-shell/gnome-shell-3.22.3-r2.ebuild | 196 --------------------- |
14 |
2 files changed, 241 deletions(-) |
15 |
|
16 |
diff --git a/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch b/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch |
17 |
deleted file mode 100644 |
18 |
index f9c74d62fdd..00000000000 |
19 |
--- a/gnome-base/gnome-shell/files/3.22.3-CVE-2017-8288.patch |
20 |
+++ /dev/null |
21 |
@@ -1,45 +0,0 @@ |
22 |
-From 560e976ee9c59d75907b5ef6ed2bc336719e37d3 Mon Sep 17 00:00:00 2001 |
23 |
-From: Emilio Pozuelo Monfort <pochu27@×××××.com> |
24 |
-Date: Tue, 25 Apr 2017 17:27:42 +0200 |
25 |
-Subject: [PATCH] extensionSystem: handle reloading broken extensions |
26 |
- |
27 |
-Some extensions out there may fail to reload. When that happens, |
28 |
-we need to catch any exceptions so that we don't leave things in |
29 |
-a broken state that could lead to leaving extensions enabled in |
30 |
-the screen shield. |
31 |
- |
32 |
-https://bugzilla.gnome.org/show_bug.cgi?id=781728 |
33 |
---- |
34 |
- js/ui/extensionSystem.js | 12 ++++++++++-- |
35 |
- 1 file changed, 10 insertions(+), 2 deletions(-) |
36 |
- |
37 |
-diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js |
38 |
-index ba33222..1feaa2f 100644 |
39 |
---- a/js/ui/extensionSystem.js |
40 |
-+++ b/js/ui/extensionSystem.js |
41 |
-@@ -276,12 +276,20 @@ function _onVersionValidationChanged() { |
42 |
- // temporarily disable them all |
43 |
- enabledExtensions = []; |
44 |
- for (let uuid in ExtensionUtils.extensions) |
45 |
-- reloadExtension(ExtensionUtils.extensions[uuid]); |
46 |
-+ try { |
47 |
-+ reloadExtension(ExtensionUtils.extensions[uuid]); |
48 |
-+ } catch(e) { |
49 |
-+ logExtensionError(uuid, e); |
50 |
-+ } |
51 |
- enabledExtensions = getEnabledExtensions(); |
52 |
- |
53 |
- if (Main.sessionMode.allowExtensions) { |
54 |
- enabledExtensions.forEach(function(uuid) { |
55 |
-- enableExtension(uuid); |
56 |
-+ try { |
57 |
-+ enableExtension(uuid); |
58 |
-+ } catch(e) { |
59 |
-+ logExtensionError(uuid, e); |
60 |
-+ } |
61 |
- }); |
62 |
- } |
63 |
- } |
64 |
--- |
65 |
-2.10.1 |
66 |
- |
67 |
|
68 |
diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild |
69 |
deleted file mode 100644 |
70 |
index 66d73e5efc0..00000000000 |
71 |
--- a/gnome-base/gnome-shell/gnome-shell-3.22.3-r2.ebuild |
72 |
+++ /dev/null |
73 |
@@ -1,196 +0,0 @@ |
74 |
-# Copyright 1999-2017 Gentoo Foundation |
75 |
-# Distributed under the terms of the GNU General Public License v2 |
76 |
- |
77 |
-EAPI=6 |
78 |
-GNOME2_LA_PUNT="yes" |
79 |
-GNOME2_EAUTORECONF="yes" |
80 |
-PYTHON_COMPAT=( python{3_4,3_5} ) |
81 |
- |
82 |
-inherit gnome2 multilib pax-utils python-r1 systemd |
83 |
- |
84 |
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" |
85 |
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" |
86 |
- |
87 |
-LICENSE="GPL-2+ LGPL-2+" |
88 |
-SLOT="0" |
89 |
-IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force" |
90 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
91 |
- |
92 |
-KEYWORDS="amd64 ~ia64 x86" |
93 |
- |
94 |
-# libXfixes-5.0 needed for pointer barriers |
95 |
-# FIXME: |
96 |
-# * gstreamer support is currently automagic |
97 |
-COMMON_DEPEND=" |
98 |
- >=app-accessibility/at-spi2-atk-2.5.3 |
99 |
- >=dev-libs/atk-2[introspection] |
100 |
- >=app-crypt/gcr-3.7.5[introspection] |
101 |
- >=dev-libs/glib-2.45.3:2[dbus] |
102 |
- >=dev-libs/gjs-1.39 |
103 |
- >=dev-libs/gobject-introspection-1.49.1:= |
104 |
- dev-libs/libical:= |
105 |
- >=x11-libs/gtk+-3.15.0:3[introspection] |
106 |
- >=dev-libs/libcroco-0.6.8:0.6 |
107 |
- >=gnome-base/gnome-desktop-3.7.90:3=[introspection] |
108 |
- >=gnome-base/gsettings-desktop-schemas-3.21.3 |
109 |
- >=gnome-extra/evolution-data-server-3.17.2:= |
110 |
- >=media-libs/gstreamer-0.11.92:1.0 |
111 |
- >=net-im/telepathy-logger-0.2.4[introspection] |
112 |
- >=net-libs/telepathy-glib-0.19[introspection] |
113 |
- >=sys-auth/polkit-0.100[introspection] |
114 |
- >=x11-libs/libXfixes-5.0 |
115 |
- x11-libs/libXtst |
116 |
- >=x11-wm/mutter-3.22.1[introspection] |
117 |
- >=x11-libs/startup-notification-0.11 |
118 |
- |
119 |
- ${PYTHON_DEPS} |
120 |
- dev-python/pygobject:3[${PYTHON_USEDEP}] |
121 |
- |
122 |
- dev-libs/dbus-glib |
123 |
- dev-libs/libxml2:2 |
124 |
- media-libs/libcanberra[gtk3] |
125 |
- media-libs/mesa |
126 |
- >=media-sound/pulseaudio-2 |
127 |
- >=net-libs/libsoup-2.40:2.4[introspection] |
128 |
- x11-libs/libX11 |
129 |
- x11-libs/gdk-pixbuf:2[introspection] |
130 |
- |
131 |
- x11-apps/mesa-progs |
132 |
- |
133 |
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) |
134 |
- networkmanager? ( |
135 |
- app-crypt/libsecret |
136 |
- >=gnome-extra/nm-applet-0.9.8 |
137 |
- >=net-misc/networkmanager-0.9.8:=[introspection] ) |
138 |
- nsplugin? ( >=dev-libs/json-glib-0.13.2 ) |
139 |
-" |
140 |
-# Runtime-only deps are probably incomplete and approximate. |
141 |
-# Introspection deps generated using: |
142 |
-# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq |
143 |
-# Each block: |
144 |
-# 1. Introspection stuff needed via imports.gi.* |
145 |
-# 2. gnome-session is needed for gnome-session-quit |
146 |
-# 3. Control shell settings |
147 |
-# 4. Systemd needed for suspending support |
148 |
-# 5. xdg-utils needed for xdg-open, used by extension tool |
149 |
-# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows |
150 |
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c |
151 |
-# 8. IBus is needed for nls integration |
152 |
-RDEPEND="${COMMON_DEPEND} |
153 |
- app-accessibility/at-spi2-core:2[introspection] |
154 |
- >=app-accessibility/caribou-0.4.8 |
155 |
- dev-libs/libgweather:2[introspection] |
156 |
- >=sys-apps/accountsservice-0.6.14[introspection] |
157 |
- >=sys-power/upower-0.99:=[introspection] |
158 |
- x11-libs/pango[introspection] |
159 |
- |
160 |
- >=gnome-base/gnome-session-2.91.91 |
161 |
- >=gnome-base/gnome-settings-daemon-3.8.3 |
162 |
- |
163 |
- !openrc-force? ( >=sys-apps/systemd-31 ) |
164 |
- |
165 |
- x11-misc/xdg-utils |
166 |
- |
167 |
- media-fonts/dejavu |
168 |
- >=x11-themes/adwaita-icon-theme-3.19.90 |
169 |
- |
170 |
- networkmanager? ( |
171 |
- net-misc/mobile-broadband-provider-info |
172 |
- sys-libs/timezone-data ) |
173 |
- ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) |
174 |
-" |
175 |
-# avoid circular dependency, see bug #546134 |
176 |
-PDEPEND=" |
177 |
- >=gnome-base/gdm-3.5[introspection] |
178 |
- >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] |
179 |
- browser-extension? ( gnome-extra/chrome-gnome-shell ) |
180 |
-" |
181 |
-DEPEND="${COMMON_DEPEND} |
182 |
- dev-libs/libxslt |
183 |
- >=dev-util/gdbus-codegen-2.45.3 |
184 |
- >=dev-util/gtk-doc-am-1.17 |
185 |
- gnome-base/gnome-common |
186 |
- sys-devel/autoconf-archive |
187 |
- >=sys-devel/gettext-0.19.6 |
188 |
- virtual/pkgconfig |
189 |
-" |
190 |
- |
191 |
-PATCHES=( |
192 |
- # Change favorites defaults, bug #479918 |
193 |
- "${FILESDIR}"/${PN}-3.22.0-defaults.patch |
194 |
- # Fix automagic gnome-bluetooth dep, bug #398145 |
195 |
- "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch |
196 |
- # Add missing path to libmutter-clutter when building .gir, bug #597842 |
197 |
- "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch |
198 |
- # Little bug when user has toggled version validation in the session, bug #616698 |
199 |
- "${FILESDIR}"/${PV}-CVE-2017-8288.patch |
200 |
-) |
201 |
- |
202 |
-src_configure() { |
203 |
- # Do not error out on warnings |
204 |
- gnome2_src_configure \ |
205 |
- --enable-man \ |
206 |
- $(use_enable !openrc-force systemd) \ |
207 |
- $(use_with bluetooth) \ |
208 |
- $(use_enable networkmanager) \ |
209 |
- $(use_enable nsplugin browser-plugin) \ |
210 |
- BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins |
211 |
-} |
212 |
- |
213 |
-src_install() { |
214 |
- gnome2_src_install |
215 |
- python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" |
216 |
- python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" |
217 |
- |
218 |
- # Required for gnome-shell on hardened/PaX, bug #398941 |
219 |
- # Future-proof for >=spidermonkey-1.8.7 following polkit's example |
220 |
- if has_version '<dev-lang/spidermonkey-1.8.7'; then |
221 |
- pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs} |
222 |
- elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then |
223 |
- pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} |
224 |
- # Required for gnome-shell on hardened/PaX #457146 and #457194 |
225 |
- # PaX EMUTRAMP need to be on |
226 |
- elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then |
227 |
- pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs} |
228 |
- else |
229 |
- pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} |
230 |
- fi |
231 |
-} |
232 |
- |
233 |
-pkg_postinst() { |
234 |
- gnome2_pkg_postinst |
235 |
- |
236 |
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
237 |
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
238 |
- ewarn "To make use of GNOME Shell's built-in screen recording utility," |
239 |
- ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
240 |
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
241 |
- ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." |
242 |
- fi |
243 |
- |
244 |
- if ! has_version "media-libs/mesa[llvm]"; then |
245 |
- elog "llvmpipe is used as fallback when no 3D acceleration" |
246 |
- elog "is available. You will need to enable llvm USE for" |
247 |
- elog "media-libs/mesa." |
248 |
- fi |
249 |
- |
250 |
- # https://bugs.gentoo.org/show_bug.cgi?id=563084 |
251 |
- if has_version "x11-drivers/nvidia-drivers[-kms]"; then |
252 |
- ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," |
253 |
- ewarn "otherwise Gnome will fail to start" |
254 |
- fi |
255 |
- |
256 |
- if ! systemd_is_booted; then |
257 |
- ewarn "${PN} needs Systemd to be *running* for working" |
258 |
- ewarn "properly. Please follow this guide to migrate:" |
259 |
- ewarn "https://wiki.gentoo.org/wiki/Systemd" |
260 |
- fi |
261 |
- |
262 |
- if use openrc-force; then |
263 |
- ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," |
264 |
- ewarn "this can lead to unexpected problems and is not supported neither by" |
265 |
- ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," |
266 |
- ewarn "you will need to disable this USE flag system wide and retest before" |
267 |
- ewarn "opening any bug report." |
268 |
- fi |
269 |
-} |