[arch-commits] Commit in gnome-shell/trunk (PKGBUILD offscreen-memleak.patch)

[Jan Steffens]

Date: Wednesday, April 13, 2016 @ 22:51:10
  Author: heftig
Revision: 264846

3.20.1-1

Modified:
  gnome-shell/trunk/PKGBUILD
Deleted:
  gnome-shell/trunk/offscreen-memleak.patch

-+
 PKGBUILD|   11 +++
 offscreen-memleak.patch |   30 --
 2 files changed, 3 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-13 20:48:23 UTC (rev 264845)
+++ PKGBUILD2016-04-13 20:51:10 UTC (rev 264846)
@@ -3,8 +3,8 @@
 # Contributor: Flamelab [arch-commits] Commit in gnome-shell/trunk (PKGBUILD offscreen-memleak.patch)


2016-04-08

Thread
Jan de Groot

Date: Friday, April 8, 2016 @ 12:28:40
  Author: jgc
Revision: 264200

upgpkg: gnome-shell 3.20.0-2

Fix memleak

Added:
  gnome-shell/trunk/offscreen-memleak.patch
Modified:
  gnome-shell/trunk/PKGBUILD

-+
 PKGBUILD|   11 ---
 offscreen-memleak.patch |   30 ++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-08 07:44:33 UTC (rev 264199)
+++ PKGBUILD2016-04-08 10:28:40 UTC (rev 264200)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-shell
 pkgver=3.20.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64)
 url="https://wiki.gnome.org/Projects/GnomeShell;
@@ -19,9 +19,11 @@
 install=gnome-shell.install
 groups=(gnome)
 
source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-nm-libexecdir.patch)
+nm-libexecdir.patch
+   offscreen-memleak.patch)
 sha256sums=('ee69f461dd3d03caf788dfc64241275868ec0bcd1ef814f3cd2803c25796b888'
-'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+'38bf66da2d92dbb3eab90d36feba0b1af65fe476d2982989dccd799aec0125a6')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -28,6 +30,9 @@
 
   # FS#30747 FS#32730 Problems due to libexecdir different from NM
   patch -Np1 -i ../nm-libexecdir.patch
+
+  # Fix memleak
+  patch -Np1 -i ../offscreen-memleak.patch
 }
 
 build() {

Added: offscreen-memleak.patch
===
--- offscreen-memleak.patch (rev 0)
+++ offscreen-memleak.patch 2016-04-08 10:28:40 UTC (rev 264200)
@@ -0,0 +1,30 @@
+From 941513b280433c269491572b7b1de2a7c5bab21b Mon Sep 17 00:00:00 2001
+From: Aaron Plattner 
+Date: Fri, 18 Mar 2016 16:00:05 -0700
+Subject: st: Fix offscreen leak if cogl_framebuffer_allocate fails
+
+If cogl_framebuffer_allocate fails in _st_create_shadow_pipeline_from_actor, 
the
+CoglOffscreen* that was allocated earlier in the function is leaked.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=735705
+
+Signed-off-by: Aaron Plattner 
+---
+ src/st/st-private.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/st/st-private.c b/src/st/st-private.c
+index 559336c..d40eceb 100644
+--- a/src/st/st-private.c
 b/src/st/st-private.c
+@@ -442,6 +442,7 @@ _st_create_shadow_pipeline_from_actor (StShadow 
*shadow_spec,
+   if (!cogl_framebuffer_allocate (fb, _error))
+ {
+   cogl_error_free (catch_error);
++  cogl_object_unref (offscreen);
+   cogl_object_unref (buffer);
+   return NULL;
+ }
+-- 
+cgit v0.12
+