14 files changed, 255 insertions, 11 deletions
diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD
index 8aaa5832b..51be4e9f7 100644
--- a/testing/bash/PKGBUILD
+++ b/testing/bash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163211 2012-07-10 21:37:43Z allan $
+# $Id: PKGBUILD 163782 2012-07-20 02:08:58Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=bash
 _basever=4.2
-_patchlevel=036 #prepare for some patches
+_patchlevel=037 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
@@ -150,4 +150,6 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
          '7cd9bfdf7cbfd45274d07620ee94c8d9'
          'a7d2eace0da5fd236c93dbfd93458838'
          '9c3142956064d175a880bcb186e51ef9'
-         'a1a87649853f20fe99572ddc02b0c67f')
+         'a1a87649853f20fe99572ddc02b0c67f'
+         'c10692f447d4966c879f8fb8d7c8ebc9'
+         '1bf5e34ad46566bc2d0eb7560ff8968e')
diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD
index b19dfedf5..cf442650b 100644
--- a/testing/bison/PKGBUILD
+++ b/testing/bison/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160796 2012-06-06 02:47:05Z allan $
+# $Id: PKGBUILD 163784 2012-07-20 03:30:35Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 
 pkgname=bison
-pkgver=2.5.1
+pkgver=2.6
 pkgrel=1
 pkgdesc="The GNU general-purpose parser generator"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh')
 groups=('base-devel')
 install=bison.install
 source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('012708d801a3c986d8654aa673530b61'
-         '6c7e9276aa8b89879126a611384897a8')
+md5sums=('f96a16e79daaef71c797ed88f52e59d1'
+         'd67a1a075ab0cccfb53ab23692be1a02')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}  
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
new file mode 100644
index 000000000..8bc1a779a
--- /dev/null
+++ b/testing/glib2/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 163756 2012-07-19 08:05:05Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=glib2
+pkgver=2.32.4
+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' 'libffi')
+makedepends=('pkg-config' 'python2')
+optdepends=('python2: for gdbus-codegen')
+options=('!libtool' '!docs' '!emptydirs')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
+        glib2.sh
+        glib2.csh
+        revert-warn-glib-compile-schemas.patch)
+sha256sums=('a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2'
+            '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
+            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3'
+            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
+
+build() {
+  cd glib-$pkgver
+  patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
+      --sysconfdir=/etc \
+      --with-pcre=system \
+      --disable-fam
+  make
+}
+
+package() {
+  cd glib-$pkgver
+  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
+
+  install -d "$pkgdir/etc/profile.d"
+  install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/"
+  install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/"
+
+  for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
+      chmod -x "$_i"
+  done
+  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
+}
diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh
new file mode 100644
index 000000000..7aa3a2ffa
--- /dev/null
+++ b/testing/glib2/glib2.csh
@@ -0,0 +1 @@
+setenv G_BROKEN_FILENAMES 1
diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh
new file mode 100644
index 000000000..96a056e1e
--- /dev/null
+++ b/testing/glib2/glib2.sh
@@ -0,0 +1 @@
+export G_BROKEN_FILENAMES=1
diff --git a/testing/glib2/revert-warn-glib-compile-schemas.patch b/testing/glib2/revert-warn-glib-compile-schemas.patch
new file mode 100644
index 000000000..75b05103c
--- /dev/null
+++ b/testing/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/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD
new file mode 100644
index 000000000..611780d9b
--- /dev/null
+++ b/testing/gtk2/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 163760 2012-07-19 08:21:49Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gtk2
+pkgname=('gtk2' 'gtk-update-icon-cache')
+pkgver=2.24.11
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
+             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
+options=('!libtool')
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+        xid-collision-debug.patch)
+sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+
+build() {
+    cd "$srcdir/gtk+-$pkgver"
+    patch -Np1 -i "$srcdir/xid-collision-debug.patch"
+
+    CXX=/bin/false ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --with-xinput=yes
+
+    # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+    make
+}
+
+package_gtk2() {
+    pkgdesc="GTK+ is a multi-platform toolkit (v2)"
+    install=gtk2.install
+    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
+    backup=(etc/gtk-2.0/gtkrc)
+    replaces=('gtk2-docs')
+
+    cd "$srcdir/gtk+-$pkgver"
+
+    make DESTDIR="$pkgdir" install
+    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
+    echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
+    #split this out to use with gtk3 too
+    rm $pkgdir/usr/bin/gtk-update-icon-cache
+}
+package_gtk-update-icon-cache() {
+    pkgdesc="The GTK+ update icon cache tool"
+    depends=('gdk-pixbuf2>=2.24.1-3')
+
+    cd "$srcdir/gtk+-$pkgver/gtk"
+
+    install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
+}
diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install
new file mode 100644
index 000000000..a988c645b
--- /dev/null
+++ b/testing/gtk2/gtk2.install
@@ -0,0 +1,16 @@
+post_install() {
+  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null
+  rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
+}
diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch
new file mode 100644
index 000000000..d61238c3b
--- /dev/null
+++ b/testing/gtk2/xid-collision-debug.patch
@@ -0,0 +1,15 @@
+--- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
+@@ -56,10 +56,10 @@
+   if (!display_x11->xid_ht)
+     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+ 					    (GEqualFunc) gdk_xid_equal);
+-
++/*
+   if (g_hash_table_lookup (display_x11->xid_ht, xid))
+     g_warning ("XID collision, trouble ahead");
+-
++*/
+   g_hash_table_insert (display_x11->xid_ht, xid, data);
+ }
+ 
diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD
new file mode 100644
index 000000000..270e6a7aa
--- /dev/null
+++ b/testing/gtk3/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 163763 2012-07-19 08:26:23Z heftig $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=gtk3
+pkgver=3.4.4
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
+arch=('i686' 'x86_64')
+url="http://www.gtk.org/"
+install=gtk3.install
+depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
+makedepends=('gobject-introspection')
+options=('!libtool')
+backup=(etc/gtk-3.0/settings.ini)
+license=('LGPL')
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
+        settings.ini wacom.patch)
+sha256sums=('f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7'
+            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
+            '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5')
+build() {
+    cd "gtk+-$pkgver"
+
+    # Partially revert BGO#673440 in order to fix BGO#674157
+    patch -Np1 -i ../wacom.patch
+
+    CXX=/bin/false ./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
+        --enable-gtk2-dependency \
+        --disable-schemas-compile
+    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+    make
+}
+
+package() {
+    cd "gtk+-$pkgver"
+    make DESTDIR="$pkgdir" install
+
+    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
+}
diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install
new file mode 100644
index 000000000..ca20d2865
--- /dev/null
+++ b/testing/gtk3/gtk3.install
@@ -0,0 +1,16 @@
+post_install() {
+    /usr/bin/gtk-query-immodules-3.0 --update-cache
+    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_remove() {
+    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
+
+post_remove() {
+    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+}
diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini
new file mode 100644
index 000000000..039000d38
--- /dev/null
+++ b/testing/gtk3/settings.ini
@@ -0,0 +1,2 @@
+[Settings]
+gtk-fallback-icon-theme = gnome
diff --git a/testing/gtk3/wacom.patch b/testing/gtk3/wacom.patch
new file mode 100644
index 000000000..79ad84fc6
--- /dev/null
+++ b/testing/gtk3/wacom.patch
@@ -0,0 +1,12 @@
+diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c
+--- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c	2012-05-02 14:45:04.000000000 +0200
++++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c	2012-05-03 18:34:18.034807644 +0200
+@@ -331,6 +331,8 @@
+         input_source = GDK_SOURCE_ERASER;
+       else if (strstr (tmp_name, "cursor"))
+         input_source = GDK_SOURCE_CURSOR;
++      else if (strstr (tmp_name, "finger"))
++        input_source = GDK_SOURCE_TOUCHSCREEN;
+       else if (strstr (tmp_name, "wacom") ||
+                strstr (tmp_name, "pen"))
+         input_source = GDK_SOURCE_PEN;
diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD
index f81f8c530..721a13545 100644
--- a/testing/readline/PKGBUILD
+++ b/testing/readline/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 163215 2012-07-10 21:53:26Z allan $
+# $Id: PKGBUILD 163780 2012-07-20 01:54:37Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=readline
 _basever=6.2
-_patchlevel=003 #prepare for some patches
+_patchlevel=004 #prepare for some patches
 pkgver=$_basever.$_patchlevel
-pkgrel=2
+pkgrel=1
 pkgdesc="GNU readline library"
 arch=('i686' 'x86_64')
 url="http://tiswww.case.edu/php/chet/readline/rltop.html"
@@ -30,7 +30,9 @@ md5sums=('67948acb2ca081f23359d0256e9a271c'
          '0665020ea118e8434bd145fb71f452cc'
          '285361ca6d48c51ae2428157e174e812'
          'c9d5d79718856e711667dede87cb7622'
-         '4437205bb1462f5f32e4812b8292c675')
+         '4437205bb1462f5f32e4812b8292c675'
+         'c08e787f50579ce301075c523fa660a4'
+         '7e39cad1d349b8ae789e4fc33dbb235f')
 
 build() {
   cd ${srcdir}/${pkgname}-$_basever