Date: Friday, December 4, 2015 @ 06:36:13 Author: fyan Revision: 148311
archrelease: copy trunk to multilib-x86_64 Added: lib32-glib2/repos/multilib-x86_64/PKGBUILD (from rev 148310, lib32-glib2/trunk/PKGBUILD) lib32-glib2/repos/multilib-x86_64/memleak.patch (from rev 148310, lib32-glib2/trunk/memleak.patch) lib32-glib2/repos/multilib-x86_64/revert-warn-glib-compile-schemas.patch (from rev 148310, lib32-glib2/trunk/revert-warn-glib-compile-schemas.patch) Deleted: lib32-glib2/repos/multilib-x86_64/PKGBUILD lib32-glib2/repos/multilib-x86_64/revert-warn-glib-compile-schemas.patch ----------------------------------------+ PKGBUILD | 103 +++++++++++++++---------------- memleak.patch | 25 +++++++ revert-warn-glib-compile-schemas.patch | 66 +++++++++---------- 3 files changed, 108 insertions(+), 86 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-12-04 05:35:50 UTC (rev 148310) +++ PKGBUILD 2015-12-04 05:36:13 UTC (rev 148311) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Ionut Biru <ib...@archlinux.org> -# Contributor: Pierre Schmitz <pie...@archlinux.de> -# Contributor: Mikko Seppälä <t-r-...@mbnet.fi> - -_pkgbasename=glib2 -pkgname=lib32-$_pkgbasename -pkgver=2.46.1 -pkgrel=1 -pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" -url="http://www.gtk.org/" -arch=('x86_64') -license=('LGPL') -depends=('lib32-dbus' 'lib32-libffi' 'lib32-pcre' 'lib32-zlib' "$_pkgbasename") -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') - -prepare() { - cd "${srcdir}/glib-${pkgver}" - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch -} - -build() { - export CC="gcc -m32" - 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 - make -} - -package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/{etc,usr/{share,include}} - - cd "${pkgdir}"/usr/bin - mv gio-querymodules gio-querymodules-32 - rm -f gdbus glib* gobject-query gsettings gtester* - rm -rf "$pkgdir"/usr/lib32/gdbus-2.0 - find "$pkgdir/usr/bin" -type f -not -name gio-querymodules-32 -delete -} Copied: lib32-glib2/repos/multilib-x86_64/PKGBUILD (from rev 148310, lib32-glib2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-12-04 05:36:13 UTC (rev 148311) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Ionut Biru <ib...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> +# Contributor: Mikko Seppälä <t-r-...@mbnet.fi> + +_pkgbasename=glib2 +pkgname=lib32-$_pkgbasename +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/" +arch=('x86_64') +license=('LGPL') +depends=('lib32-dbus' 'lib32-libffi' 'lib32-pcre' 'lib32-zlib' "$_pkgbasename") +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' '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() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/glib-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib32 --with-pcre=system --disable-fam + make +} + +package() { + cd "${srcdir}/glib-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/{etc,usr/{share,include}} + + cd "${pkgdir}"/usr/bin + mv gio-querymodules gio-querymodules-32 + rm -f gdbus glib* gobject-query gsettings gtester* + rm -rf "$pkgdir"/usr/lib32/gdbus-2.0 + find "$pkgdir/usr/bin" -type f -not -name gio-querymodules-32 -delete +} Copied: lib32-glib2/repos/multilib-x86_64/memleak.patch (from rev 148310, lib32-glib2/trunk/memleak.patch) =================================================================== --- memleak.patch (rev 0) +++ memleak.patch 2015-12-04 05:36:13 UTC (rev 148311) @@ -0,0 +1,25 @@ +From db641e32920ee8b553ab6f2d318aafa156e4390c Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evange...@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 + Deleted: revert-warn-glib-compile-schemas.patch =================================================================== --- revert-warn-glib-compile-schemas.patch 2015-12-04 05:35:50 UTC (rev 148310) +++ revert-warn-glib-compile-schemas.patch 2015-12-04 05:36:13 UTC (rev 148311) @@ -1,33 +0,0 @@ -From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <de...@desrt.ca> -Date: Thu, 12 Apr 2012 23:55:34 +0000 -Subject: glib-compile-schemas: warn about bad dconf paths - -For quite some time the recommended usage of GSettings and dconf has -been to use paths like /org/gnome/example/. Use of /apps/ has spilled -over from GConf and is continuing to make its way into a number of -applications as they port. - -glib-compile-schemas will now warn about these types of paths being -used. This generates a lot of noise, but hopefully it will reduce the -number of ported applications making this mistake. ---- -diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index cf02389..27d0181 100644 ---- a/gio/glib-compile-schemas.c -+++ b/gio/glib-compile-schemas.c -@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, - return; - } - -+ if (path && (g_str_has_prefix (path, "/apps/") || -+ g_str_has_prefix (path, "/desktop/") || -+ g_str_has_prefix (path, "/system/"))) -+ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " -+ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); -+ - state->schema_state = schema_state_new (path, gettext_domain, - extends, extends_name, list_of); - --- -cgit v0.9.0.2 Copied: lib32-glib2/repos/multilib-x86_64/revert-warn-glib-compile-schemas.patch (from rev 148310, lib32-glib2/trunk/revert-warn-glib-compile-schemas.patch) =================================================================== --- revert-warn-glib-compile-schemas.patch (rev 0) +++ revert-warn-glib-compile-schemas.patch 2015-12-04 05:36:13 UTC (rev 148311) @@ -0,0 +1,33 @@ +From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <de...@desrt.ca> +Date: Thu, 12 Apr 2012 23:55:34 +0000 +Subject: glib-compile-schemas: warn about bad dconf paths + +For quite some time the recommended usage of GSettings and dconf has +been to use paths like /org/gnome/example/. Use of /apps/ has spilled +over from GConf and is continuing to make its way into a number of +applications as they port. + +glib-compile-schemas will now warn about these types of paths being +used. This generates a lot of noise, but hopefully it will reduce the +number of ported applications making this mistake. +--- +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index cf02389..27d0181 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, + return; + } + ++ if (path && (g_str_has_prefix (path, "/apps/") || ++ g_str_has_prefix (path, "/desktop/") || ++ g_str_has_prefix (path, "/system/"))) ++ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " ++ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); ++ + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + +-- +cgit v0.9.0.2