Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts: community-testing/percona-server/PKGBUILD community/libdnet/PKGBUILD extra/libxfce4ui/PKGBUILD extra/libxi/PKGBUILD extra/live-media/PKGBUILD extra/python-urwid/PKGBUILD extra/qtwebkit/PKGBUILD extra/rhythmbox/PKGBUILD extra/xfconf/PKGBUILD kde-unstable/kactivities/PKGBUILD kde-unstable/kdeaccessibility-jovie/PKGBUILD kde-unstable/kdeaccessibility-kaccessible/PKGBUILD kde-unstable/kdeaccessibility-kmag/PKGBUILD kde-unstable/kdeaccessibility-kmousetool/PKGBUILD kde-unstable/kdeaccessibility-kmouth/PKGBUILD kde-unstable/kdeadmin/PKGBUILD kde-unstable/kdeartwork/PKGBUILD kde-unstable/kdebase-konsole/PKGBUILD kde-unstable/kdebase-runtime/PKGBUILD kde-unstable/kdebase-workspace/PKGBUILD kde-unstable/kdebase/PKGBUILD kde-unstable/kdebindings-kimono/PKGBUILD kde-unstable/kdebindings-kross/PKGBUILD kde-unstable/kdebindings-perlkde/PKGBUILD kde-unstable/kdebindings-perlqt/PKGBUILD kde-unstable/kdebindings-python/PKGBUILD kde-unstable/kdebindings-qtruby/PKGBUILD kde-unstable/kdebindings-qyoto/PKGBUILD kde-unstable/kdebindings-smokegen/PKGBUILD kde-unstable/kdebindings-smokekde/PKGBUILD kde-unstable/kdebindings-smokeqt/PKGBUILD kde-unstable/kdeedu-analitza/PKGBUILD kde-unstable/kdeedu-blinken/PKGBUILD kde-unstable/kdeedu-cantor/PKGBUILD kde-unstable/kdeedu-kalgebra/PKGBUILD kde-unstable/kdeedu-kalzium/PKGBUILD kde-unstable/kdeedu-kanagram/PKGBUILD kde-unstable/kdeedu-kbruch/PKGBUILD kde-unstable/kdeedu-kgeography/PKGBUILD kde-unstable/kdeedu-khangman/PKGBUILD kde-unstable/kdeedu-kig/PKGBUILD kde-unstable/kdeedu-kiten/PKGBUILD kde-unstable/kdeedu-klettres/PKGBUILD kde-unstable/kdeedu-kmplot/PKGBUILD kde-unstable/kdeedu-kstars/PKGBUILD kde-unstable/kdeedu-ktouch/PKGBUILD kde-unstable/kdeedu-kturtle/PKGBUILD kde-unstable/kdeedu-kwordquiz/PKGBUILD kde-unstable/kdeedu-marble/PKGBUILD kde-unstable/kdeedu-parley/PKGBUILD kde-unstable/kdeedu-rocs/PKGBUILD kde-unstable/kdeedu-step/PKGBUILD kde-unstable/kdegames/PKGBUILD kde-unstable/kdegraphics-gwenview/PKGBUILD kde-unstable/kdegraphics-kamera/PKGBUILD kde-unstable/kdegraphics-kcolorchooser/PKGBUILD kde-unstable/kdegraphics-kgamma/PKGBUILD kde-unstable/kdegraphics-kolourpaint/PKGBUILD kde-unstable/kdegraphics-kruler/PKGBUILD kde-unstable/kdegraphics-ksaneplugin/PKGBUILD kde-unstable/kdegraphics-ksnapshot/PKGBUILD kde-unstable/kdegraphics-mobipocket/PKGBUILD kde-unstable/kdegraphics-okular/PKGBUILD kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD kde-unstable/kdegraphics-svgpart/PKGBUILD kde-unstable/kdegraphics-thumbnailers/PKGBUILD kde-unstable/kdelibs/PKGBUILD kde-unstable/kdemultimedia/PKGBUILD kde-unstable/kdenetwork/PKGBUILD kde-unstable/kdepim-runtime/PKGBUILD kde-unstable/kdepim/PKGBUILD kde-unstable/kdepimlibs/PKGBUILD kde-unstable/kdeplasma-addons/PKGBUILD kde-unstable/kdesdk-kate/PKGBUILD kde-unstable/kdesdk-kate/kdesdk-kate.install kde-unstable/kdesdk/PKGBUILD kde-unstable/kdetoys/PKGBUILD kde-unstable/kdeutils-filelight/PKGBUILD kde-unstable/kdeutils-kcalc/PKGBUILD kde-unstable/kdeutils-kcharselect/PKGBUILD kde-unstable/kdeutils-kdf/PKGBUILD kde-unstable/kdeutils-kfloppy/PKGBUILD kde-unstable/kdeutils-kgpg/PKGBUILD kde-unstable/kdeutils-kremotecontrol/PKGBUILD kde-unstable/kdeutils-ktimer/PKGBUILD kde-unstable/kdeutils-kwallet/PKGBUILD kde-unstable/kdeutils-printer-applet/PKGBUILD kde-unstable/kdeutils-superkaramba/PKGBUILD kde-unstable/kdeutils-sweeper/PKGBUILD kde-unstable/kdewebdev/PKGBUILD kde-unstable/libkdcraw/PKGBUILD kde-unstable/libkdeedu/PKGBUILD kde-unstable/libkexiv2/PKGBUILD kde-unstable/libkipi/PKGBUILD kde-unstable/libksane/PKGBUILD multilib/lib32-attr/PKGBUILD multilib/lib32-libldap/PKGBUILD multilib/lib32-libxi/PKGBUILD ~lukeshu/android-udev/51-android.rules ~lukeshu/android-udev/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2011-12-26 17:57:29 +0100
committer: Michał Masłowski <mtjm@mtjm.eu> 2011-12-26 17:57:29 +0100
commit: 025f5565da8ee014457f56851fca55c36619787c (patch)
tree: 1705231f784a4ec514287e99d3967b3495dacc23 /community
parent: d4891d626bd0699dafdcfa776ad0ee48df04f2d4 (diff)
parent: e39d5f838c08b5b57eae4c1aec4ae00acd18b239 (diff)
26 files changed, 273 insertions, 99 deletions
diff --git a/community/bibletime/PKGBUILD b/community/bibletime/PKGBUILD
index 069524e3e..057c61125 100644
--- a/community/bibletime/PKGBUILD
+++ b/community/bibletime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61103 2011-12-21 20:53:10Z andrea $
+# $Id: PKGBUILD 61169 2011-12-23 14:46:29Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de>
 pkgname=bibletime
-pkgver=2.9.0
-pkgrel=2
+pkgver=2.9.1
+pkgrel=1
 pkgdesc="Bible study tool for KDE4"
 arch=('x86_64' 'i686')
 url="http://www.bibletime.info/"
@@ -12,13 +12,15 @@ depends=('qt' 'sword' 'openssl' 'clucene' 'qtwebkit')
 makedepends=('cmake' 'boost-libs')
 install=$pkgname.install
 source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('0190b64de5892fc5f45e9a3d46bb29d6')
+sha256sums=('308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_BUILD_TYPE=Release "$srcdir/$pkgname-$pkgver"
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+	  -DCMAKE_BUILD_TYPE=Release \
+    "$srcdir/$pkgname-$pkgver"
   make
 }
 
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 5bda97fa5..fa28ea23d 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60656 2011-12-16 15:19:32Z giovanni $
+# $Id: PKGBUILD 61189 2011-12-24 00:16:51Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.31
+pkgver=0.8.32
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -21,7 +21,7 @@ install=calibre.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('c2373e34d83b81a321cebea043d5f160'
+md5sums=('ee973514615fc104be7cc41adf0862a6'
          '253ce4fe5d01f8ff76b63cd3825755ea'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 6bf329e70..4403207ff 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58992 2011-11-20 19:44:35Z spupykin $
+# $Id: PKGBUILD 61213 2011-12-24 17:41:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
@@ -6,16 +6,16 @@
 pkgname=darktable
 pkgver=0.9.3
 _pkgver=0.9
-pkgrel=3
+pkgrel=4
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
 license=('GPL3')
 depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib'
 	 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3')
-makedepends=('intltool>=0.40' 'cmake')
+makedepends=('intltool>=0.40' 'cmake' 'librsvg')
 #	     'gnome-doc-utils' 'libxslt' 'fop')
-optdepends=( 'librsvg')
+optdepends=('librsvg')
 install=darktable.install
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD
index c6597a9ac..8af32da0d 100644
--- a/community/dia/PKGBUILD
+++ b/community/dia/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 57536 2011-10-30 12:24:25Z ttopper $
+# $Id: PKGBUILD 61137 2011-12-22 11:13:11Z spupykin $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 
 pkgname=dia
-pkgver=0.97.1
-pkgrel=5
+pkgver=0.97.2
+pkgrel=1
 pkgdesc="A GTK+ based diagram creation program"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -16,9 +16,9 @@ depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2')
 makedepends=('intltool' 'python2' 'docbook-xsl')
 optdepends=('python2')
 options=('!libtool' 'docs')
-source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.bz2"
+source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz"
 	"dia-overflow-fix.patch")
-md5sums=('57e44bb9f387559a0506b52a134deaf0'
+md5sums=('1e1180a513fb567709b09bc19f12105e'
          '8fd9a2ad35b5a6fd8c758d7c73dbfe66')
 
 build() {
@@ -26,7 +26,7 @@ build() {
 
   export PYTHON=/usr/bin/python2
   sed -i 's#python2\.1#python2 python2.1#' configure
-  patch -p1 <$srcdir/dia-overflow-fix.patch
+#  patch -p1 <$srcdir/dia-overflow-fix.patch
 
   ./configure --prefix=/usr \
     --with-cairo \
diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD
index 85eb1d089..387f78b70 100644
--- a/community/freedroidrpg/PKGBUILD
+++ b/community/freedroidrpg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60343 2011-12-11 19:59:55Z spupykin $
+# $Id: PKGBUILD 61165 2011-12-23 11:47:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: nut543 <kfs1@online.no>
 
 #pkgbase=freedroidrpg
 #pkgname=('freedroidrpg' 'freedroidrpg-data')
 pkgname='freedroidrpg'
-pkgver=0.15rc2
+pkgver=0.15
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data')
@@ -17,7 +17,7 @@ license=("GPL")
 source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz
 	freedroidrpg.jpg
 	freedroidrpg.desktop)
-md5sums=('0e098aae0b16b6f87ffe5f7932580491'
+md5sums=('003a3f34619cfaa87add2030fea5d120'
          'b73d9dac44c7e83a6c80fbe4eb96ba79'
          '9a10c2a2064439cdcff5b945dfb1c3ac')
 
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index e0d056345..c5dc7c94b 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61105 2011-12-21 20:56:54Z andrea $
+# $Id: PKGBUILD 61221 2011-12-24 21:45:52Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -12,8 +12,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=2.99.6
-pkgrel=5
+pkgver=2.99.7
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
@@ -27,7 +27,7 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
         'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('746aaae5494c4b267bdae802c5c006d5'
+md5sums=('674f73cd7d4d37b3c62a4b9261dadb5d'
          'b284be39d147ec799f1116a6abc068b4'
          'b5cc403990f31b8ea1c5cf37366d3d29')
 
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index abb7ae4ed..0a2ae1e12 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60124 2011-12-05 19:50:21Z ibiru $
+# $Id: PKGBUILD 61211 2011-12-24 17:06:50Z ttopper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3-wm
 _pkgsourcename=i3
-pkgver=4.1
-pkgrel=2
+pkgver=4.1.1
+pkgrel=1
 pkgdesc="An improved dynamic tiling window manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://i3wm.org/"
@@ -19,13 +19,13 @@ optdepends=('rxvt-unicode: The terminal emulator used in the default config.'
             'i3status: To display systeminformation with a bar.'
             'perl: To migrate your configuration to v4 format.')
 options=('docs' '!strip')
-source=(http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2)
-md5sums=('1a05d605624506c2b4b9f1272fd84a5a')
+source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2")
+md5sums=('25bc29349b65000a2b0afc0655a80035')
 
 build() {
   cd "$srcdir/$_pkgsourcename-$pkgver"
   
-  # To avoid problems with bison use only a single process
+  # In order to avoid problems with bison use only a single process
   MAKEFLAGS="-j1"
   make
 }
diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD
index bf7e5856b..880fbd1ed 100644
--- a/community/inn/PKGBUILD
+++ b/community/inn/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=inn
 pkgver=2.5.2
-pkgrel=6
+pkgrel=8
 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers."
 url="http://www.isc.org/software/inn/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -53,7 +53,7 @@ source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz
 	nnrpd.conf
 	site.make.patch)
 md5sums=('a6e577dceb90d07501b96149508b974b'
-         '2ad5138dac7c7535278f73f30020d656'
+         'a243d9498568f1beee20da5684b5fbfc'
          'a0b1ff8501ac8a31ce81a2f9c9b4bac9'
          'fbf1d2c5b3c5a08ae3e515c71c2e2e4a'
          'bb4bbe86ae52fbbf08b0f6f370dea052'
diff --git a/community/inn/innd.rc b/community/inn/innd.rc
index e88bd0c39..5e36aec0d 100644
--- a/community/inn/innd.rc
+++ b/community/inn/innd.rc
@@ -4,11 +4,15 @@
 . /etc/rc.d/functions
 [ -f /etc/conf.d/innd ] && . /etc/conf.d/innd
 [ -z "$NEWS_USER" ] && print "Please set news username" && exit 1;
+[ -z "$NEWS_GROUP" ] && print "Please set news groupname" && exit 1;
 
 case "$1" in
 	start)
 		stat_busy "Starting InterNetNews"
-		[ -d /var/run/inn ] || mkdir -p /var/run/inn
+		[ -d /var/run/inn ] || {
+			mkdir -p /var/run/inn
+			chown -R $NEWS_USER:$NEWS_GROUP /var/run/inn
+		}
 		su $NEWS_USER -c /usr/bin/rc.news 2>&- >&-
 		if [ $? -gt 0 ]; then
 			stat_fail
@@ -21,10 +25,12 @@ case "$1" in
 	;;
 	stop)
 		stat_busy "Stopping InterNetNews"
+		ctlinnd throttle "shutting down" 2>&- >&-
 		su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&-
 		if [ $? -gt 0 ]; then
 			stat_fail
 		else
+			kill `ps faxu| grep ^$NEWS_USER | awk -- '{print $2}'` 2>&- >&-
 			rm /var/run/innd.pid
 			rm_daemon innd
 			stat_done
diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD
index 38674cb01..2dd156623 100644
--- a/community/jshon/PKGBUILD
+++ b/community/jshon/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 57971 2011-11-05 09:47:31Z kkeen $
+# $Id: PKGBUILD 61131 2011-12-22 05:37:54Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 pkgname=jshon
-pkgver=20111105
+pkgver=20111222
 pkgrel=1
 pkgdesc="A json parser for the shell."
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ depends=('jansson')
 makedepends=()
 optdepends=()
 source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('5d4c6d40ef4497473445931e777e280b')
+md5sums=('bcc8b8b6e8c09af7d053471a473ef6e8')
 
 build() {
   cd "$srcdir/$pkgname"
diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD
index 433626ab2..c7dd280e1 100644
--- a/community/libdnet/PKGBUILD
+++ b/community/libdnet/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 58611 2011-11-16 15:32:03Z spupykin $
+# $Id: PKGBUILD 61173 2011-12-23 18:40:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: James Fryman <jfryman@gmail.com>
 
 pkgname=libdnet
 pkgver=1.12
-pkgrel=5
+pkgrel=6
 pkgdesc="A simplified, portable interface to several low-level networking routines"
 arch=(i686 x86_64 'mips64el')
 makedepends=(python2)
 optdepends=(python2)
-install=libdnet.install
 license=("BSD")
 url="http://code.google.com/p/libdnet/"
 options=('!libtool')
@@ -17,18 +16,19 @@ source=(http://libdnet.googlecode.com/files/libdnet-$pkgver.tgz)
 md5sums=('9253ef6de1b5e28e9c9a62b882e44cc9')
 
 build() {
-  mkdir -p $pkgdir/usr/bin
+  cd $srcdir/$pkgname-$pkgver
 
-  [ $CARCH == "x86_64" ] && export CFLAGS=-fPIC
-  [ $CARCH == "mips64el" ] && export CFLAGS+=-fPIC
+  autoreconf -I config --force --install
+  ./configure --prefix=/usr
+  make
+}
 
+package() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --target=${CHOST} --host=${CHOST} --build=${CHOST}
-  make && make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir/" install
 
   cd python && \
   python2 setup.py install --root=$pkgdir
 
   install -D -m0644 ../LICENSE $pkgdir/usr/share/licenses/libdnet/license
-  mv $pkgdir/usr/man $startdir/pkg/usr/share/
 }
diff --git a/community/libdnet/libdnet.install b/community/libdnet/libdnet.install
index cb8146f24..3264378fd 100644
--- a/community/libdnet/libdnet.install
+++ b/community/libdnet/libdnet.install
@@ -1,3 +1,3 @@
 post_install() {
-	/sbin/ldconfig 
+	/sbin/ldconfig
 }
diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD
index 080dc9ed7..f52b03963 100644
--- a/community/linphone/PKGBUILD
+++ b/community/linphone/PKGBUILD
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD 49813 2011-06-21 09:18:21Z spupykin $
+# $Id: PKGBUILD 61187 2011-12-23 22:08:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=linphone
-pkgver=3.4.3
-pkgrel=4
+pkgver=3.5.0
+pkgrel=1
 pkgdesc="A Voice-over-IP phone"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/index.php/eng"
 license=('GPL')
 depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils'
-	 'libpulse' 'libxv' 'mediastreamer' 'ortp')
+	 'libpulse' 'libxv')
+# 'mediastreamer' 'ortp')
 makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite')
 optdepends=('pulseaudio')
 options=('!libtool' '!emptydirs')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.4.x/sources/linphone-$pkgver.tar.gz"
-	"disable-v4l1.patch")
-md5sums=('66e21f36d62c2094f7b4360262c46f20'
-         '7ee15689eed1adbdcf0ddab8fadca34a')
+conflicts=('ortp' 'mediastreamer')
+source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/linphone-$pkgver.tar.gz")
+md5sums=('ad89cd6030a131f2b17ea50eb6f4c6f2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   export PKG_CONFIG=/usr/bin/pkg-config
   unset SGML_CATALOG_FILES
-#  patch -p1 <$srcdir/disable-v4l1.patch
   ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \
 	--enable-alsa --enable-pulseaudio --disable-artsc --disable-strict \
 	--libexecdir=/usr/lib/$pkgname \
-	--enable-external-mediastreamer --enable-external-ortp
+	--disable-external-mediastreamer --disable-external-ortp
   make
 }
 
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index 2d4d83d47..e890567e6 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 53158 2011-07-31 08:25:21Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# $Id: PKGBUILD 61193 2011-12-24 11:33:27Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=lxpanel
 pkgver=0.5.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Panel of the LXDE Desktop"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://lxde.org/"
 groups=('lxde')
 depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data')
-source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
+        battery.patch)
 optdepends=(pcmanfm)
-md5sums=('129fae75d1cd3983fd94542c573a70a1')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
+
+	patch -Np1 -i "$srcdir/battery.patch"
+
 	./configure --sysconfdir=/etc --prefix=/usr 
 	make
 }
@@ -25,3 +29,7 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
+md5sums=('129fae75d1cd3983fd94542c573a70a1'
+         '5fadb4d5aca09c81138677e91f995d98')
+md5sums=('129fae75d1cd3983fd94542c573a70a1'
+         '5fadb4d5aca09c81138677e91f995d98')
diff --git a/community/lxpanel/battery.patch b/community/lxpanel/battery.patch
new file mode 100644
index 000000000..5d701ea6d
--- /dev/null
+++ b/community/lxpanel/battery.patch
@@ -0,0 +1,72 @@
+diff --git plugins/batt/batt_sys.c plugins/batt/batt_sys.c
+index 54ff678..1eebab5 100644
+--- a/src/plugins/batt/batt_sys.c
++++ b/src/plugins/batt/batt_sys.c
+@@ -35,15 +35,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-battery* battery_new() {
+-    static int battery_num = 1;
+-    battery * b = g_new0 ( battery, 1 );
+-    battery_reset(b);
+-    b->battery_num = battery_num;
+-    battery_num++;
+-    return b;
+-}
+-
+ void battery_reset( battery * b) {
+     b->type_battery = TRUE;
+     b->capacity_unit = "mAh";
+@@ -58,6 +49,15 @@ void battery_reset( battery * b) {
+     b->state = NULL;
+ }
+ 
++battery* battery_new() {
++    static int battery_num = 1;
++    battery * b = g_new0 ( battery, 1 );
++    battery_reset(b);
++    b->battery_num = battery_num;
++    battery_num++;
++    return b;
++}
++
+ static gchar* parse_info_file(char *filename)
+ {
+     char *buf = NULL;
+@@ -194,7 +194,7 @@ void battery_update( battery *b ) {
+     
+     /* convert energy values (in mWh) to charge values (in mAh) if needed and possible */
+     if (b->last_capacity_unit != -1 && b->last_capacity == -1) {
+-	if (b->voltage != -1) {
++	if (b->voltage > 0) {
+ 	    b->last_capacity = b->last_capacity_unit * 1000 / b->voltage;
+ 	} else {
+ 	    b->last_capacity = b->last_capacity_unit;
+@@ -202,7 +202,7 @@ void battery_update( battery *b ) {
+ 	}
+     }
+     if (b->design_capacity_unit != -1 && b->design_capacity == -1) {
+-	if (b->voltage != -1) {
++	if (b->voltage > 0) {
+ 	    b->design_capacity = b->design_capacity_unit * 1000 / b->voltage;
+ 	} else {
+ 	    b->design_capacity = b->design_capacity_unit;
+@@ -210,7 +210,7 @@ void battery_update( battery *b ) {
+ 	}
+     }
+     if (b->remaining_energy != -1 && b->remaining_capacity == -1) {
+-	if (b->voltage != -1) {
++	if (b->voltage > 0) {
+ 	    b->remaining_capacity = b->remaining_energy * 1000 / b->voltage;
+ 	    b->present_rate = b->present_rate * 1000 / b->voltage;
+ 	} else {
+@@ -220,7 +220,7 @@ void battery_update( battery *b ) {
+     if (b->last_capacity < MIN_CAPACITY)
+ 	b->percentage = 0;
+     else
+-	b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit;
++	b->percentage = (float) b->remaining_capacity * 100 / b->last_capacity;
+ 	    
+     if (b->percentage > 100)
+ 	b->percentage = 100;
diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD
index 9bad89c5d..08f9e0d71 100644
--- a/community/oolite/PKGBUILD
+++ b/community/oolite/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lone_Wolf <lonewolf@xs4all.nl>
 pkgname=oolite
-pkgver=1.75.3
-pkgrel=2
+pkgver=1.76
+pkgrel=1
 pkgdesc="A space-sim based on the classic Elite"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oolite-linux.berlios.de"
@@ -11,13 +11,13 @@ license=('GPL2')
 depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu')
 makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip')
 options=(!makeflags)
-source=(oolite http://download2.berlios.de/oolite-linux/oolite-dev-source-${pkgver}.tar.bz2)
+source=(oolite http://download2.berlios.de/oolite-linux/oolite-source-${pkgver}.tar.bz2)
 md5sums=('b182976fade9b64a3b3702e2a8c72bf0'
-         'e6c3d1e41f60f8cf410f766a3ecadcc7')
+         'd540486facd8275dc6bceebae8428dce')
 
 build() {
     cd $srcdir
-    cp -r ${srcdir}/oolite-dev-source-${pkgver} ${srcdir}/${pkgname}-build
+    cp -r ${srcdir}/oolite-source-${pkgver} ${srcdir}/${pkgname}-build
 
     cd ${srcdir}/${pkgname}-build
     sed -i "/ADDITIONAL_OBJCFLAGS/s/=/= -fobjc-exceptions/" GNUmakefile
diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD
index 452fc41ff..b8e9b7352 100644
--- a/community/ozerocdoff/PKGBUILD
+++ b/community/ozerocdoff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60103 2011-12-05 08:41:04Z spupykin $
+# $Id: PKGBUILD 61135 2011-12-22 10:38:39Z spupykin $
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 
 pkgname=ozerocdoff
 pkgver=2
-pkgrel=4
+pkgrel=5
 pkgdesc="Userspace driver for Option High Speed Mobile Devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pharscape.org/ozerocdoff.html"
@@ -13,7 +13,7 @@ options=('!emptydirs')
 source=(udev.tar.gz::"http://www.pharscape.org/forum/index.php?action=dlattach;topic=545.0;attach=4"
 	"remove-old-rules.patch")
 md5sums=('88a78f9380d9591f8d20a657b72e3e5c'
-         '2b28c8310b615e7283c2c38f62533c4f')
+         '213737cfccde2fe49a334db2b681c3f5')
 
 build() {
   cd "${srcdir}/udev"
diff --git a/community/ozerocdoff/remove-old-rules.patch b/community/ozerocdoff/remove-old-rules.patch
index 0a5e7fecc..c395280cb 100644
--- a/community/ozerocdoff/remove-old-rules.patch
+++ b/community/ozerocdoff/remove-old-rules.patch
@@ -1,7 +1,16 @@
 diff -wbBur udev/hso.udev udev.my/hso.udev
 --- udev/hso.udev	2008-06-19 14:34:07.000000000 +0400
-+++ udev.my/hso.udev	2011-12-05 12:36:34.000000000 +0400
-@@ -63,60 +63,6 @@
++++ udev.my/hso.udev	2011-12-22 14:31:29.000000000 +0400
+@@ -1,8 +1,5 @@
+ ACTION!="add", GOTO="hso_end"
+ 
+-# Syntax switch, need possibly for upcoming Distros
+-ATTR{dev}!="?*", GOTO="hso_old_syntax"
+-
+ ############################### NEW SYNTAX ###############################
+ 
+ LABEL="hso_new_syntax"
+@@ -63,60 +60,6 @@
  SUBSYSTEM=="tty", SUBSYSTEMS=="usb", ATTR{hsotype}=="PCSC",	   SYMLINK+="wpcsc0"
  GOTO="hso_tty_permission"
  
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index 887484957..1f8b53b9d 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 59956 2011-12-02 21:00:04Z ibiru $
+# $Id: PKGBUILD 61223 2011-12-24 23:23:29Z lcarlier $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus
-pkgver=0.7.5
-pkgrel=2
+pkgver=0.7.6
+pkgrel=1
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pingus.seul.org"
@@ -11,9 +11,9 @@ license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48')
 makedepends=('scons' 'boost>=1.48' 'mesa')
 source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop)
-md5sums=('68e0bd1327e0eedcaab64d64528540ba'
+md5sums=('561798686f34d3fa4e69135d655f47ac'
          '9eec34047bdcff49e08f41e81764e20c')
-sha1sums=('65493f9c9914bb401dbcfe1fe6bf2fad2388b755'
+sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487'
           '579a1144f161ce89e6e024cea37210149b89c0c0')
 
 build() {
diff --git a/community/python2-pyopencl/PKGBUILD b/community/python2-pyopencl/PKGBUILD
index 65c20847a..bc8e85fcf 100644
--- a/community/python2-pyopencl/PKGBUILD
+++ b/community/python2-pyopencl/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 60633 2011-12-15 21:15:10Z stephane $
+# $Id: PKGBUILD 61157 2011-12-22 18:02:54Z ibiru $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=python2-pyopencl
 pkgver=2011.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mathema.tician.de/software/pyopencl"
 license=('custom')
-depends=('python2' 'python2-numpy' 'python-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa')
+depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa')
 makedepends=('ctags' 'python2-distribute')
 provides=('pyopencl=${pkgver}')
 replaces=('pyopencl')
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 1f8d2451b..a5f192e51 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 60207 2011-12-07 16:26:35Z svenstaro $
+# $Id: PKGBUILD 61151 2011-12-22 17:17:17Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spring
-pkgver=0.84.0
-_pkgver=84.0
-pkgrel=2
+pkgver=0.85.0
+_pkgver=85.0
+pkgrel=1
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://springrts.com/"
 license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl')
-makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2')
+depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
+         'libxcursor')
+makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2' 'java-environment')
 optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('2aae395c055adceec5326fb3faec92ba')
+md5sums=('ea90c264faa517e4d70542fb2082a2f3')
 
 build() {
   bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
diff --git a/community/stow/PKGBUILD b/community/stow/PKGBUILD
index c362a08d0..d52341b39 100644
--- a/community/stow/PKGBUILD
+++ b/community/stow/PKGBUILD
@@ -5,14 +5,14 @@
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 
 pkgname=stow
-pkgver=2.1.0
+pkgver=2.1.2
 pkgrel=1
 pkgdesc='GNU Stow is a program for managing the installation of software packages'
 url='http://www.gnu.org/software/stow/'
 arch=('i686' 'x86_64')
 source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
 license=('GPL2')
-md5sums=('5526fdb8c76d0aee35eb304d7f55d2f6')
+md5sums=('82857e43531cf6936aed99ef3b86b446')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/tcpreplay/PKGBUILD b/community/tcpreplay/PKGBUILD
new file mode 100644
index 000000000..054c87d7e
--- /dev/null
+++ b/community/tcpreplay/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 61217 2011-12-24 18:01:44Z tredaelli $
+# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: Sébastien Duquette <ekse.0x@gmail.com>
+# Contributor: Dawid Wrobel <cromo@klej.net>
+pkgname=tcpreplay
+pkgver=3.4.4
+pkgrel=3
+pkgdesc="Gives the ability to replay previously captured traffic in a libpcap format"
+url="http://tcpreplay.synfin.net"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('libpcap' 'libdnet')
+makedepends=('tcpdump')
+optdepends=('tcpdump: decoding of packets support')
+options=('!emptydirs')
+source=("http://downloads.sourceforge.net/sourceforge/tcpreplay/${pkgname}-${pkgver}.tar.gz")
+md5sums=('22725feb9b2590809f9350308ec65180')
+
+build() {
+     cd "$srcdir/$pkgname-$pkgver"
+     ./configure --prefix=/usr --enable-dynamic-link --with-tcpdump=/usr/sbin/tcpdump
+     make
+}
+
+package() {
+     cd "$srcdir/$pkgname-$pkgver"
+     make DESTDIR="$pkgdir/" install
+}
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
index 710f4c4a8..04196b219 100644
--- a/community/texmaker/PKGBUILD
+++ b/community/texmaker/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61099 2011-12-21 20:52:54Z andrea $
+# $Id: PKGBUILD 61145 2011-12-22 15:39:01Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: furester <xfurester@hotmail.com> 
@@ -6,15 +6,15 @@
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 
 pkgname=texmaker
-pkgver=3.1
-pkgrel=2
+pkgver=3.2
+pkgrel=1
 pkgdesc='Free cross-platform latex editor'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xm1math.net/texmaker/index.html"
 license=('GPL')
 depends=('poppler-qt' 'ghostscript' 'qtwebkit')
 source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('10a14c75abbb7234d4e5e58a7c85b110')
+md5sums=('506f8b234e1266b188e73e2fc61c68d5')
 
 build() {
 	cd ${pkgname}-${pkgver}
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index 6f896a7c9..40d3a2a99 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58425 2011-11-12 17:19:02Z ibiru $
+# $Id: PKGBUILD 61185 2011-12-23 22:04:01Z tdziedzic $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
 # Contributor: leepesjee <lpeschier at xs4all dot nl>
@@ -9,7 +9,7 @@
 
 pkgname=vtk
 pkgver=5.8.0
-pkgrel=6
+pkgrel=7
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.vtk.org'
@@ -24,11 +24,13 @@ optdepends=('python2: python bindings'
 source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
         'fixkernelversioncheck.diff'
-        'ffmpeg-0.8.diff')
+        'ffmpeg-0.8.diff'
+        'fix-boost-graph-api-changes.diff')
 md5sums=('37b7297d02d647cc6ca95b38174cb41f'
          'a05295b81930e894fc0e31866f399151'
          '9e137af23701f76fc727222ebac23389'
-         'e992321c9d1def6034d0fa6607b40c5a')
+         'e992321c9d1def6034d0fa6607b40c5a'
+         'e715aef2aea26fc05f904efb5d0d5627')
 
 build() {
   cd VTK
@@ -41,6 +43,10 @@ build() {
   # remove next pkgver bump
   patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
 
+  # fix compilation error: http://vtk.org/Bug/view.php?id=12772
+  # remove next pkgver bump
+  patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
+
   cd ${srcdir}
 
   rm -rf build
@@ -82,6 +88,7 @@ build() {
     -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
     -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
     -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
     ${srcdir}/VTK
 
   make
diff --git a/community/vtk/fix-boost-graph-api-changes.diff b/community/vtk/fix-boost-graph-api-changes.diff
new file mode 100644
index 000000000..2162e7a28
--- /dev/null
+++ b/community/vtk/fix-boost-graph-api-changes.diff
@@ -0,0 +1,42 @@
+commit d3ecc2c459dd1df937fc97887581ace1036da533
+Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
+Date:   Tue Dec 13 15:36:06 2011 -0500
+
+    BUG: 12772 fixes for change in Boost graph API
+    
+    This fixes bug 12772, where an API change in Boost was causing
+    compilation failures using Boost 1.38. Thanks to Orion Poplawski for
+    reporting the issue and posting the patch.
+    
+    Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
+
+diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+index c789f6b..cf7cd47 100644
+--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
++++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+@@ -47,6 +47,15 @@ using namespace boost;
+ vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
+ 
+ 
++namespace {
++  vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
++    return e.Id;
++  }
++  vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
++    return e.underlying_desc.Id;
++  }
++}
++
+ // Redefine the bfs visitor, the only visitor we
+ // are using is the tree_edge visitor.
+ template <typename IdMap>
+@@ -95,7 +104,8 @@ public:
+ 
+     // Copy the vertex and edge data from the graph to the tree.
+     tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
+-    tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
++    tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
++                                  unwrap_edge_id(e), tree_e.Id);
+   }
+ 
+ private:
author	Michał Masłowski <mtjm@mtjm.eu>	2011-12-26 17:57:29 +0100
committer	Michał Masłowski <mtjm@mtjm.eu>	2011-12-26 17:57:29 +0100
commit	025f5565da8ee014457f56851fca55c36619787c (patch)
tree	1705231f784a4ec514287e99d3967b3495dacc23 /community
parent	d4891d626bd0699dafdcfa776ad0ee48df04f2d4 (diff)
parent	e39d5f838c08b5b57eae4c1aec4ae00acd18b239 (diff)