Fri Jul 8 23:09:34 UTC 2011

16 files changed, 109 insertions, 53 deletions

diff --git a/community/balsa/PKGBUILD b/community/balsa/PKGBUILD
index 5ca276e96..c0d0468f3 100644
--- a/community/balsa/PKGBUILD
+++ b/community/balsa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48556 2011-06-02 02:30:07Z bfanella $
+# $Id: PKGBUILD 51383 2011-07-08 03:41:33Z bfanella $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=balsa
-pkgver=2.4.9
-pkgrel=4
+pkgver=2.4.10
+pkgrel=1
 pkgdesc="An e-mail client for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,7 +14,7 @@ depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gt
 makedepends=('perlxml' 'gnome-doc-utils' 'intltool' 'namcap')
 install=balsa.install
 source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('bd7ac44f0cf3117a5fdb46d17dac2b51')
+md5sums=('fa2b7cb9d248912ac2e3dcc08cd6aa5b')
 
 build() {
   	cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/fldiff/PKGBUILD b/community/fldiff/PKGBUILD
index 2946ef440..ab25a3240 100644
--- a/community/fldiff/PKGBUILD
+++ b/community/fldiff/PKGBUILD
@@ -1,23 +1,31 @@
-# $Id: PKGBUILD 8588 2010-01-21 01:26:51Z dgriffiths $
+# $Id: PKGBUILD 51104 2011-07-05 09:00:11Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: iztok pizorn <pizorn@gmail.com>
 
 pkgname=fldiff
 pkgver=1.1
-pkgrel=5
+pkgrel=6
 pkgdesc="graphical diff program"
 arch=(i686 x86_64)
 url="http://www.easysw.com/~mike/fldiff/"
-source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz)
 license=('GPL')
 install=fldiff.install
 depends=('diffutils' 'fltk' 'xdg-utils')
-md5sums=('12897c92106fb5d665210a2e82f5cf25')
+source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz
+	build-fix.patch)
+md5sums=('12897c92106fb5d665210a2e82f5cf25'
+         'ea7258e07544b81561c6d76a41c184e7')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 <$srcdir/build-fix.patch
   ./configure --prefix=/usr
-  make || return 1
-  make BUILDROOT=$startdir/pkg install install-desktop || return 1
-  mv `find $startdir/pkg/ -name Development -type d` $startdir/pkg/usr/share/applications
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make BUILDROOT=$pkgdir install install-desktop
+  mv `find $pkgdir/ -name Development -type d` $startdir/pkg/usr/share/applications
 }
diff --git a/community/fldiff/build-fix.patch b/community/fldiff/build-fix.patch
new file mode 100644
index 000000000..bb3e0245e
--- /dev/null
+++ b/community/fldiff/build-fix.patch
@@ -0,0 +1,31 @@
+Only in fldiff-1.1.my: config.log
+Only in fldiff-1.1.my: config.status
+Only in fldiff-1.1.my: DiffChooser.o
+Only in fldiff-1.1.my: DiffOpenWindow.o
+Only in fldiff-1.1.my: DiffView.o
+diff -wbBur fldiff-1.1/DiffWindow.cxx fldiff-1.1.my/DiffWindow.cxx
+--- fldiff-1.1/DiffWindow.cxx	2006-11-13 21:54:02.000000000 +0300
++++ fldiff-1.1.my/DiffWindow.cxx	2011-07-05 12:58:38.000000000 +0400
+@@ -1126,11 +1126,11 @@
+ DiffWindow::save_prefs()
+ {
+   // Save the window prefs for the next run...
+-  prefs_.set("color", color());
+-  prefs_.set("selection_color", selection_color());
++  prefs_.set("color", (int)color());
++  prefs_.set("selection_color", (int)selection_color());
+   prefs_.set("showlinenum", showlinenum());
+   prefs_.set("tabwidth", tabwidth());
+-  prefs_.set("textcolor", textcolor());
++  prefs_.set("textcolor", (int)textcolor());
+   prefs_.set("textsize", textsize());
+   prefs_.set("ignoreblanks", ignoreblanks());
+ }
+Only in fldiff-1.1.my: DiffWindow.o
+Only in fldiff-1.1.my: FavoritesMenu.o
+Only in fldiff-1.1.my: FavoritesWindow.o
+Only in fldiff-1.1.my: fldiff
+Only in fldiff-1.1.my: fldiff.list
+Only in fldiff-1.1.my: fldiff.o
+Only in fldiff-1.1.my: Makefile
+Only in fldiff-1.1.my: PtProcess.o
diff --git a/community/fldiff/fldiff.install b/community/fldiff/fldiff.install
index b4ee8556f..b95cc069d 100644
--- a/community/fldiff/fldiff.install
+++ b/community/fldiff/fldiff.install
@@ -9,4 +9,3 @@ post_upgrade() {
 post_remove() {
   which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
 }
-
diff --git a/community/htmldoc/PKGBUILD b/community/htmldoc/PKGBUILD
index 47f82367b..92622ac08 100644
--- a/community/htmldoc/PKGBUILD
+++ b/community/htmldoc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 15782 2010-04-15 20:40:51Z spupykin $
+# $Id: PKGBUILD 51081 2011-07-05 07:09:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Simon Rutishauser <simon.rutishauser@gmx.ch>
 
 pkgname=htmldoc
 pkgver=1.8.27
-pkgrel=5
+pkgrel=6
 pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices"
 arch=(i686 x86_64)
 url="http://www.htmldoc.org"
@@ -18,7 +18,11 @@ build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   ./configure --prefix=/usr --mandir=${pkgdir}/usr/share/man
   sed -i 's|^bindir.*$|bindir  = ${prefix}/bin|' Makedefs
-  make || return 1
+  make
+}
+
+package() {
+  cd ${startdir}/src/${pkgname}-${pkgver}
   make prefix=${startdir}/pkg/usr install
  # fix freedesktop stuff
   install -Dm 644 desktop/htmldoc-128.png \
diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD
index e65a06b83..56a00339c 100644
--- a/community/libcss/PKGBUILD
+++ b/community/libcss/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libcss
-pkgver=0.0.2
+pkgver=0.1.0
 pkgrel=1
 pkgdesc="A CSS parser and selection engine."
 arch=('i686' 'x86_64')
@@ -10,15 +10,16 @@ url="http://www.netsurf-browser.org/projects/libcss/"
 license=('MIT')
 depends=('libparserutils' 'libwapcaplet')
 source=(http://www.netsurf-browser.org/projects/releases/libcss-${pkgver}-src.tar.gz)
-md5sums=('3bbdd853a2f52db7ab0e2ea3597e62fa')
+md5sums=('47b9bba60fffe16ecebeba578c89fd40')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd ${srcdir}/${pkgname}-${pkgver}-src
+	export CFLAGS="-Wno-error=unused-but-set-variable"
 	make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd ${srcdir}/${pkgname}-${pkgver}-src
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 	install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index b9deb62b4..f3de9ef59 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48795 2011-06-05 19:15:38Z bfanella $
+# $Id: PKGBUILD 51368 2011-07-08 01:02:45Z bfanella $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=libraw
 _pkgbasename=LibRaw
-pkgver=0.13.5
+pkgver=0.13.6
 pkgrel=1
 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom')
 depends=('lcms')
 options=('!makeflags')
 source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('bf6894f6a60b411da012f58a0954e910')
+md5sums=('452bff308af4bfcb9bf1c2fdb0bd0eab')
 
 build() {
   	cd ${srcdir}/${_pkgbasename}-${pkgver}
diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD
index 2eff2bc70..f5d57aa2f 100644
--- a/community/libwapcaplet/PKGBUILD
+++ b/community/libwapcaplet/PKGBUILD
@@ -1,24 +1,25 @@
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=libwapcaplet
-pkgver=0.0.2
+pkgver=0.1.0
 pkgrel=1
 pkgdesc="A string internment library with rapid string comparison."
 arch=('i686' 'x86_64')
 url="http://www.netsurf-browser.org/projects/libwapcaplet/"
 license=('MIT')
 source=(http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('c73b5ff5fce55819cc698e8cb486d5eb')
+md5sums=('c21975b81bcdafa60ad6b97b95925efe')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd ${srcdir}/${pkgname}-${pkgver}-src
 
-	make || return 1
+	make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd ${srcdir}/${pkgname}-${pkgver}-src
 
-	make PREFIX=/usr DESTDIR=${pkgdir} install || return 1
+	make PREFIX=/usr DESTDIR=${pkgdir} install
 	install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
diff --git a/community/mtasc/PKGBUILD b/community/mtasc/PKGBUILD
index 621a27b45..30e3284f8 100644
--- a/community/mtasc/PKGBUILD
+++ b/community/mtasc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 50978 2011-07-04 10:46:29Z spupykin $
+# $Id: PKGBUILD 51324 2011-07-07 13:42:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Niel Drummond <niel.drummond@grumpytoad.org>
 
@@ -11,7 +11,7 @@ url="http://mtasc.org/"
 license=('GPL2')
 depends=('zlib')
 makedepends=('ocaml' 'cvs')
-source=("http://arch.p5n.pp.ru/~sergej/dl/mtasc-$pkgver.tar.gz")
+source=("http://arch.p5n.pp.ru/~sergej/dl/mtasc-$pkgver-1.tar.gz")
 md5sums=('e3b1f31ae906ebbd92678fdac0fdd411')
 
 build() {
diff --git a/community/openmovieeditor/PKGBUILD b/community/openmovieeditor/PKGBUILD
index 00bca41d7..f5edd51ad 100644
--- a/community/openmovieeditor/PKGBUILD
+++ b/community/openmovieeditor/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 9280 2010-01-24 22:58:30Z foutrelis $
+# $Id: PKGBUILD 51110 2011-07-05 10:08:30Z spupykin $
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 # Maintainer: Robert Emil Berge
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 pkgname=openmovieeditor
 pkgver=0.0.20090105
-pkgrel=6
+pkgrel=7
 pkgdesc="A simple video editor"
 arch=('i686' 'x86_64')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
-depends=('libquicktime' 'libsamplerate' 'fltk' 'jack-audio-connection-kit' 'portaudio' 'gmerlin-avdecoder')
+depends=('libquicktime' 'libsamplerate' 'fltk' 'jack' 'portaudio' 'gmerlin-avdecoder')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('ce4f76c0b3e90aabf9c2d5c8dd31e9b1')
 
@@ -17,6 +17,11 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   unset LDFLAGS
 
+  export CFLAGS="$CFLAGS -fpermissive"
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
+  export CPPFLAGS="$CPPFLAGS -fpermissive"
+  sed -i 's|= sizes();|= (short*)sizes();|g' src/Fl_Split.cpp
+
   # Fix missing includes
   sed -e 's|<sstream>|<sstream>\n#include <stdint.h>|' -i src/VideoViewGL.H
   sed -e 's|<string>|<string>\n#include <stdint.h>|' -i src/WaveForm.H 
@@ -25,6 +30,6 @@ build() {
   sed -e 's|<iostream>|<iostream>\n#include <stdio.h>|' -i src/fl_font_browser.h
 
   ./configure --prefix=/usr
-  make || return 1
+  make
   make DESTDIR=$pkgdir install
 }
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index a313aeb8c..57309a0d8 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 50065 2011-06-23 20:33:39Z jlichtblau $
+# $Id: PKGBUILD 51336 2011-07-07 21:24:31Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 # Contributor: <boenki@gmx.de>
 
 pkgname=qlandkartegt
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
         $pkgname-mimetypes.xml)
-sha256sums=('f28b37340a773e466434988e64929b6282e445dc43612fb6c1d991d2d5ff995f'
+sha256sums=('24304fb148651e1e989ff9c15e56e3c6fb5d8b1e16aa70342d73bee86be67da8'
             'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
 
 build() {
diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog
index f2cfbb448..83a7eee92 100644
--- a/community/qlandkartegt/qlandkartegt.changelog
+++ b/community/qlandkartegt/qlandkartegt.changelog
@@ -1,3 +1,6 @@
+2011-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.2.1-1
+
 2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qlandkartegt 1.2.0-1
 
diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD
index 0ed1b484c..98f8bc5cc 100644
--- a/community/ushare/PKGBUILD
+++ b/community/ushare/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 49979 2011-06-22 19:57:08Z spupykin $
+# $Id: PKGBUILD 51319 2011-07-07 10:51:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
 # Contributor: kastor <kastor@fobos.org.ar>
 
 pkgname=ushare
 pkgver=1.1a
-pkgrel=13
+pkgrel=14
 pkgdesc="A free UPnP A/V Media Server for Linux"
 url="http://ushare.geexbox.org"
 license=('GPL2')
@@ -19,35 +19,32 @@ source=("http://ushare.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2"
 	"upnp-build-fix.patch"
 	"ushare-config.patch")
 md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251'
-         '5b8d5ab953dba09f05abd38abef063de'
+         'e3cf0a44b0280da4966177c21e49361c'
          '32c29f9f673e8b3a3d9e7bf5e60febbc'
          '5243475c0cebc5db49296b2f3691085b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
   sed -i -e \
     "s%^INSTALL=\"/usr/bin/install -c\"$%INSTALL=\"$(which install) -c\"%" \
     configure
   patch -p1 <$srcdir/upnp-build-fix.patch
   patch -p1 <$srcdir/ushare-config.patch
-
   ./configure --prefix=/usr --sysconfdir=/etc/ushare \
     --enable-dlna --with-libdlna-dir=/usr/include/libavformat
-
   make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-
   rm -rf ${pkgdir}/etc/${pkgname}/init.d
   install -m 0755 -D ${srcdir}/ushare ${pkgdir}/etc/rc.d/ushare
   install -d -m 0755 ${pkgdir}/etc/conf.d/
   cat >${pkgdir}/etc/conf.d/ushare <<EOF
 #PARAMS="-c /tmp -i eth0"
 PARAMS=
+USHARE_USER=ushare
 EOF
   install -D -m0644 src/ushare.1 $pkgdir/usr/share/man/man1/ushare.1
 }
diff --git a/community/ushare/ushare b/community/ushare/ushare
index 0770d16b9..b545b85d4 100755
--- a/community/ushare/ushare
+++ b/community/ushare/ushare
@@ -7,6 +7,8 @@ DESC="uShare UPnP A/V Media Server"
 [ -r "/etc/ushare/ushare.conf" ] && . /etc/ushare/ushare.conf
 [ -r "/etc/conf.d/ushare" ] && . /etc/conf.d/ushare
 
+[ -z $USHARE_USER ] && USHARE_USER=ushare
+
 # abort if no executable exists
 #[ -x $DAEMON ] || stat_fail
 
@@ -23,7 +25,7 @@ PID=`pidof -o %PPID /usr/bin/ushare`
 case "$1" in
   start)
     stat_busy "Starting $DESC"
-    [ -z "$PID" ] && sudo -u ushare /usr/bin/ushare -D -x $PARAMS
+    [ -z "$PID" ] && sudo -u $USHARE_USER /usr/bin/ushare -D -x $PARAMS
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/community/ushare/ushare.install b/community/ushare/ushare.install
index c51ea621d..ee677c849 100644
--- a/community/ushare/ushare.install
+++ b/community/ushare/ushare.install
@@ -3,7 +3,7 @@ post_install() {
         groupadd ushare
     fi
     if [ -z "`grep '^ushare:' /etc/passwd`" ]; then
-        useradd -d /var/empty -g ushare -s /bin/false ushare
+        useradd -d /var/empty -g ushare -s /sbin/nologin ushare
     fi
 }
 
diff --git a/community/xdiskusage/PKGBUILD b/community/xdiskusage/PKGBUILD
index f73231f15..0ff97363c 100644
--- a/community/xdiskusage/PKGBUILD
+++ b/community/xdiskusage/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 2038 2009-09-07 16:25:48Z spupykin $
+# $Id: PKGBUILD 51101 2011-07-05 08:55:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=xdiskusage
 pkgver=1.48
-pkgrel=5
+pkgrel=6
 pkgdesc="xdiskusage is a user-friendly program to show you what is using up all your disk space"
 arch=('i686' 'x86_64')
 depends=('fltk')
+makedepends=('libxi')
 license=('GPL')
 url="http://xdiskusage.sourceforge.net"
 options=(!emptydirs)
@@ -33,10 +34,14 @@ build() {
 ---
 >   int n = (long long)v;
 EOF
-  
+
   ./configure --prefix=/usr
   install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
-  LDFLAGS=-lXi make || return 1
-  make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install || return 1
+  LDFLAGS=-lXi make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install
   chmod 0644 $pkgdir/usr/share/man/man1/*
 }