Thu Nov 17 23:14:48 UTC 2011

5 files changed, 61 insertions, 29 deletions

diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 0053d4c6e..b80c5a332 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137100 2011-09-06 08:10:20Z bisson $
+# $Id: PKGBUILD 142846 2011-11-16 23:53:56Z ibiru $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -6,8 +6,8 @@
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.1
-_pkgver=9.8.1
+pkgver=9.8.1.P1
+_pkgver=9.8.1-P1
 pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
@@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c'
+sha1sums=('1cff6594aa185d84942edd2f3cc06dff9cebb04b'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
           'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb'
           '18f477f510df31e6c6f547ee2d5fc46e973479bf'
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 2de31d047..dc8cc3ea2 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 142534 2011-11-11 18:06:50Z ibiru $
+# $Id: PKGBUILD 142844 2011-11-16 23:13:07Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.8
-pkgrel=1
+pkgrel=2
 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' '!docs')
 license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch)
+source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
+        xid-collision-debug.patch
+        revert-iconview.patch)
 sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba')
 
 build() {
-    cd "${srcdir}/gtk+-${pkgver}"
-    patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+    cd "$srcdir/gtk+-$pkgver"
+    patch -Np1 -i "$srcdir/xid-collision-debug.patch"
+    patch -Np1 -i "$srcdir/revert-iconview.patch"
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
@@ -37,19 +40,19 @@ package_gtk2() {
     depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
     backup=(etc/gtk-2.0/gtkrc)
 
-    cd "${srcdir}/gtk+-${pkgver}"
+    cd "$srcdir/gtk+-$pkgver"
 
-    make DESTDIR="${pkgdir}" install
+    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"
+    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
+    rm $pkgdir/usr/bin/gtk-update-icon-cache
 }
 package_gtk-update-icon-cache() {
     pkgdesc="The GTK+ update icon cache tool"
     depends=('gdk-pixbuf2')
 
-    cd "${srcdir}/gtk+-${pkgver}/gtk"
+    cd "$srcdir/gtk+-$pkgver/gtk"
 
-    install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
+    install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
 }
diff --git a/extra/gtk2/revert-iconview.patch b/extra/gtk2/revert-iconview.patch
new file mode 100644
index 000000000..e16fc38e3
--- /dev/null
+++ b/extra/gtk2/revert-iconview.patch
@@ -0,0 +1,30 @@
+From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Wed, 16 Nov 2011 22:38:45 +0000
+Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel"
+
+It makes GtkIconView segfault on GTK 2.24.
+
+gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if
+there's a layout queued anyway, so we wouldn't end up in the same
+situation causing the crash the original patch is supposed to fix.
+
+This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663138
+---
+diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
+index 62877fa..54b3f3b 100644
+--- a/gtk/gtkiconview.c
++++ b/gtk/gtkiconview.c
+@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
+ 
+       gtk_icon_view_build_items (icon_view);
+ 
+-      gtk_icon_view_layout (icon_view);
++      gtk_icon_view_queue_layout (icon_view);
+     }
+ 
+   g_object_notify (G_OBJECT (icon_view), "model");  
+--
+cgit v0.9.0.2
diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD
index 6317b615b..8ab1a372a 100644
--- a/extra/libdvdcss/PKGBUILD
+++ b/extra/libdvdcss/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102948 2010-12-13 12:51:30Z stephane $
+# $Id: PKGBUILD 142850 2011-11-17 01:39:31Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 # Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdcss
-pkgver=1.2.10
-pkgrel=2
+pkgver=1.2.11
+pkgrel=1
 pkgdesc="A portable abstraction library for DVD decryption"
 url="http://www.videolan.org/libdvdcss"
 arch=('i686' 'x86_64')
@@ -13,8 +13,7 @@ license=('GPL')
 depends=('glibc')
 options=('!libtool')
 source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7c933d011e34c218048d48f0c1a8b4ff56798dcd')
-
+sha512sums=('32dec992cf2f352a09c4edc39ea16101fc9005f3aecc43460aa1b5834c104d3f2c1efc81051339fa18fd4f33cfa949fd17ffe84414519a92b91d0d8a1ae4c467')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index 47d75a2e2..4c4c8d244 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 140370 2011-10-11 21:30:03Z jgc $
+# $Id: PKGBUILD 142834 2011-11-16 13:12:15Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
-pkgver=0.11.1
-pkgrel=3
+pkgver=0.12.0
+pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64')
 url="http://linuxwacom.sourceforge.net/"
 license=('GPL')
 backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=('libxi' 'libxrandr')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libxext' 'libxi')
-conflicts=('xorg-server<1.10.99.902')
+depends=('libxi' 'libxrandr' 'libxinerama')
+makedepends=('xorg-server-devel>=1.11.0' 'libxext')
+conflicts=('xorg-server<1.11.0')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         70-wacom.rules)
-md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
+md5sums=('e1c41d143d5040982ae050c7ef9039e3'
          '10db4f8272286690255c1bcc18bfdd92')
 
 build() {