1 |
commit: d96bf40be72f7829efb4c7c4d96d7ab91a2de3f3 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 27 23:32:08 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 23:57:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d96bf40b |
7 |
|
8 |
gnome-base/gnome-shell: bump to 3.28.3 |
9 |
|
10 |
Includes a huge patchset from upstream gnome-3-28 branch. |
11 |
Now provides its own onscreen keyboard instead of using caribou. |
12 |
Requires sassc at build time for CSS generation. |
13 |
Doesn't need deprecated networkmanager libraries from nm-applet |
14 |
anymore. |
15 |
|
16 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
17 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
18 |
|
19 |
gnome-base/gnome-shell/Manifest | 2 + |
20 |
gnome-base/gnome-shell/files/3.28.3-defaults.patch | 28 +++ |
21 |
.../files/3.28.3-optional-bluetooth.patch | 59 +++++++ |
22 |
gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild | 187 +++++++++++++++++++++ |
23 |
4 files changed, 276 insertions(+) |
24 |
|
25 |
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest |
26 |
index 9dae1ae196c..553301215dd 100644 |
27 |
--- a/gnome-base/gnome-shell/Manifest |
28 |
+++ b/gnome-base/gnome-shell/Manifest |
29 |
@@ -1,3 +1,5 @@ |
30 |
DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15 |
31 |
DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143 SHA512 93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed |
32 |
DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a |
33 |
+DIST gnome-shell-3.28.3-patchset.tar.xz 30820 BLAKE2B 3402a1c455a5e9d028f6c15ea40db94afb84576643b9bfe9e973a7f375d9f0a22003eab3ccabec0b4b31c31f70ef02ca055c0f62a5c0392529fc375f6cef7029 SHA512 a1da84374dd97bff2546d6ddc5656bade69711d05b4b4f4283df66ebbac566767a509dcbd6db52c28a1915cf873c99b81029128cb2a2b63c325dc3e3340fffb4 |
34 |
+DIST gnome-shell-3.28.3.tar.xz 1433388 BLAKE2B 656e2edabef363d779fd339b7158ad3461a05452a2fdad611889d19f272cd98dfbbb39871d10631326b83108678f8a7245c349583eb257e9d7e4827078134ade SHA512 3550a9e59101a96cf04e4a4bc183ac9a447baa72d74e57c3f438764741b4365f8848895c1eb2c4d0af5c7936e38eb8971ef578bbee315e78b9fdcbbe49fdc1e8 |
35 |
|
36 |
diff --git a/gnome-base/gnome-shell/files/3.28.3-defaults.patch b/gnome-base/gnome-shell/files/3.28.3-defaults.patch |
37 |
new file mode 100644 |
38 |
index 00000000000..a6f583144fc |
39 |
--- /dev/null |
40 |
+++ b/gnome-base/gnome-shell/files/3.28.3-defaults.patch |
41 |
@@ -0,0 +1,28 @@ |
42 |
+From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001 |
43 |
+From: Gilles Dartiguelongue <eva@g.o> |
44 |
+Date: Tue, 10 Dec 2013 23:33:51 +0100 |
45 |
+Subject: [PATCH 1/2] Alter list of default applications |
46 |
+ |
47 |
+Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
48 |
+[Updated to include desktop file renames to reverse DNS] |
49 |
+Signed-off-by: Mart Raudsepp <leio@g.o> |
50 |
+--- |
51 |
+ data/org.gnome.shell.gschema.xml.in | 2 +- |
52 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
53 |
+ |
54 |
+diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in |
55 |
+index c1e6b21..368c654 100644 |
56 |
+--- a/data/org.gnome.shell.gschema.xml.in |
57 |
++++ b/data/org.gnome.shell.gschema.xml.in |
58 |
+@@ -31,7 +31,7 @@ |
59 |
+ </description> |
60 |
+ </key> |
61 |
+ <key name="favorite-apps" type="as"> |
62 |
+- <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> |
63 |
++ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'org.gnome.Evolution.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'org.gnome.Shotwell', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default> |
64 |
+ <summary>List of desktop file IDs for favorite applications</summary> |
65 |
+ <description> |
66 |
+ The applications corresponding to these identifiers |
67 |
+-- |
68 |
+2.10.1 |
69 |
+ |
70 |
|
71 |
diff --git a/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch |
72 |
new file mode 100644 |
73 |
index 00000000000..3138c6d2b73 |
74 |
--- /dev/null |
75 |
+++ b/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch |
76 |
@@ -0,0 +1,59 @@ |
77 |
+From 26dbbd15fabd3c35135105720dc821edccb128fa Mon Sep 17 00:00:00 2001 |
78 |
+From: Mart Raudsepp <leio@g.o> |
79 |
+Date: Thu, 28 Feb 2019 00:50:19 +0200 |
80 |
+Subject: [PATCH] build: Make bluetooth support optional |
81 |
+ |
82 |
+--- |
83 |
+ js/misc/meson.build | 2 +- |
84 |
+ meson.build | 7 ++++++- |
85 |
+ meson_options.txt | 6 ++++++ |
86 |
+ 3 files changed, 13 insertions(+), 2 deletions(-) |
87 |
+ |
88 |
+diff --git a/js/misc/meson.build b/js/misc/meson.build |
89 |
+index 5a4871762..3c5e02368 100644 |
90 |
+--- a/js/misc/meson.build |
91 |
++++ b/js/misc/meson.build |
92 |
+@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name()) |
93 |
+ jsconf.set('PACKAGE_VERSION', meson.project_version()) |
94 |
+ jsconf.set('GETTEXT_PACKAGE', meson.project_name()) |
95 |
+ jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version) |
96 |
+-jsconf.set10('HAVE_BLUETOOTH', bt_dep.found()) |
97 |
++jsconf.set10('HAVE_BLUETOOTH', have_bluetooth) |
98 |
+ jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager) |
99 |
+ jsconf.set('datadir', datadir) |
100 |
+ jsconf.set('libexecdir', libexecdir) |
101 |
+diff --git a/meson.build b/meson.build |
102 |
+index f38798caf..e1bcd1892 100644 |
103 |
+--- a/meson.build |
104 |
++++ b/meson.build |
105 |
+@@ -92,7 +92,12 @@ ibus_dep = dependency('ibus-1.0', version: ibus_req) |
106 |
+ x11_dep = dependency('x11') |
107 |
+ schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req) |
108 |
+ |
109 |
+-bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false) |
110 |
++if get_option('bluetooth') |
111 |
++ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req) |
112 |
++ have_bluetooth = true |
113 |
++else |
114 |
++ have_bluetooth = false |
115 |
++endif |
116 |
+ gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false) |
117 |
+ gst_base_dep = dependency('gstreamer-base-1.0', required: false) |
118 |
+ |
119 |
+diff --git a/meson_options.txt b/meson_options.txt |
120 |
+index 65188c7ff..b6d49dfb5 100644 |
121 |
+--- a/meson_options.txt |
122 |
++++ b/meson_options.txt |
123 |
+@@ -1,3 +1,9 @@ |
124 |
++option('bluetooth', |
125 |
++ type: 'boolean', |
126 |
++ value: true, |
127 |
++ description: 'Enable bluetooth support' |
128 |
++) |
129 |
++ |
130 |
+ option('browser_plugin', |
131 |
+ type: 'boolean', |
132 |
+ value: true, |
133 |
+-- |
134 |
+2.17.0 |
135 |
+ |
136 |
|
137 |
diff --git a/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild |
138 |
new file mode 100644 |
139 |
index 00000000000..d49823e4bdf |
140 |
--- /dev/null |
141 |
+++ b/gnome-base/gnome-shell/gnome-shell-3.28.3.ebuild |
142 |
@@ -0,0 +1,187 @@ |
143 |
+# Copyright 1999-2019 Gentoo Authors |
144 |
+# Distributed under the terms of the GNU General Public License v2 |
145 |
+ |
146 |
+EAPI=6 |
147 |
+PYTHON_COMPAT=( python3_{4,5,6} ) |
148 |
+ |
149 |
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg |
150 |
+ |
151 |
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" |
152 |
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" |
153 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
154 |
+ |
155 |
+LICENSE="GPL-2+ LGPL-2+" |
156 |
+SLOT="0" |
157 |
+IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy" |
158 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
159 |
+ ?? ( elogind systemd )" |
160 |
+ |
161 |
+KEYWORDS="~amd64 ~arm ~x86" |
162 |
+ |
163 |
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h> |
164 |
+# FIXME: |
165 |
+# * gstreamer support is currently automagic |
166 |
+COMMON_DEPEND=" |
167 |
+ >=dev-libs/libcroco-0.6.8:0.6 |
168 |
+ >=gnome-extra/evolution-data-server-3.17.2:= |
169 |
+ >=app-crypt/gcr-3.7.5[introspection] |
170 |
+ >=gnome-base/gnome-desktop-3.7.90:3=[introspection] |
171 |
+ >=dev-libs/glib-2.56.0:2 |
172 |
+ >=dev-libs/gobject-introspection-1.49.1:= |
173 |
+ >=dev-libs/gjs-1.47.0 |
174 |
+ >=x11-libs/gtk+-3.15.0:3[introspection] |
175 |
+ nsplugin? ( >=dev-libs/json-glib-0.13.2 ) |
176 |
+ >=x11-wm/mutter-3.28.0:0/2[introspection] |
177 |
+ >=sys-auth/polkit-0.100[introspection] |
178 |
+ >=gnome-base/gsettings-desktop-schemas-3.21.3 |
179 |
+ >=x11-libs/startup-notification-0.11 |
180 |
+ >=app-i18n/ibus-1.5.2 |
181 |
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) |
182 |
+ >=media-libs/gstreamer-0.11.92:1.0 |
183 |
+ networkmanager? ( |
184 |
+ >=net-misc/networkmanager-0.9.8:=[introspection] |
185 |
+ >=app-crypt/libsecret-0.18 |
186 |
+ dev-libs/dbus-glib ) |
187 |
+ systemd? ( >=sys-apps/systemd-31 ) |
188 |
+ elogind? ( >=sys-auth/elogind-237 ) |
189 |
+ |
190 |
+ >=app-accessibility/at-spi2-atk-2.5.3 |
191 |
+ media-libs/libcanberra[gtk3] |
192 |
+ x11-libs/gdk-pixbuf:2[introspection] |
193 |
+ dev-libs/libxml2:2 |
194 |
+ >=net-libs/libsoup-2.40:2.4[introspection] |
195 |
+ x11-libs/libX11 |
196 |
+ |
197 |
+ >=media-sound/pulseaudio-2[glib] |
198 |
+ >=dev-libs/atk-2[introspection] |
199 |
+ dev-libs/libical:= |
200 |
+ >=x11-libs/libXfixes-5.0 |
201 |
+ |
202 |
+ ${PYTHON_DEPS} |
203 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
204 |
+ media-libs/mesa |
205 |
+" |
206 |
+# Runtime-only deps are probably incomplete and approximate. |
207 |
+# Introspection deps generated using: |
208 |
+# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq |
209 |
+# Each block: |
210 |
+# 1. Introspection stuff needed via imports.gi.* |
211 |
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc |
212 |
+# 3. Control shell settings |
213 |
+# 4. logind interface needed for suspending support |
214 |
+# 5. xdg-utils needed for xdg-open, used by extension tool |
215 |
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+) |
216 |
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review |
217 |
+# 8. IBus is needed for nls integration |
218 |
+# 9. Optional telepathy chat integration |
219 |
+# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper |
220 |
+RDEPEND="${COMMON_DEPEND} |
221 |
+ >=sys-apps/accountsservice-0.6.14[introspection] |
222 |
+ app-accessibility/at-spi2-core:2[introspection] |
223 |
+ app-misc/geoclue[introspection] |
224 |
+ >=dev-libs/libgweather-3.26:2[introspection] |
225 |
+ >=sys-power/upower-0.99:=[introspection] |
226 |
+ x11-libs/pango[introspection] |
227 |
+ gnome-base/librsvg:2[introspection] |
228 |
+ |
229 |
+ >=gnome-base/gnome-session-2.91.91 |
230 |
+ >=gnome-base/gnome-settings-daemon-3.8.3 |
231 |
+ |
232 |
+ x11-misc/xdg-utils |
233 |
+ |
234 |
+ >=x11-themes/adwaita-icon-theme-3.26 |
235 |
+ |
236 |
+ networkmanager? ( |
237 |
+ net-misc/mobile-broadband-provider-info |
238 |
+ sys-libs/timezone-data ) |
239 |
+ ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) |
240 |
+ telepathy? ( |
241 |
+ >=net-im/telepathy-logger-0.2.4[introspection] |
242 |
+ >=net-libs/telepathy-glib-0.19[introspection] ) |
243 |
+" |
244 |
+# avoid circular dependency, see bug #546134 |
245 |
+PDEPEND=" |
246 |
+ >=gnome-base/gdm-3.5[introspection] |
247 |
+ >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] |
248 |
+ browser-extension? ( gnome-extra/chrome-gnome-shell ) |
249 |
+" |
250 |
+DEPEND="${COMMON_DEPEND} |
251 |
+ dev-lang/sassc |
252 |
+ dev-libs/libxslt |
253 |
+ >=dev-util/gdbus-codegen-2.45.3 |
254 |
+ dev-util/glib-utils |
255 |
+ >=sys-devel/gettext-0.19.8 |
256 |
+ virtual/pkgconfig |
257 |
+" #gtk-doc? ( >=dev-util/gtk-doc-1.17 ) |
258 |
+ |
259 |
+PATCHES=( |
260 |
+ # Patches from gnome-3-26 branch on top of 3.26.2 |
261 |
+ "${WORKDIR}"/patches/ |
262 |
+ # Change favorites defaults, bug #479918 |
263 |
+ "${FILESDIR}"/${PV}-defaults.patch |
264 |
+ # Fix automagic gnome-bluetooth dep, bug #398145 |
265 |
+ "${FILESDIR}"/${PV}-optional-bluetooth.patch |
266 |
+) |
267 |
+ |
268 |
+src_prepare() { |
269 |
+ xdg_src_prepare |
270 |
+ # We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins |
271 |
+ sed -e 's/mozilla/nsbrowser/' -i meson.build || die |
272 |
+ # Hack in correct python shebang |
273 |
+ sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die |
274 |
+} |
275 |
+ |
276 |
+src_configure() { |
277 |
+ local emesonargs=( |
278 |
+ $(meson_use bluetooth) |
279 |
+ $(meson_use nsplugin browser_plugin) |
280 |
+ #$(meson_use gtk-doc gtk_doc) # fails in gtkdoc-scangobj call with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer python-based gtk-doc to work |
281 |
+ -Dman=true |
282 |
+ $(meson_use networkmanager) |
283 |
+ $(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) |
284 |
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary |
285 |
+ ) |
286 |
+ meson_src_configure |
287 |
+} |
288 |
+ |
289 |
+src_install() { |
290 |
+ meson_src_install |
291 |
+ |
292 |
+ # Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant? |
293 |
+ pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} |
294 |
+} |
295 |
+ |
296 |
+src_test() { |
297 |
+ virtx meson_src_test |
298 |
+} |
299 |
+ |
300 |
+pkg_postinst() { |
301 |
+ xdg_pkg_postinst |
302 |
+ gnome2_schemas_update |
303 |
+ |
304 |
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \ |
305 |
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then |
306 |
+ ewarn "To make use of GNOME Shell's built-in screen recording utility," |
307 |
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0" |
308 |
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" |
309 |
+ ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." |
310 |
+ fi |
311 |
+ |
312 |
+ if ! has_version "media-libs/mesa[llvm]"; then |
313 |
+ elog "llvmpipe is used as fallback when no 3D acceleration" |
314 |
+ elog "is available. You will need to enable llvm USE for" |
315 |
+ elog "media-libs/mesa if you do not have hardware 3D setup." |
316 |
+ fi |
317 |
+ |
318 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=563084 |
319 |
+ # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)? |
320 |
+ if has_version "x11-drivers/nvidia-drivers[-kms]"; then |
321 |
+ ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," |
322 |
+ ewarn "otherwise Gnome will fail to start" |
323 |
+ fi |
324 |
+} |
325 |
+ |
326 |
+pkg_postrm() { |
327 |
+ xdg_pkg_postrm |
328 |
+ gnome2_schemas_update |
329 |
+} |