memleak patch

3 files changed, 34 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7dff07f74743..5d3336a78e47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mingw-w64-glib2
 	pkgdesc = Common C routines used by GTK+ and other libs (mingw-w64)
 	pkgver = 2.46.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.gtk.org/
 	arch = any
 	license = LGPL
@@ -26,6 +26,7 @@ pkgbase = mingw-w64-glib2
 	source = 0028-inode_directory.patch
 	source = 0029-grand.all.patch
 	source = revert-warn-glib-compile-schemas.patch
+	source = memleak.patch
 	sha256sums = 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db
 	sha256sums = ef81e82e15fb3a71bad770be17fe4fea3f4d9cdee238d6caa39807eeea5da3e3
 	sha256sums = 1b24cc928f69f73599f83269a7b3eb7bf7efbe114109251e6765053a1e1f4cd6
@@ -36,6 +37,7 @@ pkgbase = mingw-w64-glib2
 	sha256sums = f7f06a90156fe0a308412512c359072922f7f0d19dd4bed30d863db18e48940b
 	sha256sums = dd26a015cdd65ee270251a11ef4c646000b26bb435992e6c997a615c1c14602e
 	sha256sums = 049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97
+	sha256sums = 8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6
 
 pkgname = mingw-w64-glib2
 
diff --git a/PKGBUILD b/PKGBUILD
index dec2b1deb962..f8f63a6fbb4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Renato Silva <br.renatosilva@gmail.com>
 pkgname=mingw-w64-glib2
 pkgver=2.46.2
-pkgrel=1
+pkgrel=2
 arch=(any)
 pkgdesc="Common C routines used by GTK+ and other libs (mingw-w64)"
 depends=(mingw-w64-gettext mingw-w64-zlib mingw-w64-libffi mingw-w64-pcre mingw-w64-freetype2)
@@ -20,7 +20,8 @@ source=("http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.t
 "0027-no_sys_if_nametoindex.patch"
 "0028-inode_directory.patch"
 "0029-grand.all.patch"
-"revert-warn-glib-compile-schemas.patch")
+"revert-warn-glib-compile-schemas.patch"
+"memleak.patch")
 sha256sums=('5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db'
             'ef81e82e15fb3a71bad770be17fe4fea3f4d9cdee238d6caa39807eeea5da3e3'
             '1b24cc928f69f73599f83269a7b3eb7bf7efbe114109251e6765053a1e1f4cd6'
@@ -30,7 +31,8 @@ sha256sums=('5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db'
             '5cb481295ff86c2802030984d8b2bf6a3b1dcd5e5fe7b0be68b22d9116305837'
             'f7f06a90156fe0a308412512c359072922f7f0d19dd4bed30d863db18e48940b'
             'dd26a015cdd65ee270251a11ef4c646000b26bb435992e6c997a615c1c14602e'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+            '8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -45,6 +47,7 @@ prepare() {
   patch -Np1 -i "$srcdir/0028-inode_directory.patch"
   patch -Np1 -i "${srcdir}/0029-grand.all.patch"
   patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+  patch -Np1 -i ../memleak.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 
diff --git a/memleak.patch b/memleak.patch
new file mode 100644
index 000000000000..2b927a10138c
--- /dev/null
+++ b/memleak.patch
@@ -0,0 +1,25 @@
+From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@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
+