diff options
author | Fantix King | 2015-12-18 15:44:39 +0800 |
---|---|---|
committer | Fantix King | 2015-12-18 15:49:21 +0800 |
commit | d9b0c4d6d0c350e7404546215b85cbd2d829022d (patch) | |
tree | 0f6c3d78dd694d5a0f45207bde83f8de9e2e0e41 | |
parent | 82d85b1c69839ea55c6872bca97daaac10c8cfc8 (diff) | |
download | aur-libx32-glib2.tar.gz |
2.46.2-1.1
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 17 | ||||
-rw-r--r-- | memleak.patch | 25 |
3 files changed, 39 insertions, 13 deletions
@@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Fri Dec 18 07:49:14 UTC 2015 pkgbase = libx32-glib2 pkgdesc = Common C routines used by GTK+ 2.4 and other libs (x32 ABI) - pkgver = 2.46.1 + pkgver = 2.46.2 pkgrel = 1.1 url = http://www.gtk.org/ arch = x86_64 @@ -13,10 +15,12 @@ pkgbase = libx32-glib2 depends = libx32-zlib depends = glib2 options = !docs - source = http://ftp.gnome.org/pub/GNOME/sources/glib/2.46/glib-2.46.1.tar.xz + source = http://ftp.gnome.org/pub/GNOME/sources/glib/2.46/glib-2.46.2.tar.xz source = revert-warn-glib-compile-schemas.patch - sha256sums = 5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb + source = memleak.patch + sha256sums = 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db sha256sums = 049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97 + sha256sums = 8337eeba4a32133d41575c8338fca32ac6a867e6e4a4e021355fcdeb606420a6 pkgname = libx32-glib2 @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144547 2015-10-21 05:26:35Z fyan $ +# $Id: PKGBUILD 148311 2015-12-04 05:36:13Z fyan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> @@ -6,7 +6,7 @@ _pkgbasename=glib2 pkgname=libx32-$_pkgbasename -pkgver=2.46.1 +pkgver=2.46.2 pkgrel=1.1 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (x32 ABI)" url="http://www.gtk.org/" @@ -16,13 +16,15 @@ depends=('libx32-dbus' 'libx32-libffi' 'libx32-pcre' 'libx32-zlib' "$_pkgbasenam makedepends=('gcc-multilib-x32' '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() { @@ -30,11 +32,6 @@ build() { export CXX="g++ -mx32" export PKG_CONFIG_PATH="/usr/libx32/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/libx32 --with-pcre=system --disable-fam 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 + |