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