[arch-commits] Commit in lib32-glib2/trunk (PKGBUILD memleak.patch)

[Felix Yan]

    Date: Friday, December 4, 2015 @ 06:35:50
  Author: fyan
Revision: 148310

upgpkg: lib32-glib2 2.46.2-1

Added:
  lib32-glib2/trunk/memleak.patch
Modified:
  lib32-glib2/trunk/PKGBUILD

---------------+
 PKGBUILD      |   15 ++++++---------
 memleak.patch |   25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-04 05:30:35 UTC (rev 148309)
+++ PKGBUILD	2015-12-04 05:35:50 UTC (rev 148310)
@@ -5,7 +5,7 @@
 
 _pkgbasename=glib2
 pkgname=lib32-$_pkgbasename
-pkgver=2.46.1
+pkgver=2.46.2
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
 url="http://www.gtk.org/"
@@ -15,13 +15,15 @@
 makedepends=('gcc-multilib' 'python2')
 options=('!docs')
 source=("http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz"
-        'revert-warn-glib-compile-schemas.patch')
-sha256sums=('5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+        'revert-warn-glib-compile-schemas.patch' 'memleak.patch')
+sha256sums=('5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db'
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+            '8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6')
 
 prepare() {
   cd "${srcdir}/glib-${pkgver}"
   patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+  patch -Np1 -i ../memleak.patch
 }
 
 build() {
@@ -29,11 +31,6 @@
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-  ## Prevent runtime unloading of glib
-  # https://bugs.archlinux.org/task/46619
-  # https://bugzilla.gnome.org/show_bug.cgi?id=755609
-  LDFLAGS+=" -Wl,-z,nodelete"
-
   cd "${srcdir}/glib-${pkgver}"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libdir=/usr/lib32 --with-pcre=system --disable-fam

Added: memleak.patch
===================================================================
--- memleak.patch	                        (rev 0)
+++ memleak.patch	2015-12-04 05:35:50 UTC (rev 148310)
@@ -0,0 +1,25 @@
+From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Wed, 25 Nov 2015 23:29:18 +0200
+Subject: GDBusProxy: Fix a memory leak during initialization
+
+https://bugzilla.gnome.org/show_bug.cgi?id=758641
+---
+ gio/gdbusproxy.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
+index 52a22fb..7b1140f 100644
+--- a/gio/gdbusproxy.c
++++ b/gio/gdbusproxy.c
+@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable  *initable,
+   if (result != NULL)
+     {
+       process_get_all_reply (proxy, result);
++      g_variant_unref (result);
+     }
+ 
+   proxy->priv->initialized = TRUE;
+-- 
+cgit v0.11.2
+