Sat Jul 14 00:01:45 UTC 2012

10 files changed, 120 insertions, 32 deletions

diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD
index a7e1c99d5..8d245b7b4 100644
--- a/extra/gnome-screensaver/PKGBUILD
+++ b/extra/gnome-screensaver/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162983 2012-07-04 16:51:30Z ibiru $
+# $Id: PKGBUILD 163480 2012-07-12 19:58:42Z ibiru $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-screensaver
-pkgver=3.4.2
+pkgver=3.4.3
 pkgrel=1
 pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ options=(!emptydirs)
 install=gnome-screensaver.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
        gnome-screensaver.pam)
-sha256sums=('17e6585e27019200dd059f9f9495427b64aded8efa51c71018fe66f9ba45df6d'
+sha256sums=('76bea2526c6065e5d182e23fda8e75eb2e0afe9d1d40301b019a3cfc39d95a3e'
             'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
 
 build() {
diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD
index c73032877..05a453a1c 100644
--- a/extra/hyphen/PKGBUILD
+++ b/extra/hyphen/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 162738 2012-06-29 10:59:41Z andyrtr $
+# $Id: PKGBUILD 163474 2012-07-12 19:03:03Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase=hyphen
 pkgname=('hyphen' 'hyphen-en')
-pkgver=2.8.4
+pkgver=2.8.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://hunspell.sf.net"
 license=('GPL' 'LGPL' 'MPL')
-groups=()
 makedepends=('glibc' 'perl')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a2f6010987e1c601274ab5d63b72c944')
+md5sums=('15cf1c2e54869fefcdc4b8f9cca68633')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 9dad0740b..4903f12db 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161903 2012-06-16 12:11:28Z ibiru $
+# $Id: PKGBUILD 163468 2012-07-12 16:40:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -13,9 +13,9 @@ if [ "${_git}" = "true" ]; then
     pkgver=7.10.99.git20110709
     #pkgver=7.11
   else
-    pkgver=8.0.3
+    pkgver=8.0.4
 fi
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
@@ -35,7 +35,7 @@ if [ "${_git}" = "true" ]; then
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
          'c452ed3392468170726c004c2f4e02ca'
-         'cc5ee15e306b8c15da6a478923797171')
+         'd546f988adfdf986cff45b1efa2d8a46')
 
 build() {
     cd ${srcdir}/?esa-*
diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD
index 2509d8bb0..2e9f8c08e 100644
--- a/extra/nettle/PKGBUILD
+++ b/extra/nettle/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140462 2011-10-15 08:19:09Z andyrtr $
+# $Id: PKGBUILD 163476 2012-07-12 19:05:48Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=nettle
-pkgver=2.4
+pkgver=2.5
 pkgrel=1
 pkgdesc="A low-level cryptographic library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL2')
 install=$pkgname.install
 depends=('gmp')
 source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz)
-md5sums=(''450be8c4886d46c09f49f568ad6fa013'')
+md5sums=('d66882e6ad31a9f651b73d7a1a93bd4c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/nouveau-dri/PKGBUILD b/extra/nouveau-dri/PKGBUILD
index e4066e945..ad1daa62a 100644
--- a/extra/nouveau-dri/PKGBUILD
+++ b/extra/nouveau-dri/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161906 2012-06-16 12:11:45Z ibiru $
+# $Id: PKGBUILD 163472 2012-07-12 17:49:23Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=nouveau-dri
-pkgver=8.0.3
-pkgrel=3
+pkgver=8.0.4
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
@@ -16,7 +16,7 @@ source=(LICENSE
 )
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
          'c452ed3392468170726c004c2f4e02ca'
-         'cc5ee15e306b8c15da6a478923797171')
+         'd546f988adfdf986cff45b1efa2d8a46')
 
 build() {
     cd ${srcdir}/?esa-*
diff --git a/extra/stardict/PKGBUILD b/extra/stardict/PKGBUILD
index 8ce7a50e8..09b9aa4d5 100644
--- a/extra/stardict/PKGBUILD
+++ b/extra/stardict/PKGBUILD
@@ -1,31 +1,37 @@
-# $Id: PKGBUILD 131980 2011-07-18 15:27:26Z bisson $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 163464 2012-07-12 12:42:33Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Neil Lin <neil@vip.url.com.tw>
 
 pkgname=stardict
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc='International dictionary software'
 arch=('i686' 'x86_64')
 url='http://www.stardict.org/'
 license=('GPL')
 depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
-makedepends=('intltool' 'popt' 'gnome-doc-utils' 'libmysqlclient')
+makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient')
 options=('!libtool' '!emptydirs')
 source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2"
-        'NetDictRequests.patch'
-        'gcc46.patch')
+        'crash-empty-dict.patch'
+        'gcc46.patch'
+        'glib2.patch'
+        'zlib.patch')
 sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f'
           '97af8fdb73c8f04674234b629c6867254e9bd043'
-          '6605a9cdfc4abc2a0ab4462d1228233d34806f0a')
+          '6605a9cdfc4abc2a0ab4462d1228233d34806f0a'
+          '467880bca5e89aa25cb4a57a9e1caba9a8841822'
+          '024ac5eb75a11c96569e31021a4bd65463b3cf5b')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# ugly hack to avoid crashing with empty dictionaries
-	patch -p1 -i ../NetDictRequests.patch
+	patch -p1 -i ../crash-empty-dict.patch
 	patch -p1 -i ../gcc46.patch
-	automake
+	patch -p1 -i ../glib2.patch
+	patch -p1 -i ../zlib.patch
+	./autogen.sh # gnome-autogen.sh requires gnome-common
 
 	./configure \
 		PKG_CONFIG=/usr/bin/pkg-config \
diff --git a/extra/stardict/crash-empty-dict.patch b/extra/stardict/crash-empty-dict.patch
new file mode 100644
index 000000000..4d6fe145a
--- /dev/null
+++ b/extra/stardict/crash-empty-dict.patch
@@ -0,0 +1,12 @@
+diff -aur old/dict/src/lib/compositelookup.cpp new/dict/src/lib/compositelookup.cpp
+--- old/dict/src/lib/compositelookup.cpp	2011-07-02 23:58:40.000000000 -0700
++++ new/dict/src/lib/compositelookup.cpp	2011-07-18 07:40:01.795710505 -0700
+@@ -50,7 +50,7 @@
+ void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key)
+ {
+ 	NetDictRequest request(dict_id, key);
+-	g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request));
++	std::find(NetDictRequests.begin(), NetDictRequests.end(), request);
+ 	NetDictRequests.push_back(request);
+ }
+ 
diff --git a/extra/stardict/glib2.patch b/extra/stardict/glib2.patch
new file mode 100644
index 000000000..6296dab0d
--- /dev/null
+++ b/extra/stardict/glib2.patch
@@ -0,0 +1,36 @@
+diff -Naur old/dict/configure.ac new/dict/configure.ac
+--- old/dict/configure.ac	2011-07-03 16:58:40.000000000 +1000
++++ new/dict/configure.ac	2012-07-12 22:31:52.875176842 +1000
+@@ -266,6 +266,9 @@
+ fi
+ AC_SUBST(WIKI_PARSEDATA_PLUGIN_DIR)
+ 
++GMODULE2_LIBS=`pkg-config --libs gmodule-2.0`
++AC_SUBST([GMODULE2_LIBS])
++
+ dnl ================================================================
+ dnl main program checks.
+ dnl ================================================================
+diff -Naur old/dict/src/Makefile.am new/dict/src/Makefile.am
+--- old/dict/src/Makefile.am	2011-07-03 16:58:40.000000000 +1000
++++ new/dict/src/Makefile.am	2012-07-12 22:29:53.714870692 +1000
+@@ -33,7 +33,7 @@
+ stardict_DEPENDENCIES = lib/libstardict.la $(LOCAL_SIGCPP_LIBFILE)
+ stardict_LDFLAGS = 
+ ## place libstardict.la before any system library, otherwise build with --as-needed linker option may fail
+-stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE)
++stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) $(GMODULE2_LIBS)
+ 
+ if !GNOME_SUPPORT
+ if MAEMO_SUPPORT
+diff -Naur old/dict/src/tomboykeybinder.h new/dict/src/tomboykeybinder.h
+--- old/dict/src/tomboykeybinder.h	2011-07-03 16:58:40.000000000 +1000
++++ new/dict/src/tomboykeybinder.h	2012-07-12 22:28:04.337920391 +1000
+@@ -21,7 +21,6 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/extra/stardict/zlib.patch b/extra/stardict/zlib.patch
new file mode 100644
index 000000000..eb5a9a12a
--- /dev/null
+++ b/extra/stardict/zlib.patch
@@ -0,0 +1,35 @@
+diff -Naur old/lib/src/libcommon.cpp new/lib/src/libcommon.cpp
+--- old/lib/src/libcommon.cpp	2012-07-12 11:33:30.343333334 +0000
++++ new/lib/src/libcommon.cpp	2012-07-12 11:34:05.006568754 +0000
+@@ -614,7 +614,7 @@
+ 		return EXIT_FAILURE;
+ 	}
+ 	while(true) {
+-		len = gzread(get_impl(in), buf, buffer_size);
++		len = gzread((gzFile)get_impl(in), buf, buffer_size);
+ 		if(len < 0) {
+ 			g_critical(read_file_err, arch_file_name, "");
+ 			return EXIT_FAILURE;
+@@ -871,3 +871,8 @@
+ 		return res;
+ 	}
+ }
++
++int gzclose_compat(void * file)
++{
++    return gzclose ((gzFile)file);
++}
+diff -Naur old/lib/src/libcommon.h new/lib/src/libcommon.h
+--- old/lib/src/libcommon.h	2012-07-12 11:33:30.343333334 +0000
++++ new/lib/src/libcommon.h	2012-07-12 11:34:05.006568754 +0000
+@@ -187,8 +187,9 @@
+ 	typedef ResourceWrapper<FILE, FILE*, int, fclose> File;
+ }
+ 
++extern int gzclose_compat(void * file);
+ namespace zip {
+-typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
++typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile;
+ }
+ 
+ /* Create a new temporary file. Return file name in file name encoding.
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index 07fabd1ee..8e81fe712 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158905 2012-05-12 20:58:34Z andyrtr $
+# $Id: PKGBUILD 163478 2012-07-12 19:09:28Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
-pkgver=0.15.0
+pkgver=0.16.0
 pkgrel=1
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64')
@@ -17,8 +17,8 @@ conflicts=('xorg-server<1.12.0')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         70-wacom.rules)
-sha1sums=('6e8e4fa2ccc2448cae97119c6f2842fe283f9b29'
-          '7cebb94459f9cf49693e65215f3af59cea5e2b73')
+md5sums=('aeee2bd339c825a9b1215df6a2e5e50b'
+         '10db4f8272286690255c1bcc18bfdd92')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"