Tue May 24 22:48:50 UTC 2011

9 files changed, 164 insertions, 81 deletions

diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index 84b0edcf2..39961936b 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 122335 2011-05-03 22:31:33Z ibiru $
+# $Id: PKGBUILD 124622 2011-05-23 14:30:18Z ibiru $
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=banshee
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Music management and playback for GNOME"
 arch=('i686' 'x86_64')
 url="http://banshee.fm/"
 license=('MIT')
-depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'ipod-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp')
+depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp')
 makedepends=('intltool' 'gnome-doc-utils')
 optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
             'gstreamer0.10-ugly-plugins: Extra media codecs'
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index 9463a9277..796d84761 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 102917 2010-12-13 01:30:42Z eric $
+# $Id: PKGBUILD 124586 2011-05-23 05:55:07Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=fetchmail
 pkgver=6.3.19
-pkgrel=1
+pkgrel=2
 pkgdesc="A remote-mail retrieval utility"
-url="http://fetchmail.berlios.de/"
 arch=('i686' 'x86_64')
+url="http://fetchmail.berlios.de/"
+license=('GPL')
 depends=('glibc' 'openssl' 'python2')
-optdepends=('tk: fetchmailconf')
+optdepends=('tk: for using fetchmailconf')
+backup=('etc/conf.d/fetchmail')
 options=('!makeflags')
-license=('GPL')
 install=fetchmail.install
 source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
         fetchmail.rc fetchmail.conf)
-md5sums=('64519711c8533f5a34d20c9ff620d880' '6742e99d65a827bc2b9d6bc8efe269e6'\
+md5sums=('64519711c8533f5a34d20c9ff620d880'
+         '89fdde15bf81b3a5c065949322b5d138'
          '8fcd6a22dfbc247755fdd050c5c5c4d3')
-sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7' '13c7e3c538211c79c5b403f2bfa6712a2ad0ac30'\
-         '30401729386d6f774c6c36ab8530842166de54a8')
+sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7'
+          '910ec21ad0a619db67e4665189dc46d2a0634ea5'
+          '30401729386d6f774c6c36ab8530842166de54a8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
   ./configure --prefix=/usr --with-ssl=/usr
   make
 }
@@ -28,10 +32,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
   install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
   install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
-
-  # "home" directory for pid file.
-  install -d -o 90 -g nobody -m700 "${pkgdir}/var/run/fetchmail"
 }
diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc
index 7c25f72b2..6d453a223 100644
--- a/extra/fetchmail/fetchmail.rc
+++ b/extra/fetchmail/fetchmail.rc
@@ -8,13 +8,12 @@ PID=`pidof -o %PPID /usr/bin/fetchmail`
 case "$1" in
   start)
     stat_busy "Starting fetchmail"
+    [ ! -d /var/run/fetchmail ] && install -d -o fetchmail -g nobody -m700 /var/run/fetchmail
     [ -z "$PID" ] &&
 		su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      #Fetchmail does this for us:
-      #echo $PID > /var/run/fetchmail.pid
       add_daemon fetchmail
       stat_done
     fi
diff --git a/extra/gnome-desktop-sharp/PKGBUILD b/extra/gnome-desktop-sharp/PKGBUILD
index 0ca1779fb..34681fe3f 100644
--- a/extra/gnome-desktop-sharp/PKGBUILD
+++ b/extra/gnome-desktop-sharp/PKGBUILD
@@ -1,16 +1,14 @@
-# $Id: PKGBUILD 121043 2011-04-28 09:15:35Z heftig $
+# $Id: PKGBUILD 124614 2011-05-23 14:21:08Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgname=gnome-desktop-sharp
+pkgbase=gnome-desktop-sharp
+pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
 pkgver=2.26.0
-pkgrel=6
-pkgdesc="GNOME desktop bindings for C#"
+pkgrel=7
 arch=('i686' 'x86_64')
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
-depends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2')
-makedepends=('monodoc' 'libgnomeprintui')
-optdepends=('libgnomeprintui')
+makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libgnomeprintui' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
 	gnome-desktop-sharp-lib-target.patch)
@@ -18,18 +16,72 @@ md5sums=('4bc990900bb318b2ba0b0e7998bb47d1'
          '980cd3adf5e745f4caee0a172a51dcc3')
 
 build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="$srcdir/wapi"
-  mkdir -p "$MONO_SHARED_DIR"
+    export MONO_SHARED_DIR="$srcdir/wapi"
+    mkdir -p "$MONO_SHARED_DIR"
 
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
+    cd "$srcdir/$pkgname-$pkgver"
+    patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch
+    ./configure --prefix=/usr --sysconfdir=/etc
+    make
 }
 
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
-      DESTDIR="$pkgdir" install
+package_gnome-desktop-sharp() {
+    pkgdesc="GNOME desktop bindings for C#"
+    depends=('libgnome-desktop-sharp' 'gnome-print-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
+}
+
+package_libgnome-desktop-sharp() {
+    pkgdesc="Mono bindings for libgnome-desktop"
+    depends=('gtk-sharp-2' 'gnome-desktop2')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C gnomedesktop install DESTDIR="$pkgdir"
+}
+
+package_gnome-print-sharp() {
+    pkgdesc="Mono bindings for libgnomeprint and libgnomeprintui"
+    depends=('art-sharp' 'libgnomeprintui')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C gnomeprint install DESTDIR="$pkgdir"
+}
+
+package_gtkhtml-sharp() {
+    pkgdesc="Mono bindings for gtkhtml"
+    depends=('gtk-sharp-2' 'gtkhtml')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C gtkhtml install DESTDIR="$pkgdir"
+}
+
+package_gtksourceview2-sharp() {
+    pkgdesc="Mono bindings for gtksourceview2"
+    depends=('gtk-sharp-2' 'gtksourceview2')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C gtksourceview install DESTDIR="$pkgdir"
+}
+
+package_rsvg2-sharp() {
+    pkgdesc="Mono bindings for librsvg"
+    depends=('gtk-sharp-2' 'librsvg')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C rsvg install DESTDIR="$pkgdir"
+}
+
+package_vte-sharp() {
+    pkgdesc="Mono bindings for libvte"
+    depends=('gtk-sharp-2' 'vte')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C vte install DESTDIR="$pkgdir"
+}
+
+package_wnck-sharp() {
+    pkgdesc="Mono bindings for libwnck"
+    depends=('gtk-sharp-2' 'libwnck')
+
+    cd "$srcdir/$pkgbase-$pkgver"
+    make -C wnck install DESTDIR="$pkgdir"
 }
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 7b356f790..7517d586b 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 124476 2011-05-22 15:05:01Z ibiru $
+#$Id: PKGBUILD 124609 2011-05-23 13:28:25Z ibiru $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -11,11 +11,14 @@ depends=('dbus-core' 'libgcrypt' 'glib2')
 makedepends=('intltool' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7914ac5edae5e602ba8f7c505ecd18faa84e8482a3f4e6ee0a20aee3a24d6f5d')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        fix_crash.patch)
+sha256sums=('7914ac5edae5e602ba8f7c505ecd18faa84e8482a3f4e6ee0a20aee3a24d6f5d'
+            '4b8c3d9cbc72d171b274e9ad38b01ff9f7ce92beaf1d1e89c54db70d6c4e8a6a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix_crash.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring
diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch
new file mode 100644
index 000000000..1e28cdb73
--- /dev/null
+++ b/extra/libgnome-keyring/fix_crash.patch
@@ -0,0 +1,35 @@
+From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Mon, 23 May 2011 08:58:49 +0000
+Subject: Fix crash from recent memleak fix (b49e32b)
+
+make_attribute_list_va() statically copies the caller's method arguments into
+the GnomeKeyringAttributeList, so we must only free the array itself, not the
+GnomeKeyringAttribute strings.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840
+---
+diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
+index dc271dd..4febf47 100644
+--- a/library/gnome-keyring.c
++++ b/library/gnome-keyring.c
+@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType                  type,
+ 	va_end (args);
+ 
+ 	ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
+-	gnome_keyring_attribute_list_free (attributes);
++	g_array_free (attributes, TRUE);
+ 	return ret;
+ }
+ 
+@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync  (GnomeKeyringItemType        type,
+ 	va_end (args);
+ 
+ 	ret = gnome_keyring_find_items_sync (type, attributes, found);
+-	gnome_keyring_attribute_list_free (attributes);
++	g_array_free (attributes, TRUE);
+ 	return ret;
+ }
+ 
+--
+cgit v0.9
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 3e7cd9f75..3623e1dd5 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 111658 2011-02-28 03:23:17Z allan $
+# $Id: PKGBUILD 124693 2011-05-24 03:40:20Z eric $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libjpeg-turbo
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
 arch=('i686' 'x86_64')
 url="http://libjpeg-turbo.virtualgl.org/"
 license=('GPL' 'custom')
+depends=('glibc')
 makedepends=('nasm')
 provides=('libjpeg=8.0.2')
 conflicts=('libjpeg')
 replaces=('libjpeg')
 options=('!libtool')
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('83e6914a281d649ad289445dc20f9de4')
+md5sums=('03b9c1406c7bfdc204313c2917ce6962')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,6 +29,5 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir/" install
-  install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE
+  install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/libjpeg-turbo/LICENSE"
 }
-
diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index 126f2b0c0..cd9c5a79b 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 63937 2010-01-19 04:44:36Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
+# $Id: PKGBUILD 124594 2011-05-23 08:40:29Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=neverball
 pkgver=1.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
 arch=('i686' 'x86_64')
 url="http://neverball.org/"
 license=('GPL')
-depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg>=7' 'libvorbis' 'physfs')
+depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
 makedepends=('mesa')
 source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz)
 md5sums=('c523b0f72c2035831310e821162f7bd7')
@@ -17,36 +16,31 @@ sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h || return 1
+  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h
 
   if [ "${CARCH}" = "i686" ] ;then
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" || return 1
+    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
   else
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball || return 1
+    make ENABLE_NLS=1 DATADIR=/usr/share/neverball
   fi
+}
 
-  install -D -m755 neverball "${pkgdir}/usr/bin/neverball" || return 1
-  install -D -m755 neverputt "${pkgdir}/usr/bin/neverputt" || return 1
-  install -D -m755 mapc "${pkgdir}/usr/bin/mapc" || return 1
-
-  install -d "${pkgdir}/usr/share/neverball"
-  cp -r data/* "${pkgdir}/usr/share/neverball/" || return 1
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}/usr/bin"
+  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
+  install -d "${pkgdir}"/usr/share/man/man{1,6}
+
+  install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
+  cp -r locale/* "${pkgdir}/usr/share/locale/"
+  cp -r data/* "${pkgdir}/usr/share/neverball/"
+  install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
+  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
+  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
+  install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
+  install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
+
+  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
+  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
   find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
-
-  install -d "${pkgdir}/usr/share/locale"
-  cp -r locale/* "${pkgdir}/usr/share/locale/" || return 1
-
-  install -d "${pkgdir}/usr/share/applications"
-  install -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" || return 1
-  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" || return 1
-  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" || return 1
-  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" || return 1
-
-  install -d "${pkgdir}/usr/share/doc/neverball"
-  install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" || return 1
-
-  install -D -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1/mapc.1" || return 1
-  install -D -m644 dist/neverball.6 "${pkgdir}/usr/share/man/man6/neverball.6" || return 1
-  install -D -m644 dist/neverputt.6 "${pkgdir}/usr/share/man/man6/neverputt.6" || return 1
 }
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index ce7768a7a..d9f3730c9 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 117296 2011-03-30 18:17:00Z schiv $
+# $Id: PKGBUILD 124581 2011-05-23 04:58:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/"
 license=('GPL' 'LGPL')
 depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack')
+makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
 optdepends=('libao: for ao plugin'
             'ffmpeg: for ffmpeg plugin'
             'libmad: for mp3 plugin'
             'libid3tag: for mp3 plugin'
-            'wavpack: for wavpack plugin')
+            'wavpack: for wavpack plugin'
+            'libpulse: for pulse plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee')
@@ -22,6 +23,7 @@ sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am
   ./configure --prefix=/usr --sysconfdir=/etc \
     --with-dyn-default --with-distro="Arch Linux"
   make
@@ -30,6 +32,4 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  ln -sf play "${pkgdir}/usr/bin/rec"
-  ln -sf ../man1/sox.1.gz "${pkgdir}/usr/share/man/man7/soxeffect.7"
 }