1 |
commit: 570dccfb41729e25a7b7db8ed412688bda76e0b6 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 10 10:38:00 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 10 10:44:22 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570dccfb |
7 |
|
8 |
gnome-base/gnome-shell: fix crash, EAPI-7, python3.7 |
9 |
|
10 |
Refreshed patchset that contains (compared to previous): |
11 |
* a new commit from gnome-3-30 branch, which fixes some issues |
12 |
related to workspace finger gesture on wayland; |
13 |
* backport of a public API safeguard which downgrades a mysterious |
14 |
crasher (that may happen on suspend resume, or just trying to unlock) |
15 |
to an API misuse warning; |
16 |
* includes the bluetooth optionality patch in the patchset. |
17 |
|
18 |
Port to EAPI-7. |
19 |
Add python:3.7 support for the odd installed tools; not fully tested, |
20 |
as they are complicated to use and really only shell developers use |
21 |
them, but we install them for now still. |
22 |
|
23 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
24 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
25 |
|
26 |
gnome-base/gnome-shell/Manifest | 1 + |
27 |
.../gnome-shell/gnome-shell-3.30.2-r1.ebuild | 188 +++++++++++++++++++++ |
28 |
2 files changed, 189 insertions(+) |
29 |
|
30 |
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest |
31 |
index a99b75f076a..3223de5dadd 100644 |
32 |
--- a/gnome-base/gnome-shell/Manifest |
33 |
+++ b/gnome-base/gnome-shell/Manifest |
34 |
@@ -1,5 +1,6 @@ |
35 |
DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15 |
36 |
DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143 SHA512 93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed |
37 |
DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a |
38 |
+DIST gnome-shell-3.30.2-patchset-r1.tar.xz 41324 BLAKE2B 4d051a327d106e8431c7b75d56932137dd3af2694c313656bf4751a385a86ef43dd635f31902be0426899746c63f1cd1aa782e9c0827f750fe61683512fbd43c SHA512 3761688e86694be00d81eac2bcd8774d8fdff62f44cdcd26c29b9e7513d2db0edc0ba097e0fea474a232496e3f9b8797e6215a040915a0832517235b26cbc265 |
39 |
DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 61c02e5ae87ab24f30d28865f4444f20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8 SHA512 8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531 |
40 |
DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6 |
41 |
|
42 |
diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild |
43 |
new file mode 100644 |
44 |
index 00000000000..d659f15c970 |
45 |
--- /dev/null |
46 |
+++ b/gnome-base/gnome-shell/gnome-shell-3.30.2-r1.ebuild |
47 |
@@ -0,0 +1,188 @@ |
48 |
+# Copyright 1999-2019 Gentoo Authors |
49 |
+# Distributed under the terms of the GNU General Public License v2 |
50 |
+ |
51 |
+EAPI=7 |
52 |
+PYTHON_COMPAT=( python3_{5,6,7} ) |
53 |
+ |
54 |
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg |
55 |
+ |
56 |
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" |
57 |
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" |
58 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz" |
59 |
+ |
60 |
+LICENSE="GPL-2+ LGPL-2+" |
61 |
+SLOT="0" |
62 |
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager nsplugin systemd telepathy" |
63 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
64 |
+ ?? ( elogind systemd )" |
65 |
+ |
66 |
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
67 |
+ |
68 |
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> |
69 |
+# FIXME: |
70 |
+# * gstreamer support is currently automagic |
71 |
+DEPEND=" |
72 |
+ >=dev-libs/libcroco-0.6.8:0.6 |
73 |
+ >=gnome-extra/evolution-data-server-3.17.2:= |
74 |
+ >=app-crypt/gcr-3.7.5[introspection] |
75 |
+ >=gnome-base/gnome-desktop-3.7.90:3=[introspection] |
76 |
+ >=dev-libs/glib-2.57.2:2 |
77 |
+ >=dev-libs/gobject-introspection-1.49.1:= |
78 |
+ >=dev-libs/gjs-1.54.0 |
79 |
+ >=x11-libs/gtk+-3.15.0:3[introspection] |
80 |
+ nsplugin? ( >=dev-libs/json-glib-0.13.2 ) |
81 |
+ >=x11-wm/mutter-3.30.1:0/3[introspection] |
82 |
+ >=sys-auth/polkit-0.100[introspection] |
83 |
+ >=gnome-base/gsettings-desktop-schemas-3.27.90 |
84 |
+ >=x11-libs/startup-notification-0.11 |
85 |
+ >=app-i18n/ibus-1.5.2 |
86 |
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) |
87 |
+ >=media-libs/gstreamer-0.11.92:1.0 |
88 |
+ networkmanager? ( |
89 |
+ >=net-misc/networkmanager-1.10.4:=[introspection] |
90 |
+ >=app-crypt/libsecret-0.18 |
91 |
+ dev-libs/dbus-glib ) |
92 |
+ systemd? ( >=sys-apps/systemd-31 ) |
93 |
+ elogind? ( >=sys-auth/elogind-237 ) |
94 |
+ |
95 |
+ >=app-accessibility/at-spi2-atk-2.5.3 |
96 |
+ media-libs/libcanberra[gtk3] |
97 |
+ x11-libs/gdk-pixbuf:2[introspection] |
98 |
+ dev-libs/libxml2:2 |
99 |
+ x11-libs/libX11 |
100 |
+ |
101 |
+ >=media-sound/pulseaudio-2[glib] |
102 |
+ >=dev-libs/atk-2[introspection] |
103 |
+ dev-libs/libical:= |
104 |
+ >=x11-libs/libXfixes-5.0 |
105 |
+ |
106 |
+ ${PYTHON_DEPS} |
107 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
108 |
+ media-libs/mesa |
109 |
+" |
110 |
+# Runtime-only deps are probably incomplete and approximate. |
111 |
+# Introspection deps generated using: |
112 |
+# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq |
113 |
+# Each block: |
114 |
+# 1. Introspection stuff needed via imports.gi.* |
115 |
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc |
116 |
+# 3. Control shell settings |
117 |
+# 4. logind interface needed for suspending support |
118 |
+# 5. xdg-utils needed for xdg-open, used by extension tool |
119 |
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) |
120 |
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review |
121 |
+# 8. IBus is needed for nls integration |
122 |
+# 9. Optional telepathy chat integration |
123 |
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too) |
124 |
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper |
125 |
+RDEPEND="${DEPEND} |
126 |
+ >=sys-apps/accountsservice-0.6.14[introspection] |
127 |
+ app-accessibility/at-spi2-core:2[introspection] |
128 |
+ app-misc/geoclue[introspection] |
129 |
+ >=dev-libs/libgweather-3.26:2[introspection] |
130 |
+ >=sys-power/upower-0.99:=[introspection] |
131 |
+ x11-libs/pango[introspection] |
132 |
+ gnome-base/librsvg:2[introspection] |
133 |
+ |
134 |
+ >=gnome-base/gnome-session-2.91.91 |
135 |
+ >=gnome-base/gnome-settings-daemon-3.8.3 |
136 |
+ |
137 |
+ x11-misc/xdg-utils |
138 |
+ |
139 |
+ >=x11-themes/adwaita-icon-theme-3.26 |
140 |
+ |
141 |
+ networkmanager? ( |
142 |
+ net-misc/mobile-broadband-provider-info |
143 |
+ sys-libs/timezone-data ) |
144 |
+ ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) |
145 |
+ telepathy? ( |
146 |
+ >=net-im/telepathy-logger-0.2.4[introspection] |
147 |
+ >=net-libs/telepathy-glib-0.19[introspection] ) |
148 |
+ media-fonts/cantarell |
149 |
+" |
150 |
+# avoid circular dependency, see bug #546134 |
151 |
+PDEPEND=" |
152 |
+ >=gnome-base/gdm-3.5[introspection] |
153 |
+ >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] |
154 |
+ browser-extension? ( gnome-extra/chrome-gnome-shell ) |
155 |
+" |
156 |
+BDEPEND=" |
157 |
+ dev-lang/sassc |
158 |
+ dev-libs/libxslt |
159 |
+ >=dev-util/gdbus-codegen-2.45.3 |
160 |
+ dev-util/glib-utils |
161 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.17 ) |
162 |
+ >=sys-devel/gettext-0.19.8 |
163 |
+ virtual/pkgconfig |
164 |
+" |
165 |
+ |
166 |
+PATCHES=( |
167 |
+ # Patches from gnome-3-30 branch on top of 3.30.2 |
168 |
+ # Fix automagic gnome-bluetooth dep, bug #398145 |
169 |
+ "${WORKDIR}"/patches/ |
170 |
+ # Change favorites defaults, bug #479918 |
171 |
+ "${FILESDIR}"/3.28.3-defaults.patch |
172 |
+) |
173 |
+ |
174 |
+src_prepare() { |
175 |
+ xdg_src_prepare |
176 |
+ # We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins |
177 |
+ sed -e 's/mozilla/nsbrowser/' -i meson.build || die |
178 |
+ # Hack in correct python shebang |
179 |
+ sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die |
180 |
+} |
181 |
+ |
182 |
+src_configure() { |
183 |
+ local emesonargs=( |
184 |
+ $(meson_use bluetooth) |
185 |
+ $(meson_use nsplugin browser_plugin) |
186 |
+ $(meson_use gtk-doc gtk_doc) |
187 |
+ -Dman=true |
188 |
+ $(meson_use networkmanager) |
189 |
+ $(meson_use systemd) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session) |
190 |
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary |
191 |
+ ) |
192 |
+ meson_src_configure |
193 |
+} |
194 |
+ |
195 |
+src_install() { |
196 |
+ meson_src_install |
197 |
+ |
198 |
+ # Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant? |
199 |
+ pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs} |
200 |
+} |
201 |
+ |
202 |
+src_test() { |
203 |
+ virtx meson_src_test |
204 |
+} |
205 |
+ |
206 |
+pkg_postinst() { |
207 |
+ xdg_pkg_postinst |
208 |
+ gnome2_schemas_update |
209 |
+ |
210 |
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
211 |
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
212 |
+ ewarn "To make use of GNOME Shell's built-in screen recording utility," |
213 |
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
214 |
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
215 |
+ ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." |
216 |
+ fi |
217 |
+ |
218 |
+ if ! has_version "media-libs/mesa[llvm]"; then |
219 |
+ elog "llvmpipe is used as fallback when no 3D acceleration" |
220 |
+ elog "is available. You will need to enable llvm USE for" |
221 |
+ elog "media-libs/mesa if you do not have hardware 3D setup." |
222 |
+ fi |
223 |
+ |
224 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=563084 |
225 |
+ # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? |
226 |
+ if has_version "x11-drivers/nvidia-drivers[-kms]"; then |
227 |
+ ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," |
228 |
+ ewarn "otherwise Gnome will fail to start" |
229 |
+ fi |
230 |
+} |
231 |
+ |
232 |
+pkg_postrm() { |
233 |
+ xdg_pkg_postrm |
234 |
+ gnome2_schemas_update |
235 |
+} |