diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2016-11-12 00:58:44 +0100 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2016-11-12 01:33:54 +0100 |
commit | b0c1e6aee2c4028333d1afbfddef567f11d9bbd2 (patch) | |
tree | 94ed93f94b744734cab9f1546bd33f93094f41d6 /gnome-base/gnome-shell/files | |
parent | gnome-base/gnome-shell: version bump 3.20.4 → 3.22.1 (diff) | |
download | gentoo-b0c1e6aee2c4028333d1afbfddef567f11d9bbd2.tar.gz gentoo-b0c1e6aee2c4028333d1afbfddef567f11d9bbd2.tar.bz2 gentoo-b0c1e6aee2c4028333d1afbfddef567f11d9bbd2.zip |
gnome-base/gnome-shell: cleanup old revisions
Package-Manager: portage-2.3.2
Diffstat (limited to 'gnome-base/gnome-shell/files')
-rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.14.0-bluetooth-gold.patch | 31 | ||||
-rw-r--r-- | gnome-base/gnome-shell/files/gnome-shell-3.20.2-st-nvidia.patch | 121 |
2 files changed, 0 insertions, 152 deletions
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 cc2b2e6584df..000000000000 --- 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 <tetromino@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 63df248f0671..000000000000 --- 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.szulecki@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 - |