From b2a662531806fd7b396c6fcec6ccc4e9be91eaac Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Thu, 19 Apr 2012 23:03:51 +0000
Subject: [PATCH] start of glib2 update, core > libffi & glib2

---
 glib2/PKGBUILD                               | 25 +++++++++------
 glib2/revert-warn-glib-compile-schemas.patch | 33 ++++++++++++++++++++
 libffi/PKGBUILD                              | 30 +++++++++++-------
 3 files changed, 66 insertions(+), 22 deletions(-)
 create mode 100644 glib2/revert-warn-glib-compile-schemas.patch

diff --git a/glib2/PKGBUILD b/glib2/PKGBUILD
index 72fca18a1..2d70c7856 100644
--- a/glib2/PKGBUILD
+++ b/glib2/PKGBUILD
@@ -1,11 +1,10 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org
 
 pkgname=glib2
-pkgver=2.30.2
+pkgver=2.32.1
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
@@ -14,22 +13,27 @@ license=('LGPL')
 depends=('pcre' 'libffi')
 makedepends=('pkgconfig' 'python2')
 options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.32/glib-${pkgver}.tar.xz
         glib2.sh
-        glib2.csh)
-sha256sums=('94b1f1a1456c67060ca868d299bef3f7268a2c1c5c360aabb7149d4d9b2fdcd3'
+        glib2.csh
+        revert-warn-glib-compile-schemas.patch)
+sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
-            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
+            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
+            '6967ba8481ce194ed083a462343386e32fea236e343299d3066a2106e1114e5f')
 
 build() {
   cd "${srcdir}/glib-${pkgver}"
-
-  ./configure --prefix=/usr \
+  patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
       --sysconfdir=/etc \
       --with-pcre=system \
       --disable-fam
-
   make
+}
+
+package() {
+  cd "${srcdir}/glib-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   install -d "${pkgdir}/etc/profile.d"
@@ -39,5 +43,6 @@ build() {
   for _i in "${pkgdir}/etc/bash_completion.d/"*; do
       chmod -x "${_i}"
   done
+  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
 }
 
diff --git a/glib2/revert-warn-glib-compile-schemas.patch b/glib2/revert-warn-glib-compile-schemas.patch
new file mode 100644
index 000000000..8ac2073fd
--- /dev/null
+++ b/glib2/revert-warn-glib-compile-schemas.patch
@@ -0,0 +1,33 @@
+From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@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
diff --git a/libffi/PKGBUILD b/libffi/PKGBUILD
index 7b7e83343..744ae3eae 100644
--- a/libffi/PKGBUILD
+++ b/libffi/PKGBUILD
@@ -1,24 +1,30 @@
-# $Id: PKGBUILD 72255 2010-03-13 20:43:14Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas@chakra-project.org
 
 pkgname=libffi
-pkgver=3.0.9
-pkgrel=2
+pkgver=3.0.10
+pkgrel=1
 pkgdesc="A portable, high level programming interface to various calling conventions."
 arch=('i686' 'x86_64')
 license=('MIT')
 url="http://sourceware.org/libffi"
-depends=('glibc' 'texinfo')
-options=('!libtool' 'force')
+depends=('glibc')
+options=('!libtool')
 install=libffi.install
 source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('1f300a7a7f975d4046f51c3022fa5ff1')
+md5sums=('79390673f5d07a8fb342bc09b5055b6f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  ./configure --prefix=/usr 
+  make 
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install 
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" 
 }