Date: Saturday, October 22, 2016 @ 20:03:25 Author: lcarlier Revision: 193015
archrelease: copy trunk to multilib-x86_64 Added: lib32-glib2/repos/multilib-x86_64/PKGBUILD (from rev 193014, lib32-glib2/trunk/PKGBUILD) lib32-glib2/repos/multilib-x86_64/gio-querymodules-32.hook (from rev 193014, lib32-glib2/trunk/gio-querymodules-32.hook) lib32-glib2/repos/multilib-x86_64/revert-warn-glib-compile-schemas.patch (from rev 193014, lib32-glib2/trunk/revert-warn-glib-compile-schemas.patch) Deleted: lib32-glib2/repos/multilib-x86_64/PKGBUILD lib32-glib2/repos/multilib-x86_64/gio-querymodules-32.hook lib32-glib2/repos/multilib-x86_64/revert-warn-glib-compile-schemas.patch ----------------------------------------+ PKGBUILD | 126 +++++++++++++++---------------- gio-querymodules-32.hook | 22 ++--- revert-warn-glib-compile-schemas.patch | 66 ++++++++-------- 3 files changed, 107 insertions(+), 107 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2016-10-22 20:03:20 UTC (rev 193014) +++ PKGBUILD 2016-10-22 20:03:25 UTC (rev 193015) @@ -1,63 +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.50.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-util-linux lib32-elfutils "$_pkgbasename") -makedepends=('gcc-multilib' 'python' 'git') -_commit=e44ea516afeb41d22cebf968b3ea5d9543856df2 # tags/2.50.1^0 -#options=('!docs') -source=("git://git.gnome.org/glib#commit=$_commit" - gio-querymodules-32.hook - revert-warn-glib-compile-schemas.patch) -sha256sums=('SKIP' - 'e36da43ac0f705860646d4aecf66f82030bb0926814b5d4ec4e3284f24fecc36' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') - -pkgver() { - cd glib - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd glib - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch - NOCONFIGURE=1 ./autogen.sh -} - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd glib - ./configure --prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib32 --with-pcre=system --disable-fam - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package() { - cd glib - 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 - - # install hook - install -d "$pkgdir/usr/share/libalpm/hooks/" - install -m644 "$srcdir"/gio-querymodules-32.hook \ - "$pkgdir/usr/share/libalpm/hooks/" -} Copied: lib32-glib2/repos/multilib-x86_64/PKGBUILD (from rev 193014, lib32-glib2/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2016-10-22 20:03:25 UTC (rev 193015) @@ -0,0 +1,63 @@ +# $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.50.1 +pkgrel=2 +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-util-linux lib32-libelf "$_pkgbasename") +makedepends=('gcc-multilib' 'python' 'git') +_commit=e44ea516afeb41d22cebf968b3ea5d9543856df2 # tags/2.50.1^0 +#options=('!docs') +source=("git://git.gnome.org/glib#commit=$_commit" + gio-querymodules-32.hook + revert-warn-glib-compile-schemas.patch) +sha256sums=('SKIP' + 'e36da43ac0f705860646d4aecf66f82030bb0926814b5d4ec4e3284f24fecc36' + '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + +pkgver() { + cd glib + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd glib + patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch + NOCONFIGURE=1 ./autogen.sh +} + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd glib + ./configure --prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib32 --with-pcre=system --disable-fam + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd glib + 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 + + # install hook + install -d "$pkgdir/usr/share/libalpm/hooks/" + install -m644 "$srcdir"/gio-querymodules-32.hook \ + "$pkgdir/usr/share/libalpm/hooks/" +} Deleted: gio-querymodules-32.hook =================================================================== --- gio-querymodules-32.hook 2016-10-22 20:03:20 UTC (rev 193014) +++ gio-querymodules-32.hook 2016-10-22 20:03:25 UTC (rev 193015) @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib32/gio/modules/*.so - -[Action] -Description = Updating GIO module cache... -When = PostTransaction -Exec = /usr/bin/gio-querymodules-32 /usr/lib32/gio/modules Copied: lib32-glib2/repos/multilib-x86_64/gio-querymodules-32.hook (from rev 193014, lib32-glib2/trunk/gio-querymodules-32.hook) =================================================================== --- gio-querymodules-32.hook (rev 0) +++ gio-querymodules-32.hook 2016-10-22 20:03:25 UTC (rev 193015) @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib32/gio/modules/*.so + +[Action] +Description = Updating GIO module cache... +When = PostTransaction +Exec = /usr/bin/gio-querymodules-32 /usr/lib32/gio/modules Deleted: revert-warn-glib-compile-schemas.patch =================================================================== --- revert-warn-glib-compile-schemas.patch 2016-10-22 20:03:20 UTC (rev 193014) +++ revert-warn-glib-compile-schemas.patch 2016-10-22 20:03:25 UTC (rev 193015) @@ -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 193014, lib32-glib2/trunk/revert-warn-glib-compile-schemas.patch) =================================================================== --- revert-warn-glib-compile-schemas.patch (rev 0) +++ revert-warn-glib-compile-schemas.patch 2016-10-22 20:03:25 UTC (rev 193015) @@ -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