Mon Feb 11 00:05:43 PST 2013

10 files changed, 137 insertions, 64 deletions

diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD
index 2c92888db..f11fd95ec 100644
--- a/extra/audiofile/PKGBUILD
+++ b/extra/audiofile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158087 2012-05-02 16:52:54Z schiv $
+# $Id: PKGBUILD 177900 2013-02-10 16:20:23Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=audiofile
-pkgver=0.3.4
+pkgver=0.3.5
 pkgrel=1
 pkgdesc="Silicon Graphics Audio File Library"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('gcc-libs' 'alsa-lib')
 options=('!libtool')
 source=("http://audiofile.68k.org/$pkgname-$pkgver.tar.gz")
-md5sums=('2ed06d64ee552a2ce490f54351b86ccd')
+md5sums=('795d7f5b323876c14c43d2b650b16abd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD
index 1a28c41ce..b420cb566 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -1,47 +1,41 @@
-# $Id: PKGBUILD 167554 2012-10-02 18:35:41Z eric $
+# $Id: PKGBUILD 177853 2013-02-10 10:42:13Z bisson $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=dcraw
-pkgver=9.16
+pkgver=9.17
 pkgrel=1
-pkgdesc="A command line based converter for digicams raw output"
+pkgdesc='Decodes any raw image from any digital camera'
+url='http://www.cybercom.net/~dcoffin/dcraw/'
 arch=('i686' 'x86_64')
-url="http://www.cybercom.net/~dcoffin/dcraw/"
 license=('custom')
 depends=('lcms' 'jasper')
-source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('fb73ca3ccd703bd522a759e0366814f0a3411902')
+source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('11a0b20b8f46950dd94e6c1ada313807049a6b27')
 
 build() {
-  cd "${srcdir}/${pkgname}"
-  gcc ${CFLAGS} -O3 -o dcraw dcraw.c \
-    -Wall -Wno-unused-result -Wno-array-bounds \
-    -lm -ljasper -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\"
+	cd "${srcdir}/${pkgname}"
+	gcc ${CFLAGS} ${LDFLAGS} \
+		-o dcraw dcraw.c \
+		-lm -ljasper -ljpeg -llcms \
+		-DLOCALEDIR=\"/usr/share/locale/\"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-  install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw
-  install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1
-  
-  for langchar in \
-    fr.latin1 it.latin1 de.latin1 pt.latin1 es.latin1 nl.latin1 sv.latin1 \
-    ca.latin1 da.latin1 cs.latin2 hu.latin2 pl.latin2 eo.latin3 ru.koi8-r \
-    zh_TW.big5 zh_CN.gb2312
-  do
-    lang=$(echo $langchar | cut -d. -f1)
-    char=$(echo $langchar | cut -d. -f2-)
-    if [ -f dcraw_${lang}.1 ]; then
-      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang/man1
-      iconv -f utf-8 -t $char dcraw_$lang.1 > "${pkgdir}"/usr/share/man/$lang/man1/dcraw.1
-      mkdir -p -m 755 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1
-      cp dcraw_$lang.1 "${pkgdir}"/usr/share/man/$lang.UTF-8/man1/dcraw.1
-    fi
-    mkdir -p -m 755 "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES
-    msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po
-  done
+	cd "${srcdir}/${pkgname}"
 
-  install -d "${pkgdir}"/usr/share/licenses/${pkgname}
-  head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
+	install -Dm755 dcraw "${pkgdir}"/usr/bin/dcraw
+	install -Dm644 dcraw.1 "${pkgdir}"/usr/share/man/man1/dcraw.1
+	
+	for i in dcraw_*.1; do j=${i#dcraw_}; k=${j%.1}
+		install -Dm644 $i "${pkgdir}"/usr/share/man/$k/man1/dcraw.1
+	done
+
+	for i in dcraw_*.po; do j=${i#dcraw_}; k=${j%.po}
+		install -d "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES
+		msgfmt -o "${pkgdir}"/usr/share/locale/$k/LC_MESSAGES/dcraw.mo $i
+	done
+
+	install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+	head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
 }
diff --git a/extra/gamin/18_gam_server_deadlocks.patch b/extra/gamin/18_gam_server_deadlocks.patch
new file mode 100644
index 000000000..ef7749675
--- /dev/null
+++ b/extra/gamin/18_gam_server_deadlocks.patch
@@ -0,0 +1,70 @@
+From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
+From: Anssi Hannula <anssi@mageia.org>
+Date: Wed, 4 Jan 2012 00:23:55 +0200
+Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
+
+ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
+However, ih_sub_cancel() locks it again, and locking GMutex recursively
+causes undefined behaviour.
+
+Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
+is its only user. Also make the function static so that it won't
+accidentally get used by other files without locking (inotify-helper.h
+is an internal server header).
+
+This should fix the intermittent deadlocks I've been experiencing
+causing KDE applications to no longer start, and probably also
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+
+Origin: http://bugzilla-attachments.gnome.org/attachment.cgi?id=204537
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gamin/+bug/926862
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
+
+---
+ server/inotify-helper.c |    7 ++-----
+ server/inotify-helper.h |    1 -
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/server/inotify-helper.c b/server/inotify-helper.c
+index d77203e..0789fa4 100644
+--- a/server/inotify-helper.c
++++ b/server/inotify-helper.c
+@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
+ 
+ /**
+  * Cancels a subscription which was being monitored.
++ * inotify_lock must be held when calling.
+  */
+-gboolean
++static gboolean
+ ih_sub_cancel (ih_sub_t * sub)
+ {
+-	G_LOCK(inotify_lock);
+-
+-
+ 	if (!sub->cancelled)
+ 	{
+ 		IH_W("cancelling %s\n", sub->pathname);
+@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
+ 		sub_list = g_list_remove (sub_list, sub);
+ 	}
+ 
+-	G_UNLOCK(inotify_lock);
+ 	return TRUE;
+ }
+ 
+diff --git a/server/inotify-helper.h b/server/inotify-helper.h
+index 5d3b6d0..d36b5fd 100644
+--- a/server/inotify-helper.h
++++ b/server/inotify-helper.h
+@@ -34,7 +34,6 @@ gboolean	 ih_startup		(event_callback_t ecb,
+ 					 found_callback_t fcb);
+ gboolean	 ih_running		(void);
+ gboolean	 ih_sub_add		(ih_sub_t *sub);
+-gboolean	 ih_sub_cancel		(ih_sub_t *sub);
+ 
+ /* Return FALSE from 'f' if the subscription should be cancelled */
+ void		 ih_sub_foreach		(void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
+-- 
+1.7.7.2
+
diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD
index aaad6ef5a..a039cbfef 100644
--- a/extra/gamin/PKGBUILD
+++ b/extra/gamin/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=gamin
 pkgver=0.1.10
-pkgrel=6
+pkgrel=7
 pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor)'
 url='http://www.gnome.org/~veillard/gamin'
 license=('GPL')
@@ -17,13 +17,18 @@ optdepends=('python2: for the python module.')
 provides=('fam')
 conflicts=('fam')
 source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"
-        'fix-deprecated-const.patch')
+        'fix-deprecated-const.patch'
+        '18_gam_server_deadlocks.patch')
 md5sums=('b4ec549e57da470c04edd5ec2876a028'
-         'f679aeb48fe9dd376c8828cc9b6941ab')
+         'f679aeb48fe9dd376c8828cc9b6941ab'
+         '4784359a3206bfa3c0dce1c23468f87f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # https://bugs.archlinux.org/task/33642
+  patch -p1 -i "${srcdir}"/18_gam_server_deadlocks.patch
+
   patch -p1 -i "${srcdir}"/fix-deprecated-const.patch
 
   # python 2
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 0ec9d94df..9703e1d54 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177035 2013-02-04 17:30:30Z andyrtr $
+# $Id: PKGBUILD 177918 2013-02-10 18:54:41Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.1.7
+pkgver=3.1.8
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ options=('!libtool' '!zipman')
 depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
 makedepends=('valgrind' 'strace' 'datefudge')
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('95c96dfaba0e82e9e6bcb67eab5abf49'
-         'ea9d8c24c1ac2654ae9fe87f69b45e17')
+md5sums=('ffac9e22aba66057d5155ad0e3b62485'
+         'f3f0f2b81fa62bbe878a181d87a9cabd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 1906ba9ec..86ece58f5 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172917 2012-12-06 20:16:10Z heftig $
+# $Id: PKGBUILD 177873 2013-02-10 13:29:01Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.14
+pkgver=2.24.15
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -13,7 +13,7 @@ options=('!libtool')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
         xid-collision-debug.patch)
-sha256sums=('8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac'
+sha256sums=('d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 build() {
diff --git a/extra/lablgtk/PKGBUILD b/extra/lablgtk/PKGBUILD
index 786cde45c..14a367a94 100644
--- a/extra/lablgtk/PKGBUILD
+++ b/extra/lablgtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149580 2012-02-08 15:00:33Z tpowa $
+# $Id: PKGBUILD 177911 2013-02-10 17:58:16Z eric $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk
@@ -15,11 +15,15 @@ source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$pkgname-$pkgver.tar.
 md5sums=('73a797e3a459190fdcaa8288935f6fb9')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
   make configure 
   make 
   make opt 
-  make  PREFIX=$pkgdir/usr LIBDIR=$pkgdir/usr/lib/ocaml BINDIR=$pkgdir/usr/bin \
-    INSTALLDIR=$pkgdir/usr/lib/ocaml/lablgtk DLLDIR=$pkgdir/usr/lib/ocaml/stublibs install
-  rm -r $pkgdir/usr/bin
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make  PREFIX="$pkgdir"/usr LIBDIR="$pkgdir"/usr/lib/ocaml BINDIR="$pkgdir"/usr/bin \
+    INSTALLDIR="$pkgdir"/usr/lib/ocaml/lablgtk DLLDIR="$pkgdir"/usr/lib/ocaml/stublibs install
+  rm -r "$pkgdir"/usr/bin
 }
diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD
index 4c1b04396..5f5cfc45b 100644
--- a/extra/mysql-python/PKGBUILD
+++ b/extra/mysql-python/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 151041 2012-02-24 14:12:17Z pierre $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# $Id: PKGBUILD 177920 2013-02-10 18:57:08Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=mysql-python
-pkgver=1.2.3
-pkgrel=3
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="MySQL support for Python"
 arch=("i686" "x86_64")
 url="http://mysql-python.sourceforge.net/"
 license=('GPL2')
 depends=('python2' 'libmysqlclient')
 makedepends=('mysql' 'python2-distribute')
-source=("http://downloads.sourceforge.net/${pkgname}/MySQL-python-${pkgver}.tar.gz")
-md5sums=('215eddb6d853f6f4be5b4afc4154292f')
+source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip")
+md5sums=('ddf2386daf10a97af115ffad2ed4a9a0')
 
 package() {
   cd ${srcdir}/MySQL-python-${pkgver}
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index a0a4c1dd8..67b9d5114 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175029 2013-01-12 08:15:09Z andyrtr $
+# $Id: PKGBUILD 177916 2013-02-10 18:36:01Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.22.0
+pkgver=0.22.1
 pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,12 +13,13 @@ url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('c7038be37a7d446544e83a7df3c26196'
+md5sums=('50c259fdda538c1ba94b62aa25f7ec87'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
+  sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
 
   autoreconf -fi
 
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index 97b7c82f7..7556b9fbe 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171550 2012-11-19 03:46:19Z schiv $
+# $Id: PKGBUILD 177901 2013-02-10 16:20:49Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=13.2
+pkgver=13.4
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
@@ -17,13 +17,12 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
 install=$pkgname.install
 source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
-md5sums=('303df8ac9e6d777e480e24b65a3bfaad')
+md5sums=('cd19a0749f57baec94dbac2b4f98d9cb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # execstack is probably due to gmp; this is here just for a reminder
-  #LDFLAGS+=" -Wl,-z,noexecstack"
+  LDFLAGS+=" -Wl,-z,noexecstack"
 
   ./configure --prefix=/usr \
               --with-alsa \