commit: b0c1e6aee2c4028333d1afbfddef567f11d9bbd2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Fri Nov 11 23:58:44 2016 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sat Nov 12 00:33:54 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c1e6ae
gnome-base/gnome-shell: cleanup old revisions Package-Manager: portage-2.3.2 gnome-base/gnome-shell/Manifest | 3 - .../files/gnome-shell-3.14.0-bluetooth-gold.patch | 31 --- .../files/gnome-shell-3.20.2-st-nvidia.patch | 121 ----------- gnome-base/gnome-shell/gnome-shell-3.18.5.ebuild | 219 -------------------- .../gnome-shell/gnome-shell-3.20.2-r1.ebuild | 221 --------------------- gnome-base/gnome-shell/gnome-shell-3.20.3.ebuild | 218 -------------------- 6 files changed, 813 deletions(-) diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 34d028f..deb334e 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,5 +1,2 @@ -DIST gnome-shell-3.18.5.tar.xz 1591860 SHA256 6fc9cd8b43b1ca0669e1c5a9de092a67eea648e38585f0cdb960f08a16c6cb20 SHA512 0539e60afc5070b5ccc5f987411147f7dfd5a0be06cf63876259ae6a90762888d55304158fd888fd94fd2837aac6995aa0c8573391139b129b35393b19aecaa9 WHIRLPOOL 7a8dce9fa110bd6cf3400adc8a1b30e1ab50e7d46676ccf0f84ac72cba0c6a6eb1e01a3a531e1f524afdeeb2b9e035ba0fa52197b9c66c018feed71b5e8502e2 -DIST gnome-shell-3.20.2.tar.xz 1607440 SHA256 eaff6b177cc5bab16b252c45393a6c9305ad3837a288e738388c7b4d4bae13cd SHA512 9e5bb79cd646b10d1acbd3ab92d57c76bb8efd4df2be9103a19af0db58e9fc9e101d3e1f17d0110c62e036163a7a63621492c3c6eb5d74ca99efa27bfff00b35 WHIRLPOOL 7872976c985d24dd310e01da5cae3281ee9128293cd879456b87850c1e73922856ceaea8decf07bd467415ff744761aa16ea410ebad97644e8816280d5220157 -DIST gnome-shell-3.20.3.tar.xz 1607512 SHA256 b23fd558623bfdc726066be3f47bb5fb8ed9c0ad980a95d6afc6397b6d41171e SHA512 6ad5ede00b475db1951ef354df2515f482850f724f15a02dc0d16f0d6ba57302bb5d38ba10d7d1853581e44ca19c2e047fc9822f0909614ea5aedab05ac2df52 WHIRLPOOL baa77a9fdc64205c424e69716edc11b353906a449dcb024deffe3eced34638fb4e41d6db394d8cc64827e2c53f5d103892f1c1d0be15c4f63635dc9c321b1dca DIST gnome-shell-3.20.4.tar.xz 1662400 SHA256 0c13eba5ecd3b516538815ab33765ae04bd6faf1549407e81f3bf17b08f2a94d SHA512 40622be949b7d331073982f70ff8ae9b80005e1bf9f5251f0afcd10e564dd48c1d79ae2d874015794c7f99411befd4fc4f586d87a752148aa6097825b1bf931f WHIRLPOOL 226fb3adca9d4aef97bee50d6678c360cf74727a47c9018a16cfbe0f5d6ec32d2282a7965332021643392c1fbcb415a715a41a761d5998f82268d318c40b1942 DIST gnome-shell-3.22.1.tar.xz 1947140 SHA256 ca9492fae6c647e6bf98624a7cef6e4776894e4888f54b63e60b672b754fb217 SHA512 7ed363f1019affce18b94eb3faee56ade1a570e43f2601305bdee2587733597a770fb239c65fa4d584e5f1839c2eda697101b3d5109f94b484d3fc78d42653fb WHIRLPOOL 51394bec90b7027b2037b9411515ff1748e9bd81d17b0664ee1411055ce3422899449ab4fe349fd5e93eab99838eb9b232d63910788f6e1e01ba6b83cc3d4f85 diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch b/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch deleted file mode 100644 index cc2b2e6..00000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6b43368c9b10ba112e4272f66c507a0da9cf7e13 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetrom...@gentoo.org> -Date: Sat, 15 Mar 2014 17:48:41 -0400 -Subject: [PATCH 3/3] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for - ld.gold - -For ld.gold, adding BLUETOOTH_LIBS to gnome_shell_LDADD has no effect: -the libgnome-bluetooth-applet must be linked to the binary that actually -uses a function from libgnome-bluetooth-applet, i.e. to libgnome-shell. - -https://bugzilla.gnome.org/show_bug.cgi?id=726435 ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index a73eaae..c8fd46f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -315,7 +315,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd) - libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags) - - libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags) --libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) libgnome-shell-base.la -+libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) $(BLUETOOTH_LIBS) libgnome-shell-base.la - libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags) - - ShellMenu-0.1.gir: libgnome-shell-menu.la --- -2.1.2 - diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch deleted file mode 100644 index 63df248..00000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001 -From: Martin Szulecki <martin.szule...@libimobiledevice.org> -Date: Tue, 17 May 2016 15:00:04 +0200 -Subject: [PATCH] st: Init framebuffer early to fix gnome-shell crash on NVIDIA - drivers - -Checking offscreen for COGL_INVALID_HANDLE is not sufficient, -as cogl_offscreen_new_with_texture doesn't initialize framebuffer -objects but lets Cogl solve this the lazy way. -cogl_offscreen_new_with_texture will never return COGL_INVALID_HANDLE -anyways. - -https://bugzilla.gnome.org/show_bug.cgi?id=764898 ---- - src/st/st-theme-node-drawing.c | 18 ++++++++++++------ - src/st/st-theme-node-transition.c | 25 ++++++++++++++++++++----- - 2 files changed, 32 insertions(+), 11 deletions(-) - -diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c -index 85feb20..8942966 100644 ---- a/src/st/st-theme-node-drawing.c -+++ b/src/st/st-theme-node-drawing.c -@@ -2224,6 +2224,7 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state) - int max_borders[4]; - int center_radius, corner_id; - CoglHandle buffer, offscreen = COGL_INVALID_HANDLE; -+ CoglError *error = NULL; - - /* Get infos from the node */ - if (state->alloc_width < node->box_shadow_min_width || -@@ -2264,10 +2265,12 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state) - state->box_shadow_height, - COGL_TEXTURE_NO_SLICING, - COGL_PIXEL_FORMAT_ANY); -- if (buffer != COGL_INVALID_HANDLE) -- offscreen = cogl_offscreen_new_with_texture (buffer); -+ if (buffer == NULL) -+ return; - -- if (offscreen != COGL_INVALID_HANDLE) -+ offscreen = cogl_offscreen_new_with_texture (buffer); -+ -+ if (cogl_framebuffer_allocate (COGL_FRAMEBUFFER (offscreen), &error)) - { - ClutterActorBox box = { 0, 0, state->box_shadow_width, state->box_shadow_height}; - -@@ -2277,14 +2280,17 @@ st_theme_node_prerender_shadow (StThemeNodePaintState *state) - cogl_framebuffer_clear4f (offscreen, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 0); - - st_theme_node_paint_borders (state, offscreen, &box, 0xFF); -- cogl_handle_unref (offscreen); - - state->box_shadow_pipeline = _st_create_shadow_pipeline (st_theme_node_get_box_shadow (node), - buffer); - } -+ else -+ { -+ cogl_error_free (error); -+ } - -- if (buffer != COGL_INVALID_HANDLE) -- cogl_handle_unref (buffer); -+ cogl_handle_unref (offscreen); -+ cogl_handle_unref (buffer); - } - - static void -diff --git a/src/st/st-theme-node-transition.c b/src/st/st-theme-node-transition.c -index 1eef17b..afde977 100644 ---- a/src/st/st-theme-node-transition.c -+++ b/src/st/st-theme-node-transition.c -@@ -241,6 +241,7 @@ setup_framebuffers (StThemeNodeTransition *transition, - { - StThemeNodeTransitionPrivate *priv = transition->priv; - guint width, height; -+ CoglError *catch_error = NULL; - - /* template material to avoid unnecessary shader compilation */ - static CoglHandle material_template = COGL_INVALID_HANDLE; -@@ -263,19 +264,33 @@ setup_framebuffers (StThemeNodeTransition *transition, - COGL_TEXTURE_NO_SLICING, - COGL_PIXEL_FORMAT_ANY); - -- g_return_val_if_fail (priv->old_texture != COGL_INVALID_HANDLE, FALSE); -- g_return_val_if_fail (priv->new_texture != COGL_INVALID_HANDLE, FALSE); -+ if (priv->old_texture == COGL_INVALID_HANDLE) -+ return FALSE; -+ -+ if (priv->new_texture == COGL_INVALID_HANDLE) -+ return FALSE; - - if (priv->old_offscreen) - cogl_handle_unref (priv->old_offscreen); - priv->old_offscreen = cogl_offscreen_new_with_texture (priv->old_texture); -+ if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->old_offscreen), &catch_error)) -+ { -+ cogl_object_unref (priv->old_offscreen); -+ cogl_error_free (catch_error); -+ priv->old_offscreen = COGL_INVALID_HANDLE; -+ return FALSE; -+ } - - if (priv->new_offscreen) - cogl_handle_unref (priv->new_offscreen); - priv->new_offscreen = cogl_offscreen_new_with_texture (priv->new_texture); -- -- g_return_val_if_fail (priv->old_offscreen != COGL_INVALID_HANDLE, FALSE); -- g_return_val_if_fail (priv->new_offscreen != COGL_INVALID_HANDLE, FALSE); -+ if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (priv->new_offscreen), &catch_error)) -+ { -+ cogl_object_unref (priv->new_offscreen); -+ cogl_error_free (catch_error); -+ priv->new_offscreen = COGL_INVALID_HANDLE; -+ return FALSE; -+ } - - if (priv->material == NULL) - { --- -2.9.0 - diff --git a/gnome-base/gnome-shell/gnome-shell-3.18.5.ebuild b/gnome-base/gnome-shell/gnome-shell-3.18.5.ebuild deleted file mode 100644 index acac425..00000000 --- a/gnome-base/gnome-shell/gnome-shell-3.18.5.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{3_4,3_5} ) - -inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"; - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+bluetooth +networkmanager +nls -openrc-force" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -# libXfixes-5.0 needed for pointer barriers -# FIXME: -# * gstreamer support is currently automagic -COMMON_DEPEND=" - >=app-accessibility/at-spi2-atk-2.5.3 - >=dev-libs/atk-2[introspection] - >=app-crypt/gcr-3.7.5[introspection] - >=dev-libs/glib-2.45.3:2[dbus] - >=dev-libs/gjs-1.39 - >=dev-libs/gobject-introspection-1.45.4:= - dev-libs/libical:= - >=x11-libs/gtk+-3.15.0:3[introspection] - >=media-libs/clutter-1.21.5:1.0[introspection] - >=dev-libs/json-glib-0.13.2 - >=dev-libs/libcroco-0.6.8:0.6 - >=gnome-base/gnome-desktop-3.7.90:3=[introspection] - >=gnome-base/gsettings-desktop-schemas-3.14 - >=gnome-base/gnome-keyring-3.3.90 - gnome-base/libgnome-keyring - >=gnome-extra/evolution-data-server-3.17.2:= - >=media-libs/gstreamer-0.11.92:1.0 - >=net-im/telepathy-logger-0.2.4[introspection] - >=net-libs/telepathy-glib-0.19[introspection] - >=sys-auth/polkit-0.100[introspection] - >=x11-libs/libXfixes-5.0 - x11-libs/libXtst - >=x11-wm/mutter-3.18.1[introspection] - >=x11-libs/startup-notification-0.11 - - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - - dev-libs/dbus-glib - dev-libs/libxml2:2 - gnome-base/librsvg - media-libs/libcanberra[gtk3] - media-libs/mesa - >=media-sound/pulseaudio-2 - >=net-libs/libsoup-2.40:2.4[introspection] - x11-libs/libX11 - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/pango[introspection] - x11-apps/mesa-progs - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) - networkmanager? ( - app-crypt/libsecret - >=gnome-extra/nm-applet-0.9.8 - >=net-misc/networkmanager-0.9.8[introspection] ) -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated using: -# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq -# Each block: -# 1. Pull in polkit-0.101 for pretty authorization dialogs -# 2. Introspection stuff needed via imports.gi.* -# 3. gnome-session is needed for gnome-session-quit -# 4. Control shell settings -# 5. Systemd needed for suspending support -# 6. xdg-utils needed for xdg-open, used by extension tool -# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows -# 8. IBus is needed for nls integration -# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c -RDEPEND="${COMMON_DEPEND} - >=sys-auth/polkit-0.101[introspection] - - >=app-accessibility/caribou-0.4.8 - media-libs/cogl[introspection] - >=sys-apps/accountsservice-0.6.14[introspection] - >=sys-power/upower-0.99[introspection] - - >=gnome-base/gnome-session-2.91.91 - >=gnome-base/gnome-settings-daemon-3.8.3 - - !openrc-force? ( >=sys-apps/systemd-31 ) - - x11-misc/xdg-utils - - media-fonts/dejavu - x11-themes/gnome-icon-theme-symbolic - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) - nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection] - >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/gtk-doc-am-1.17 - >=dev-util/intltool-0.40 - gnome-base/gnome-common - virtual/pkgconfig - !!=dev-lang/spidermonkey-1.8.2* -" -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time -# https://bugs.gentoo.org/show_bug.cgi?id=360413 - -src_prepare() { - # Change favorites defaults, bug #479918 - epatch "${FILESDIR}"/${PN}-3.14.0-defaults.patch - - # Fix automagic gnome-bluetooth dep, bug #398145 - epatch "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch - - # Fix silent bluetooth linking failure with ld.gold, bug #503952 - # https://bugzilla.gnome.org/show_bug.cgi?id=726435 - epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch - - epatch_user - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # Do not error out on warnings - gnome2_src_configure \ - --enable-browser-plugin \ - --enable-man \ - $(use_enable !openrc-force systemd) \ - $(use_with bluetooth) \ - $(use_enable networkmanager) \ - BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins -} - -src_install() { - gnome2_src_install - python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" - python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" - - # Required for gnome-shell on hardened/PaX, bug #398941 - # Future-proof for >=spidermonkey-1.8.7 following polkit's example - if has_version '<dev-lang/spidermonkey-1.8.7'; then - pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs} - elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - # Required for gnome-shell on hardened/PaX #457146 and #457194 - # PaX EMUTRAMP need to be on - elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then - pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs} - else - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version ">=x11-base/xorg-server-1.11"; then - ewarn "If you use multiple screens, it is highly recommended that you" - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" - ewarn "pointer barriers which will make it easier to use hot corners." - fi - - if has_version "<x11-drivers/ati-drivers-12"; then - ewarn "GNOME Shell has been reported to show graphical corruption under" - ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source" - ewarn "drivers." - fi - - if ! has_version "media-libs/mesa[llvm]"; then - elog "llvmpipe is used as fallback when no 3D acceleration" - elog "is available. You will need to enable llvm USE for" - elog "media-libs/mesa." - fi - - # https://bugs.gentoo.org/show_bug.cgi?id=563084 - if has_version "x11-drivers/nvidia-drivers[-kms]"; then - ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," - ewarn "otherwise Gnome will fail to start" - fi - - if ! systemd_is_booted; then - ewarn "${PN} needs Systemd to be *running* for working" - ewarn "properly. Please follow this guide to migrate:" - ewarn "https://wiki.gentoo.org/wiki/Systemd"; - fi - - if use openrc-force; then - ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," - ewarn "this can lead to unexpected problems and is not supported neither by" - ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," - ewarn "you will need to disable this USE flag system wide and retest before" - ewarn "opening any bug report." - fi -} diff --git a/gnome-base/gnome-shell/gnome-shell-3.20.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.20.2-r1.ebuild deleted file mode 100644 index db3b02f..00000000 --- a/gnome-base/gnome-shell/gnome-shell-3.20.2-r1.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{3_4,3_5} ) - -inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"; - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+bluetooth +networkmanager +nls -openrc-force" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# libXfixes-5.0 needed for pointer barriers -# FIXME: -# * gstreamer support is currently automagic -COMMON_DEPEND=" - >=app-accessibility/at-spi2-atk-2.5.3 - >=dev-libs/atk-2[introspection] - >=app-crypt/gcr-3.7.5[introspection] - >=dev-libs/glib-2.45.3:2[dbus] - >=dev-libs/gjs-1.39 - >=dev-libs/gobject-introspection-1.45.4:= - dev-libs/libical:= - >=x11-libs/gtk+-3.15.0:3[introspection] - >=media-libs/clutter-1.21.5:1.0[introspection] - >=dev-libs/json-glib-0.13.2 - >=dev-libs/libcroco-0.6.8:0.6 - >=gnome-base/gnome-desktop-3.7.90:3=[introspection] - >=gnome-base/gsettings-desktop-schemas-3.19.2 - >=gnome-base/gnome-keyring-3.3.90 - gnome-base/libgnome-keyring - >=gnome-extra/evolution-data-server-3.17.2:= - >=media-libs/gstreamer-0.11.92:1.0 - >=net-im/telepathy-logger-0.2.4[introspection] - >=net-libs/telepathy-glib-0.19[introspection] - >=sys-auth/polkit-0.100[introspection] - >=x11-libs/libXfixes-5.0 - x11-libs/libXtst - >=x11-wm/mutter-3.20.2[introspection] - >=x11-libs/startup-notification-0.11 - - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - - dev-libs/dbus-glib - dev-libs/libxml2:2 - gnome-base/librsvg - media-libs/libcanberra[gtk3] - media-libs/mesa - >=media-sound/pulseaudio-2 - >=net-libs/libsoup-2.40:2.4[introspection] - x11-libs/libX11 - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/pango[introspection] - x11-apps/mesa-progs - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) - networkmanager? ( - app-crypt/libsecret - >=gnome-extra/nm-applet-0.9.8 - >=net-misc/networkmanager-0.9.8[introspection] ) -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated using: -# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq -# Each block: -# 1. Pull in polkit-0.101 for pretty authorization dialogs -# 2. Introspection stuff needed via imports.gi.* -# 3. gnome-session is needed for gnome-session-quit -# 4. Control shell settings -# 5. Systemd needed for suspending support -# 6. xdg-utils needed for xdg-open, used by extension tool -# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows -# 8. IBus is needed for nls integration -# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c -RDEPEND="${COMMON_DEPEND} - >=sys-auth/polkit-0.101[introspection] - - >=app-accessibility/caribou-0.4.8 - media-libs/cogl[introspection] - >=sys-apps/accountsservice-0.6.14[introspection] - >=sys-power/upower-0.99:=[introspection] - - >=gnome-base/gnome-session-2.91.91 - >=gnome-base/gnome-settings-daemon-3.8.3 - - !openrc-force? ( >=sys-apps/systemd-31 ) - - x11-misc/xdg-utils - - media-fonts/dejavu - >=x11-themes/adwaita-icon-theme-3.19.90 - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) - nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection] - >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/gtk-doc-am-1.17 - >=dev-util/intltool-0.40 - gnome-base/gnome-common - virtual/pkgconfig - !!=dev-lang/spidermonkey-1.8.2* -" -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time -# https://bugs.gentoo.org/show_bug.cgi?id=360413 - -src_prepare() { - # Change favorites defaults, bug #479918 - eapply "${FILESDIR}"/${PN}-3.14.0-defaults.patch - - # Fix automagic gnome-bluetooth dep, bug #398145 - eapply "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch - - # Fix silent bluetooth linking failure with ld.gold, bug #503952 - # https://bugzilla.gnome.org/show_bug.cgi?id=726435 - # This shouldn't be needed per upstream -# epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch - - # Crash and visual corruption with nvidia-drivers, fixed in 3.20.3 - eapply "${FILESDIR}/${P}-st-nvidia.patch" - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # Do not error out on warnings - gnome2_src_configure \ - --enable-browser-plugin \ - --enable-man \ - $(use_enable !openrc-force systemd) \ - $(use_with bluetooth) \ - $(use_enable networkmanager) \ - BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins -} - -src_install() { - gnome2_src_install - python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" - python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" - - # Required for gnome-shell on hardened/PaX, bug #398941 - # Future-proof for >=spidermonkey-1.8.7 following polkit's example - if has_version '<dev-lang/spidermonkey-1.8.7'; then - pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs} - elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - # Required for gnome-shell on hardened/PaX #457146 and #457194 - # PaX EMUTRAMP need to be on - elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then - pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs} - else - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version ">=x11-base/xorg-server-1.11"; then - ewarn "If you use multiple screens, it is highly recommended that you" - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" - ewarn "pointer barriers which will make it easier to use hot corners." - fi - - if has_version "<x11-drivers/ati-drivers-12"; then - ewarn "GNOME Shell has been reported to show graphical corruption under" - ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source" - ewarn "drivers." - fi - - if ! has_version "media-libs/mesa[llvm]"; then - elog "llvmpipe is used as fallback when no 3D acceleration" - elog "is available. You will need to enable llvm USE for" - elog "media-libs/mesa." - fi - - # https://bugs.gentoo.org/show_bug.cgi?id=563084 - if has_version "x11-drivers/nvidia-drivers[-kms]"; then - ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," - ewarn "otherwise Gnome will fail to start" - fi - - if ! systemd_is_booted; then - ewarn "${PN} needs Systemd to be *running* for working" - ewarn "properly. Please follow this guide to migrate:" - ewarn "https://wiki.gentoo.org/wiki/Systemd"; - fi - - if use openrc-force; then - ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," - ewarn "this can lead to unexpected problems and is not supported neither by" - ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," - ewarn "you will need to disable this USE flag system wide and retest before" - ewarn "opening any bug report." - fi -} diff --git a/gnome-base/gnome-shell/gnome-shell-3.20.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.20.3.ebuild deleted file mode 100644 index b45b86d..00000000 --- a/gnome-base/gnome-shell/gnome-shell-3.20.3.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{3_4,3_5} ) - -inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"; - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+bluetooth +networkmanager +nls -openrc-force" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# libXfixes-5.0 needed for pointer barriers -# FIXME: -# * gstreamer support is currently automagic -COMMON_DEPEND=" - >=app-accessibility/at-spi2-atk-2.5.3 - >=dev-libs/atk-2[introspection] - >=app-crypt/gcr-3.7.5[introspection] - >=dev-libs/glib-2.45.3:2[dbus] - >=dev-libs/gjs-1.39 - >=dev-libs/gobject-introspection-1.45.4:= - dev-libs/libical:= - >=x11-libs/gtk+-3.15.0:3[introspection] - >=media-libs/clutter-1.21.5:1.0[introspection] - >=dev-libs/json-glib-0.13.2 - >=dev-libs/libcroco-0.6.8:0.6 - >=gnome-base/gnome-desktop-3.7.90:3=[introspection] - >=gnome-base/gsettings-desktop-schemas-3.19.2 - >=gnome-base/gnome-keyring-3.3.90 - gnome-base/libgnome-keyring - >=gnome-extra/evolution-data-server-3.17.2:= - >=media-libs/gstreamer-0.11.92:1.0 - >=net-im/telepathy-logger-0.2.4[introspection] - >=net-libs/telepathy-glib-0.19[introspection] - >=sys-auth/polkit-0.100[introspection] - >=x11-libs/libXfixes-5.0 - x11-libs/libXtst - >=x11-wm/mutter-3.20.2[introspection] - >=x11-libs/startup-notification-0.11 - - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - - dev-libs/dbus-glib - dev-libs/libxml2:2 - gnome-base/librsvg - media-libs/libcanberra[gtk3] - media-libs/mesa - >=media-sound/pulseaudio-2 - >=net-libs/libsoup-2.40:2.4[introspection] - x11-libs/libX11 - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/pango[introspection] - x11-apps/mesa-progs - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) - networkmanager? ( - app-crypt/libsecret - >=gnome-extra/nm-applet-0.9.8 - >=net-misc/networkmanager-0.9.8:=[introspection] ) -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated using: -# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq -# Each block: -# 1. Pull in polkit-0.101 for pretty authorization dialogs -# 2. Introspection stuff needed via imports.gi.* -# 3. gnome-session is needed for gnome-session-quit -# 4. Control shell settings -# 5. Systemd needed for suspending support -# 6. xdg-utils needed for xdg-open, used by extension tool -# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows -# 8. IBus is needed for nls integration -# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c -RDEPEND="${COMMON_DEPEND} - >=sys-auth/polkit-0.101[introspection] - - >=app-accessibility/caribou-0.4.8 - media-libs/cogl[introspection] - >=sys-apps/accountsservice-0.6.14[introspection] - >=sys-power/upower-0.99:=[introspection] - - >=gnome-base/gnome-session-2.91.91 - >=gnome-base/gnome-settings-daemon-3.8.3 - - !openrc-force? ( >=sys-apps/systemd-31 ) - - x11-misc/xdg-utils - - media-fonts/dejavu - >=x11-themes/adwaita-icon-theme-3.19.90 - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) - nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) -" -# avoid circular dependency, see bug #546134 -PDEPEND=" - >=gnome-base/gdm-3.5[introspection] - >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/gtk-doc-am-1.17 - >=dev-util/intltool-0.40 - gnome-base/gnome-common - virtual/pkgconfig - !!=dev-lang/spidermonkey-1.8.2* -" -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time -# https://bugs.gentoo.org/show_bug.cgi?id=360413 - -src_prepare() { - # Change favorites defaults, bug #479918 - eapply "${FILESDIR}"/${PN}-3.14.0-defaults.patch - - # Fix automagic gnome-bluetooth dep, bug #398145 - eapply "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch - - # Fix silent bluetooth linking failure with ld.gold, bug #503952 - # https://bugzilla.gnome.org/show_bug.cgi?id=726435 - # This shouldn't be needed per upstream -# epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch - - eautoreconf - gnome2_src_prepare -} - -src_configure() { - # Do not error out on warnings - gnome2_src_configure \ - --enable-browser-plugin \ - --enable-man \ - $(use_enable !openrc-force systemd) \ - $(use_with bluetooth) \ - $(use_enable networkmanager) \ - BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins -} - -src_install() { - gnome2_src_install - python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" - python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" - - # Required for gnome-shell on hardened/PaX, bug #398941 - # Future-proof for >=spidermonkey-1.8.7 following polkit's example - if has_version '<dev-lang/spidermonkey-1.8.7'; then - pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs} - elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - # Required for gnome-shell on hardened/PaX #457146 and #457194 - # PaX EMUTRAMP need to be on - elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then - pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs} - else - pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs} - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version ">=x11-base/xorg-server-1.11"; then - ewarn "If you use multiple screens, it is highly recommended that you" - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" - ewarn "pointer barriers which will make it easier to use hot corners." - fi - - if has_version "<x11-drivers/ati-drivers-12"; then - ewarn "GNOME Shell has been reported to show graphical corruption under" - ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source" - ewarn "drivers." - fi - - if ! has_version "media-libs/mesa[llvm]"; then - elog "llvmpipe is used as fallback when no 3D acceleration" - elog "is available. You will need to enable llvm USE for" - elog "media-libs/mesa." - fi - - # https://bugs.gentoo.org/show_bug.cgi?id=563084 - if has_version "x11-drivers/nvidia-drivers[-kms]"; then - ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," - ewarn "otherwise Gnome will fail to start" - fi - - if ! systemd_is_booted; then - ewarn "${PN} needs Systemd to be *running* for working" - ewarn "properly. Please follow this guide to migrate:" - ewarn "https://wiki.gentoo.org/wiki/Systemd"; - fi - - if use openrc-force; then - ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," - ewarn "this can lead to unexpected problems and is not supported neither by" - ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," - ewarn "you will need to disable this USE flag system wide and retest before" - ewarn "opening any bug report." - fi -}
