Sun Oct 2 23:14:32 UTC 2011

3 files changed, 55 insertions, 13 deletions

diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 93729d3a3..1e135e946 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 126555 2011-06-06 09:24:36Z ibiru $
+# $Id: PKGBUILD 139207 2011-10-01 18:53:04Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=glib2
-pkgver=2.28.8
+pkgver=2.30.0
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('pcre>=8.12')
+depends=('pcre' 'libffi')
 makedepends=('pkgconfig' 'python2')
-checkdepends=('pygobject' 'dbus-python')
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.xz
+optdepends=('python2: for gdbus-codegen')
+options=('!libtool' '!docs' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz
         glib2.sh
         glib2.csh)
-sha256sums=('4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353'
+sha256sums=('d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1'
             '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
             '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
 
@@ -39,10 +39,5 @@ package() {
   for _i in "${pkgdir}/etc/bash_completion.d/"*; do
       chmod -x "${_i}"
   done
-}
-
-check() {
-  cd "${srcdir}/glib-${pkgver}"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' gio/tests/gdbus-testserver.py
-  make -k check || true
+  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
 }
diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD
new file mode 100644
index 000000000..d0d021b2c
--- /dev/null
+++ b/core/libffi/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 139471 2011-10-02 01:24:24Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libffi
+pkgver=3.0.10
+pkgrel=1
+pkgdesc="A portable, high level programming interface to various calling conventions"
+arch=('i686' 'x86_64')
+url="http://sourceware.org/libffi"
+license=('MIT')
+depends=('glibc')
+options=('!libtool')
+install=libffi.install
+source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
+md5sums=('79390673f5d07a8fb342bc09b5055b6f')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/core/libffi/libffi.install b/core/libffi/libffi.install
new file mode 100644
index 000000000..903bede10
--- /dev/null
+++ b/core/libffi/libffi.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libffi.info.gz)
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}