From de093187ffd212744ab9952167e511d74de42153 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 27 Jun 2016 10:05:46 -0400 Subject: gnome-base/gnome-shell: fix nvidia-drivers crash (bug #587110) Thanks to Mark R. Pariente for reporting. Also, require adwaita-icon-theme-3.20 for new grid icon (bug #587130) Package-Manager: portage-2.3.0 --- .../files/gnome-shell-3.20.2-st-nvidia.patch | 121 +++++++++++ .../gnome-shell/gnome-shell-3.20.2-r1.ebuild | 221 +++++++++++++++++++++ 2 files changed, 342 insertions(+) create mode 100644 gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch create mode 100644 gnome-base/gnome-shell/gnome-shell-3.20.2-r1.ebuild (limited to 'gnome-base') 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 new file mode 100644 index 000000000000..63df248f0671 --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch @@ -0,0 +1,121 @@ +From 35cc224240ec4fc8159fc689fe3e093a81f97dc9 Mon Sep 17 00:00:00 2001 +From: Martin Szulecki +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.20.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.20.2-r1.ebuild new file mode 100644 index 000000000000..09e83ab8e021 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.20.2-r1.ebuild @@ -0,0 +1,221 @@ +# 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_3,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[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 "