Gentoo Archives: gentoo-commits

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