Merge branch 'master' of ssh://gparabola/abslibre-mips64el

53 files changed, 1255 insertions, 240 deletions

diff --git a/extra/aalib/PKGBUILD b/extra/aalib/PKGBUILD
index 08c9e2f60..778065b21 100644
--- a/extra/aalib/PKGBUILD
+++ b/extra/aalib/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=aalib
 pkgver=1.4rc5
-pkgrel=8
+pkgrel=8.1
 pkgdesc="A portable ASCII art graphic library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://aa-project.sourceforge.net/aalib/"
@@ -20,7 +20,7 @@ sha1sums=('a23269e950a249d2ef93625837cace45ddbce03b' '98d8c5a13672a8107945d694ff
 build() {
   cd "${srcdir}/${pkgname}-1.4.0"
   patch -p0 -i "${srcdir}/aclocal-fixes.patch"
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --host=$CHOST
   make
 }
 
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 79118b7e5..ad192cfb9 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139641 2011-10-04 06:53:59Z andrea $
+# $Id: PKGBUILD 144041 2011-12-02 20:54:07Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org/akonadi'
diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD
index e768b82ca..5b34de65f 100644
--- a/extra/alsaplayer/PKGBUILD
+++ b/extra/alsaplayer/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=alsaplayer
 pkgver=0.99.81
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.alsaplayer.org/"
diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD
index 9eabbf7e3..f4709bf19 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131761 2011-07-14 17:10:17Z remy $
+# $Id: PKGBUILD 144094 2011-12-03 17:46:02Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Firmicus <francois.archlinux.org>
 # Contributor: bender02 at gmx dot com
 
 pkgname=asymptote
-pkgver=2.13
+pkgver=2.15
 pkgrel=1
 pkgdesc="A vector graphics language (like metapost)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ optdepends=('python2:           for the xasy GUI'
             'tix:               for the xasy GUI')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
 install=texlive.install
-sha1sums=('b4f2b72c0a4e7a02b716bfd0ad64bab45c567bbd')
+sha1sums=('e0fb336c195fb21a39e3d0f3acd4881ce5e170a7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD
index 58c74feb5..a33b1cea4 100644
--- a/extra/at/PKGBUILD
+++ b/extra/at/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=at
 pkgver=3.1.13
-pkgrel=1
+pkgrel=1.1
 pkgdesc="AT and batch delayed command scheduling utility and daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.qa.debian.org/a/at.html"
diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD
index a7cebf945..2c937221d 100644
--- a/extra/audiofile/PKGBUILD
+++ b/extra/audiofile/PKGBUILD
@@ -1,20 +1,30 @@
-# $Id: PKGBUILD 78833 2010-04-28 13:14:52Z jgc $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 144340 2011-12-04 20:03:38Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+
 pkgname=audiofile
-pkgver=0.2.7
+pkgver=0.3.2
 pkgrel=1
 pkgdesc="Silicon Graphics Audio File Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.68k.org/~michael/audiofile/"
 license=('LGPL')
-depends=('glibc')
+depends=('gcc-libs' 'alsa-lib')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('61efd278627415b5468426fc9e52aef32ea0fdac12b56bcdd72734c2ece5945e')
+source=("http://audiofile.68k.org/$pkgname-$pkgver.tar.gz")
+md5sums=('cb2c4fe6e899e688ffe5d1568581cb63')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index a30a4355e..aad64d103 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,30 +1,42 @@
-# $Id: PKGBUILD 132785 2011-07-26 07:29:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 144043 2011-12-02 20:54:10Z ibiru $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
 license=('GPL2')
-depends=('eigen' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
+depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
 makedepends=('cmake' 'boost')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('92c2702c1980f70fb6d87a1a58147911')
+install=avogadro.install
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
+        'fix-boost.patch')
+md5sums=('92c2702c1980f70fb6d87a1a58147911'
+         'aec516daab066c15326a9681f8f15abc'
+         '46282e4709429447e44a0a54d51ad2ec')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+  patch -p1 -i "${srcdir}"/fix-boost.patch
+
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
   make
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/avogadro/avogadro.install b/extra/avogadro/avogadro.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/extra/avogadro/avogadro.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/extra/avogadro/fix-boost.patch b/extra/avogadro/fix-boost.patch
new file mode 100644
index 000000000..8fb53ef12
--- /dev/null
+++ b/extra/avogadro/fix-boost.patch
@@ -0,0 +1,33 @@
+--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~	2011-11-29 18:33:01.777291627 +0000
++++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-11-29 18:33:23.480814612 +0000
+@@ -149,7 +149,7 @@
+   endforeach(P_ITEM ${PYTHON_SRCS})
+ endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
+ 
+-QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
++QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+ 
+ # you have to add link_directories before you add the target
+ if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
+--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-11-29 18:37:15.449506548 +0000
++++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:37:52.729831744 +0000
+@@ -11,7 +11,7 @@
+ # use all cpp files in this directory
+ FILE(GLOB wrapper_SRCS "*.cpp")
+ 
+-QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
++QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+ 
+ ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
+ SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
+--- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
++++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
+@@ -18,7 +18,7 @@
+   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
+   # We should probably scan the header to verify the Q_OBJECT macro is used
+   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
+-  qt4_wrap_cpp(moc_files ${hdr_list})
++  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+   # Now sort out the ui and qrc files, process them as appropriate
+   set(ui_plugin_files)
+   set(qrc_plugin_files)
diff --git a/extra/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/extra/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
new file mode 100644
index 000000000..11f58a505
--- /dev/null
+++ b/extra/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
@@ -0,0 +1,778 @@
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt
+--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt	2011-11-29 18:49:58.520790652 +0100
+@@ -75,6 +75,42 @@
+   zmatrix.h
+ )
+ 
++SET(libavogadro_MOC_HDRS
++  animation.h
++  atom.h
++  bond.h
++  color.h
++  colorbutton.h
++  colors/elementcolor.h
++  cube.h
++  elementdetail_p.h
++  elementtranslator.h
++  engine.h
++  engines/bsdyengine.h
++  extension.h
++  fragment.h
++  glwidget.h
++  mesh.h
++  molecule.h
++  moleculefile.h
++  moleculefile_p.h
++  periodictablescene_p.h
++  periodictableview.h
++  plotwidget.h
++  plugin.h
++  pluginmanager.h
++  primitive.h
++  protein.h
++  pythonengine_p.h
++  pythonerror.h
++  pythonextension_p.h
++  pythontool_p.h
++  residue.h
++  tool.h
++  toolgroup.h
++  zmatrix.h
++)
++
+ set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS})
+ # Also add in the qtiocompressor class
+ #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp)
+@@ -113,7 +148,7 @@
+   endforeach(P_ITEM ${PYTHON_SRCS})
+ endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
+ 
+-qt4_automoc(${libavogadro_SRCS})
++QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
+ 
+ # you have to add link_directories before you add the target
+ if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
+@@ -149,7 +184,7 @@
+     COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}")
+ endforeach(headerFile ${libavogadro_HDRS})
+ 
+-add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
++add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
+ set_target_properties(avogadro
+   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
+ target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp
+--- avogadro-1.0.3/libavogadro/src/animation.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp	2011-11-29 18:48:47.967839537 +0100
+@@ -224,5 +224,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "animation.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp
+--- avogadro-1.0.3/libavogadro/src/atom.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp	2011-11-29 18:48:39.561218412 +0100
+@@ -293,5 +293,3 @@
+    }
+ 
+  } // End namespace Avogadro
+-
+-#include "atom.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp
+--- avogadro-1.0.3/libavogadro/src/bond.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp	2011-11-29 18:49:00.067773985 +0100
+@@ -166,5 +166,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "bond.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp
+--- avogadro-1.0.3/libavogadro/src/color.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/color.cpp	2011-11-29 18:49:05.207746140 +0100
+@@ -152,5 +152,3 @@
+     return "Generic Color";
+   }
+ }
+-
+-#include "color.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp
+--- avogadro-1.0.3/libavogadro/src/colorbutton.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp	2011-11-29 18:49:11.987709410 +0100
+@@ -94,5 +94,3 @@
+   }
+ 
+ } // end namespace
+-
+-#include "colorbutton.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp
+--- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp	2011-11-29 18:50:11.077389292 +0100
+@@ -63,7 +63,5 @@
+ 
+ }
+ 
+-#include "elementcolor.moc"
+ //this is a static color plugin...
+ //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory)
+-
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp
+--- avogadro-1.0.3/libavogadro/src/cube.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp	2011-11-29 18:50:26.357306516 +0100
+@@ -322,5 +322,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "cube.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp
+--- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp	2011-11-29 18:50:37.680578505 +0100
+@@ -132,5 +132,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "elementdetail_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp
+--- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp	2011-11-29 18:50:48.160521729 +0100
+@@ -401,5 +401,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "elementtranslator.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp
+--- avogadro-1.0.3/libavogadro/src/engine.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp	2011-11-29 18:50:54.397154610 +0100
+@@ -377,5 +377,3 @@
+       return m_molecule->bonds();
+   }
+ }
+-
+-#include "engine.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp
+--- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp	2011-11-29 18:51:18.733689435 +0100
+@@ -442,7 +442,5 @@
+   }
+ 
+ }
+-
+-#include "bsdyengine.moc"
+ // This is a static engine...
+ // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory )
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp
+--- avogadro-1.0.3/libavogadro/src/extension.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp	2011-11-29 18:51:56.360152261 +0100
+@@ -80,5 +80,3 @@
+   }
+ 
+ }
+-
+-#include "extension.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp
+--- avogadro-1.0.3/libavogadro/src/fragment.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp	2011-11-29 18:52:01.906788880 +0100
+@@ -82,5 +82,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "fragment.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp
+--- avogadro-1.0.3/libavogadro/src/glwidget.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp	2011-11-29 18:52:14.346721486 +0100
+@@ -1966,5 +1966,3 @@
+     d->updateCache = true;
+   }
+ }
+-
+-#include "glwidget.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp
+--- avogadro-1.0.3/libavogadro/src/mesh.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp	2011-11-29 18:52:23.033341093 +0100
+@@ -231,5 +231,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "mesh.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp
+--- avogadro-1.0.3/libavogadro/src/molecule.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp	2011-11-29 18:52:33.573283993 +0100
+@@ -1575,5 +1575,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "molecule.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp
+--- avogadro-1.0.3/libavogadro/src/moleculefile.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp	2011-11-29 18:56:26.728687548 +0100
+@@ -22,23 +22,14 @@
+   02110-1301, USA.
+  **********************************************************************/
+ 
+-#include "moleculefile.h"
++#include "moleculefile_p.h"
+ 
+ #include <avogadro/molecule.h>
+ 
+-#include <QFile>
+ #include <QFileInfo>
+-#include <QStringList>
+-#include <QThread>
+ #include <QDebug>
+ #include <QPointer>
+ 
+-#include <openbabel/mol.h>
+-#include <openbabel/obconversion.h>
+-
+-// Included in obconversion.h
+-//#include <iostream>
+-
+ namespace Avogadro {
+ 
+   using OpenBabel::OBConversion;
+@@ -578,164 +569,6 @@
+     return false;
+   }
+ 
+-  class ReadFileThread : public QThread
+-  {
+-    //    Q_OBJECT 
+-
+-    public:
+-      ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
+-      {
+-      }
+-      
+-      void addConformer(const OpenBabel::OBMol &conformer)
+-      {
+-        unsigned int numAtoms = conformer.NumAtoms();
+-        std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
+-        for (unsigned int i = 0; i < numAtoms; ++i)
+-          coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
+-        m_moleculeFile->m_conformers.push_back(coords);
+-      }
+-
+-      void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
+-      {
+-        if (!c) {
+-          // this is the first molecule read
+-          m_moleculeFile->setConformerFile(true);
+-          addConformer(current);
+-          return;
+-        }
+-
+-        if (!m_moleculeFile->isConformerFile())
+-          return;
+-
+-        // as long as we are not sure if this really is a 
+-        // conformer/trajectory file, add the conformers
+-        addConformer(current);
+-
+-        // performance: check only certain molecule 1-10,20,50
+-        switch (c) {
+-          case 1:
+-          case 2:
+-          case 3:
+-          case 4:
+-          case 5:
+-          case 6:
+-          case 7:
+-          case 8:
+-          case 9:
+-          case 10:
+-          case 20:
+-          case 50:
+-            break;
+-          default:
+-            return;
+-        }
+-
+-        if (first.NumAtoms() != current.NumAtoms()) {
+-          m_moleculeFile->setConformerFile(false);
+-          m_moleculeFile->m_conformers.clear();
+-          return;
+-        }
+-
+-        for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
+-          OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
+-          OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
+-          if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
+-            m_moleculeFile->setConformerFile(false);
+-            m_moleculeFile->m_conformers.clear();
+-            return;
+-          }    
+-        }
+-      }
+-
+-      void run()
+-      {
+-        // Check that the file can be read from disk
+-        if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
+-          // Cannot read the file
+-          m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
+-                                         .arg(m_moleculeFile->m_fileName));
+-          return;
+-        }
+- 
+-        // Construct the OpenBabel objects, set the file type
+-        OpenBabel::OBConversion conv;
+-        OpenBabel::OBFormat *inFormat;
+-        if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
+-          // Input format not supported
+-          m_moleculeFile->m_error.append(
+-              QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
+-          return;
+-        } else {
+-          inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
+-          if (!inFormat || !conv.SetInFormat(inFormat)) {
+-            // Input format not supported
+-            m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
+-                                           .arg(m_moleculeFile->m_fileName));
+-            return;
+-          }
+-        }
+-
+-        // set any options
+-        if (!m_moleculeFile->m_fileOptions.isEmpty()) {
+-          foreach(const QString &option,
+-              m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
+-            conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
+-          }
+-        }
+-
+-        // Now attempt to read the molecule in
+-        ifstream ifs;
+-        ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
+-        if (!ifs) // Should not happen, already checked file could be opened
+-          return;
+-      
+-        // read all molecules
+-        OpenBabel::OBMol firstOBMol, currentOBMol;
+-        unsigned int c = 0;
+-        conv.SetInStream(&ifs);
+-        m_moleculeFile->streamposRef().push_back(ifs.tellg());
+-        while (ifs.good() && conv.Read(&currentOBMol)) {
+-          if (!c)
+-            firstOBMol = currentOBMol;
+-
+-          if (c > 20 && !m_moleculeFile->isConformerFile())
+-            m_moleculeFile->setFirstReady(true);
+-
+-          // detect conformer/trajectory files
+-          detectConformers(c, firstOBMol, currentOBMol);
+-          // store information about molecule
+-          m_moleculeFile->streamposRef().push_back(ifs.tellg());
+-          m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
+-          // increment count
+-          ++c;
+-        }
+-        m_moleculeFile->streamposRef().pop_back();
+-
+-        // signle molecule files are not conformer files
+-        if (c == 1) {
+-          m_moleculeFile->setConformerFile(false);
+-          m_moleculeFile->m_conformers.clear();
+-        }
+-
+-        // check for empty titles
+-        for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
+-          if (!m_moleculeFile->titlesRef()[i].isEmpty())
+-            continue;
+-
+-          QString title;
+-          if (m_moleculeFile->isConformerFile())
+-            title = tr("Conformer %1").arg(i+1);
+-          else
+-            title = tr("Molecule %1").arg(i+1);
+-        
+-          m_moleculeFile->titlesRef()[i] = title;
+-        }
+-      }
+-
+-      MoleculeFile *m_moleculeFile;
+-  }; // end ReadFileThread class
+-
+   MoleculeFile* MoleculeFile::readFile(const QString &fileName,
+       const QString &fileType, const QString &fileOptions, bool wait)
+   {
+@@ -794,6 +627,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "moleculefile.moc"
+-
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h
+--- avogadro-1.0.3/libavogadro/src/moleculefile_p.h	1970-01-01 01:00:00.000000000 +0100
++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h	2011-11-29 18:57:43.108273764 +0100
+@@ -0,0 +1,202 @@
++/**********************************************************************
++  MoleculeFile - Class representing molecule file.
++
++  Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch
++
++  This file is part of the Avogadro molecular editor project.
++  For more information, see <http://avogadro.openmolecules.net/>
++
++  Avogadro is free software; you can redistribute it and/or modify
++  it under the terms of the GNU General Public License as published by
++  the Free Software Foundation; either version 2 of the License, or
++  (at your option) any later version.
++
++  Avogadro is distributed in the hope that it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++  GNU General Public License for more details.
++
++  You should have received a copy of the GNU General Public License
++  along with this program; if not, write to the Free Software
++  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++  02110-1301, USA.
++ **********************************************************************/
++
++#ifndef MOLECULEFILE_P_H
++#define MOLECULEFILE_P_H
++
++#include "moleculefile.h"
++
++#include <openbabel/mol.h>
++#include <openbabel/obconversion.h>
++
++#include <QFile>
++#include <QStringList>
++#include <QThread>
++
++namespace Avogadro {
++
++  using OpenBabel::OBConversion;
++  using std::ifstream;
++
++class ReadFileThread : public QThread
++{
++      Q_OBJECT
++
++  public:
++    ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
++    {
++    }
++
++    void addConformer(const OpenBabel::OBMol &conformer)
++    {
++      unsigned int numAtoms = conformer.NumAtoms();
++      std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
++      for (unsigned int i = 0; i < numAtoms; ++i)
++        coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
++      m_moleculeFile->m_conformers.push_back(coords);
++    }
++
++    void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
++    {
++      if (!c) {
++        // this is the first molecule read
++        m_moleculeFile->setConformerFile(true);
++        addConformer(current);
++        return;
++      }
++
++      if (!m_moleculeFile->isConformerFile())
++        return;
++
++      // as long as we are not sure if this really is a
++      // conformer/trajectory file, add the conformers
++      addConformer(current);
++
++      // performance: check only certain molecule 1-10,20,50
++      switch (c) {
++        case 1:
++        case 2:
++        case 3:
++        case 4:
++        case 5:
++        case 6:
++        case 7:
++        case 8:
++        case 9:
++        case 10:
++        case 20:
++        case 50:
++          break;
++        default:
++          return;
++      }
++
++      if (first.NumAtoms() != current.NumAtoms()) {
++        m_moleculeFile->setConformerFile(false);
++        m_moleculeFile->m_conformers.clear();
++        return;
++      }
++
++      for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
++        OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
++        OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
++        if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
++          m_moleculeFile->setConformerFile(false);
++          m_moleculeFile->m_conformers.clear();
++          return;
++        }
++      }
++    }
++
++    void run()
++    {
++      // Check that the file can be read from disk
++      if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
++        // Cannot read the file
++        m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
++                                       .arg(m_moleculeFile->m_fileName));
++        return;
++      }
++
++      // Construct the OpenBabel objects, set the file type
++      OpenBabel::OBConversion conv;
++      OpenBabel::OBFormat *inFormat;
++      if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
++        // Input format not supported
++        m_moleculeFile->m_error.append(
++            QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
++        return;
++      } else {
++        inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
++        if (!inFormat || !conv.SetInFormat(inFormat)) {
++          // Input format not supported
++          m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
++                                         .arg(m_moleculeFile->m_fileName));
++          return;
++        }
++      }
++
++      // set any options
++      if (!m_moleculeFile->m_fileOptions.isEmpty()) {
++        foreach(const QString &option,
++            m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
++          conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
++        }
++      }
++
++      // Now attempt to read the molecule in
++      ifstream ifs;
++      ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
++      if (!ifs) // Should not happen, already checked file could be opened
++        return;
++
++      // read all molecules
++      OpenBabel::OBMol firstOBMol, currentOBMol;
++      unsigned int c = 0;
++      conv.SetInStream(&ifs);
++      m_moleculeFile->streamposRef().push_back(ifs.tellg());
++      while (ifs.good() && conv.Read(&currentOBMol)) {
++        if (!c)
++          firstOBMol = currentOBMol;
++
++        if (c > 20 && !m_moleculeFile->isConformerFile())
++          m_moleculeFile->setFirstReady(true);
++
++        // detect conformer/trajectory files
++        detectConformers(c, firstOBMol, currentOBMol);
++        // store information about molecule
++        m_moleculeFile->streamposRef().push_back(ifs.tellg());
++        m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
++        // increment count
++        ++c;
++      }
++      m_moleculeFile->streamposRef().pop_back();
++
++      // signle molecule files are not conformer files
++      if (c == 1) {
++        m_moleculeFile->setConformerFile(false);
++        m_moleculeFile->m_conformers.clear();
++      }
++
++      // check for empty titles
++      for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
++        if (!m_moleculeFile->titlesRef()[i].isEmpty())
++          continue;
++
++        QString title;
++        if (m_moleculeFile->isConformerFile())
++          title = tr("Conformer %1").arg(i+1);
++        else
++          title = tr("Molecule %1").arg(i+1);
++
++        m_moleculeFile->titlesRef()[i] = title;
++      }
++    }
++
++    MoleculeFile *m_moleculeFile;
++};
++
++} // end namespace Avogadro
++
++#endif // MOLECULEFILE_P_H
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp
+--- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp	2011-11-29 18:52:50.259860261 +0100
+@@ -213,5 +213,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "periodictablescene_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
+--- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
++++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
+@@ -69,4 +69,3 @@
+ 
+ } // End namespace Avogadro
+ 
+-#include "periodictableview.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
+--- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp	2011-11-29 18:53:09.389756626 +0100
+@@ -27,7 +27,6 @@
+  **********************************************************************/
+ 
+ #include "plotwidget.h"
+-#include "plotwidget.moc"
+ 
+ #include <math.h>
+ #include <QDebug>
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp
+--- avogadro-1.0.3/libavogadro/src/plugin.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp	2011-11-29 18:53:16.016387394 +0100
+@@ -65,5 +65,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "plugin.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp
+--- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp	2011-11-29 18:53:23.569679807 +0100
+@@ -784,5 +784,3 @@
+   }
+ 
+ }
+-
+-#include "pluginmanager.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp
+--- avogadro-1.0.3/libavogadro/src/primitive.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp	2011-11-29 18:53:29.139649631 +0100
+@@ -77,5 +77,3 @@
+   }
+ 
+ }
+-
+-#include "primitive.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp
+--- avogadro-1.0.3/libavogadro/src/protein.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp	2011-11-29 18:53:37.952935219 +0100
+@@ -978,5 +978,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+-#include "protein.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt
+--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:58:02.354836165 +0100
+@@ -11,9 +11,9 @@
+ # use all cpp files in this directory
+ FILE(GLOB wrapper_SRCS "*.cpp")
+ 
+-qt4_automoc(moleculelist.cpp)
++QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
+ 
+-ADD_LIBRARY(python-module MODULE ${wrapper_SRCS})
++ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
+ SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
+ SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "")
+ if (WIN32)
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp
+--- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp     2011-11-29 19:26:07.562214311 +0100
++++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp      2011-11-29 19:26:14.538843182 +0100
+@@ -70,4 +70,3 @@
+ 
+ }
+ 
+-#include "moleculelist.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp
+--- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp	2011-11-29 18:53:45.492894371 +0100
+@@ -289,5 +289,3 @@
+ 
+ 
+ }
+-
+-#include "pythonengine_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp
+--- avogadro-1.0.3/libavogadro/src/pythonerror.cpp     2011-11-29 19:24:26.949426045 +0100
++++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp      2011-11-29 19:24:41.176015640 +0100
+@@ -112,4 +112,3 @@
+ 
+ } // namespace
+ 
+-#include "pythonerror.moc"
+
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp
+--- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp	2011-11-29 18:53:54.082847836 +0100
+@@ -340,5 +340,3 @@
+   }
+ 
+ }
+-
+-#include "pythonextension_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp
+--- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp	2011-11-29 18:54:02.269470152 +0100
+@@ -344,5 +344,3 @@
+   }
+ 
+ }
+-
+-#include "pythontool_p.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp
+--- avogadro-1.0.3/libavogadro/src/residue.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp	2011-11-29 18:54:14.316071557 +0100
+@@ -160,6 +160,3 @@
+   }
+ 
+ } // End namespace Avogadro
+-
+- #include "residue.moc"
+-
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp
+--- avogadro-1.0.3/libavogadro/src/tool.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp	2011-11-29 18:55:05.515794184 +0100
+@@ -117,5 +117,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "tool.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp
+--- avogadro-1.0.3/libavogadro/src/toolgroup.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp	2011-11-29 18:55:11.699094018 +0100
+@@ -206,5 +206,3 @@
+   }
+ 
+ } // end namespace Avogadro
+-
+-#include "toolgroup.moc"
+diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp
+--- avogadro-1.0.3/libavogadro/src/zmatrix.cpp	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp	2011-11-29 18:55:17.209064168 +0100
+@@ -149,5 +149,3 @@
+ 
+ 
+ } // End namespace Avogadro
+-
+-#include "zmatrix.moc"
diff --git a/extra/boost/BOOST_FOREACH.patch b/extra/boost/BOOST_FOREACH.patch
new file mode 100644
index 000000000..12cf08800
--- /dev/null
+++ b/extra/boost/BOOST_FOREACH.patch
@@ -0,0 +1,60 @@
+Index: /trunk/boost/foreach_fwd.hpp

+===================================================================

+--- /trunk/boost/foreach_fwd.hpp	(revision 62661)

++++ /trunk/boost/foreach_fwd.hpp	(revision 75540)

+@@ -15,4 +15,6 @@

+ #define BOOST_FOREACH_FWD_HPP

+ 

++#include <utility> // for std::pair

++

+ // This must be at global scope, hence the uglified name

+ enum boost_foreach_argument_dependent_lookup_hack

+@@ -26,4 +28,7 @@

+ namespace foreach

+ {

++    template<typename T>

++    std::pair<T, T> in_range(T begin, T end);

++

+     ///////////////////////////////////////////////////////////////////////////////

+     // boost::foreach::tag

+@@ -47,4 +52,22 @@

+ } // namespace foreach

+ 

++// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131

++namespace BOOST_FOREACH

++{

++    using foreach::in_range;

++    using foreach::tag;

++

++    template<typename T>

++    struct is_lightweight_proxy

++      : foreach::is_lightweight_proxy<T>

++    {};

++

++    template<typename T>

++    struct is_noncopyable

++      : foreach::is_noncopyable<T>

++    {};

++

++} // namespace BOOST_FOREACH

++

+ } // namespace boost

+ 

+Index: /trunk/boost/foreach.hpp

+===================================================================

+--- /trunk/boost/foreach.hpp	(revision 75077)

++++ /trunk/boost/foreach.hpp	(revision 75540)

+@@ -166,5 +166,5 @@

+ //   at the global namespace for your type.

+ template<typename T>

+-inline boost::foreach::is_lightweight_proxy<T> *

++inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *

+ boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }

+ 

+@@ -191,5 +191,5 @@

+ //   at the global namespace for your type.

+ template<typename T>

+-inline boost::foreach::is_noncopyable<T> *

++inline boost::BOOST_FOREACH::is_noncopyable<T> *

+ boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }

+ 

diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 67219aee0..d55e68456 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141623 2011-10-31 21:27:41Z ibiru $
+# $Id: PKGBUILD 144045 2011-12-02 20:54:13Z ibiru $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
@@ -6,17 +6,19 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.47.0
+pkgver=1.48.0
 _boostver=${pkgver//./_}
 pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        exceptions.patch)
+        exceptions.patch
+        BOOST_FOREACH.patch)
 license=('custom')
-md5sums=('ff180a5276bec773a7625cac7e2288e8'
-         '9b44c28b36303152050c8c82469569c5')
+md5sums=('313a11e97eb56eb7efd18325354631be'
+         '9b44c28b36303152050c8c82469569c5'
+         '2db6098a1a39bced4c6162eb46418320')
 
 _stagedir="${srcdir}/stagedir"
 
@@ -27,9 +29,12 @@ build() {
   echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
   echo "using mpi ;" >> build/v2/user-config.jam
 
-  # http://web.archiveorange.com/archive/v/Q0J4VE5bwsy3zxRXqUgd
   cd "${srcdir}"/${pkgbase}_${_boostver}
-  patch -p0 -i "${srcdir}"/exceptions.patch
+  # https://svn.boost.org/trac/boost/ticket/5731
+  patch -p0 -i "${srcdir}/exceptions.patch"
+  # https://svn.boost.org/trac/boost/ticket/6131
+  patch -p2 -i "${srcdir}/BOOST_FOREACH.patch"
+
 
   # build bjam
   cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 50c70dce4..7ed8bfb8b 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=clamav
 pkgver=0.97.3
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Anti-virus toolkit for Unix'
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'zlib' 'libtool')
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 676f2e0a6..11c6236fb 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=cmake
 pkgver=2.8.6
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index eea93da40..ceb8b10c5 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136102 2011-08-23 01:57:57Z heftig $
+# $Id: PKGBUILD 144047 2011-12-02 20:54:17Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=3.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index 100333d7c..b6634892e 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -1,8 +1,10 @@
-# $Id: PKGBUILD 134800 2011-08-07 20:06:54Z ibiru $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Contributer: Martin Kemp <mdkemp@elys.com>
+# $Id: PKGBUILD 144039 2011-12-02 20:49:22Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Paul Mattal <paul@archlinux.org>
+# Contributor: Martin Kemp <mdkemp@elys.com>
+
 pkgname=ethtool
-pkgver=3.0
+pkgver=3.1
 pkgrel=1
 epoch=1
 pkgdesc="Utility for controlling network drivers and hardware"
@@ -10,16 +12,18 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=('glibc')
-source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('cb129398cbbf39859901b55ecac101da')
+#source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz)
+
+md5sums=('83a538a864b50549b7e4c79e7dd69849')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
 }
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 77c52b0f7..d20eeb882 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 143010 2011-11-20 20:58:22Z dan $
+# $Id: PKGBUILD 144099 2011-12-03 18:17:43Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.7.4
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -80,7 +80,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('5b6920989480a37ec65977e756b24961578795dd'
-          'cb21e55ae793865453c165a0e666348f2db8c740'
+sha1sums=('7453e737e008f7319a5eca24a9ef3c5fb1f13398'
+          '93315f7f51d7f27d3e421c9b0d64afa27f3d16df'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 0e15f3089..2b0820bda 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143652 2011-11-28 02:56:39Z eric $
+# $Id: PKGBUILD 144348 2011-12-04 22:01:25Z eric $
 #  Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=1.6
-_fmver=1.6
+pkgver=1.6.1
+_fmver=1.6.1
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
@@ -15,17 +15,17 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}
 if [ "$CARCH" = "i686" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('cb6f56170beffcd15faa68a02db976cdab1436da'
-          'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
-          '197b58f40880995d6442fd42a58fa1f4594fd19d'
-          '2797c326904af16a254c3e39b8c529ea14ef37e5')
+  sha1sums=('afafaafefcfc5f4bb76f6cbe7c4a39a478e351c2'
+            'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
+            '197b58f40880995d6442fd42a58fa1f4594fd19d'
+            '2797c326904af16a254c3e39b8c529ea14ef37e5')
 elif [ "$CARCH" = "x86_64" ]; then
   source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
           glsof-filemonitor glsof-queries)
-  sha1sums=('cb6f56170beffcd15faa68a02db976cdab1436da'
-          'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
-          '197b58f40880995d6442fd42a58fa1f4594fd19d'
-          '2797c326904af16a254c3e39b8c529ea14ef37e5')
+  sha1sums=('afafaafefcfc5f4bb76f6cbe7c4a39a478e351c2'
+            'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
+            '197b58f40880995d6442fd42a58fa1f4594fd19d'
+            '2797c326904af16a254c3e39b8c529ea14ef37e5')
 fi
 
 package() {
diff --git a/extra/gperf/PKGBUILD b/extra/gperf/PKGBUILD
index efc0ff0c6..b16444458 100644
--- a/extra/gperf/PKGBUILD
+++ b/extra/gperf/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gperf
 pkgver=3.0.4
-pkgrel=4
+pkgrel=4.1
 pkgdesc="Perfect hash function generator"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://www.gnu.org/software/gperf/"
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 07deaf13d..2403354bf 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 143016 2011-11-21 00:00:02Z bisson $
+# $Id: PKGBUILD 144296 2011-12-04 10:42:58Z bisson $
+
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
 pkgver=2.28.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('custom:EPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
+depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
 makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
 optdepends=('mono: sharp bindings'
             'guile: guile bindings'
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index ef7f376cc..49ff79d86 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141228 2011-10-26 22:25:00Z heftig $
+# $Id: PKGBUILD 144352 2011-12-04 23:08:08Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
-pkgver=2.14.0
+pkgver=2.14.1
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ optdepends=('gstreamer0.10-base: video support')
 options=('!libtool' '!emptydirs')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9db3e4f714d62b91185e4f8edbee2c98a85bd76f0d4b82a7d7868a9b86ae10a2')
+sha256sums=('002a6611112273189348871ff7c717fb3c776f5570656389e3d6c5b26bffa11f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD
index 26916756b..badee29f3 100644
--- a/extra/hplip/PKGBUILD
+++ b/extra/hplip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140998 2011-10-21 02:57:10Z eric $
+# $Id: PKGBUILD 144358 2011-12-05 03:45:19Z eric $
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
 
 pkgname=hplip
 pkgver=3.11.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
@@ -33,6 +33,12 @@ build() {
  export PYTHON=python2
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
  sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ sed -i 's|python ./print.py|python2 ./print.py|' scan.py
+ sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py 
+ sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
+ sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+
  # fix sysfs rules
  sed -i -e "s|SYSFS|ATTR|g" \
         -e "s|sysfs|attr|g" \
@@ -43,6 +49,8 @@ build() {
              --enable-foomatic-rip-hplip-install \
              --enable-foomatic-ppd-install \
              --enable-hpcups-install \
+             --enable-new-hpcups \
+             --enable-cups-ppd-install \
              --enable-cups-drv-install \
              --enable-hpijs-install \
              --enable-foomatic-drv-install \
@@ -54,7 +62,7 @@ build() {
 
 package() {
  cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d  DESTDIR="$pkgdir/" install
+ make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
  # remove config provided by sane and autostart of hp-daemon
  rm -rf "$pkgdir"/etc/{sane.d,xdg}
 }
diff --git a/extra/hspell/PKGBUILD b/extra/hspell/PKGBUILD
index 7c7ae15e0..969b98476 100644
--- a/extra/hspell/PKGBUILD
+++ b/extra/hspell/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=hspell
 pkgname=('hspell' 'hunspell-he')
 pkgver=1.1
-pkgrel=1
+pkgrel=1.1
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.ivrix.org.il/projects/spell-checker/"
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 9c5c23fd4..6b06a1d1c 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 139887 2011-10-05 19:06:49Z andrea $
+# $Id: PKGBUILD 144049 2011-12-02 20:54:20Z ibiru $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
 pkgver=2011.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hugin.sourceforge.net/"
diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD
index 54d5cfd56..65fda4b8c 100644
--- a/extra/hyphen/PKGBUILD
+++ b/extra/hyphen/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=hyphen
 pkgname=('hyphen' 'hyphen-en')
 pkgver=2.8.3
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hunspell.sf.net"
 license=('GPL' 'LGPL' 'MPL')
diff --git a/extra/jack/40-hpet-permissions.rules b/extra/jack/40-hpet-permissions.rules
new file mode 100644
index 000000000..7af3780f9
--- /dev/null
+++ b/extra/jack/40-hpet-permissions.rules
@@ -0,0 +1,2 @@
+KERNEL=="rtc0", GROUP="audio"
+KERNEL=="hpet", GROUP="audio"
diff --git a/extra/jack/99-audio.conf b/extra/jack/99-audio.conf
new file mode 100644
index 000000000..eb76ef920
--- /dev/null
+++ b/extra/jack/99-audio.conf
@@ -0,0 +1,2 @@
+@audio 	- rtprio 	99
+@audio 	- memlock 	unlimited
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index 99b225264..67bcb8355 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 138822 2011-09-28 16:36:05Z schiv $
+# $Id: PKGBUILD 144303 2011-12-04 16:54:45Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
@@ -6,7 +6,7 @@
 pkgname=jack
 _longname=jack-audio-connection-kit
 pkgver=0.121.3
-pkgrel=1
+pkgrel=4
 pkgdesc="A low-latency audio server"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
@@ -19,13 +19,17 @@ makedepends=('doxygen' 'celt')
 optdepends=('celt: NetJACK driver')
 }
 url="http://jackaudio.org/"
+backup=(etc/security/limits.d/99-audio.conf)
 options=('!libtool')
 provides=("$_longname=$pkgver")
 conflicts=("$_longname")
 replaces=("$_longname")
-changelog=$pkgname.changelog
-source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz")
-md5sums=('35f470f7422c37b33eb965033f7a42e8')
+source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz"
+        '99-audio.conf'
+        '40-hpet-permissions.rules')
+md5sums=('35f470f7422c37b33eb965033f7a42e8'
+         'ae65b7c9ebe0fff6c918ba9d97ae342d'
+         '471aad533ff56c5d3cbbf65ce32cadef')
 
 build() {
   cd "$srcdir/$_longname-$pkgver"
@@ -39,6 +43,19 @@ package() {
   cd "$srcdir/$_longname-$pkgver"
 
   make DESTDIR="$pkgdir" install
+
+  # configure realtime access/scheduling
+  # see https://bugs.archlinux.org/task/26343
+  install -Dm644 "$srcdir/99-audio.conf" \
+    "$pkgdir/etc/security/limits.d/99-audio.conf"
+
+  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
+    "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules"
+
+  # install a missing header forgotten by upstream
+  # see https://bugs.archlinux.org/task/26865
+  install -Dm644 "$srcdir/$_longname-$pkgver/jack/jslist.h" \
+    "$pkgdir/usr/include/jack/jslist.h"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/jhead/PKGBUILD b/extra/jhead/PKGBUILD
index ab14e0ba2..f44742aba 100644
--- a/extra/jhead/PKGBUILD
+++ b/extra/jhead/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 67926 2010-02-09 19:58:32Z giovanni $
+# $Id: PKGBUILD 144342 2011-12-04 21:25:01Z eric $
 # Maintainer: François Charette <francois ατ archlinux δοτ org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=jhead
-pkgver=2.90
+pkgver=2.93
 pkgrel=1
 pkgdesc="EXIF JPEG info parser and thumbnail remover"
-arch=(i686 x86_64 'mips64el')
 url="http://www.sentex.net/~mwandel/jhead/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -14,13 +13,17 @@ depends=('glibc')
 optdepends=('libjpeg: to up-right images according to rotation tag')
 source=(http://www.sentex.net/~mwandel/${pkgname}/${pkgname}-${pkgver}.tar.gz 
         LICENSE)
-md5sums=('661effa9420bb92cb99ced697c5a177f'
+md5sums=('23ac51b4aea2df663d684744e282eb7d'
          '1f0db611d2642a981719f45252762a45')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make || return 1
-  install -D -m755 jhead "${pkgdir}/usr/bin/jhead" || return 1
-  install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1" || return 1
-  install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -D -m755 jhead "${pkgdir}/usr/bin/jhead"
+  install -D -m644 jhead.1 "${pkgdir}/usr/share/man/man1/jhead.1"
+  install -D -m644 ${srcdir}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index 815d268e2..e2a5ad425 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143501 2011-11-25 08:27:09Z andrea $
+# $Id: PKGBUILD 144051 2011-12-02 20:54:24Z ibiru $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
 pkgver=4.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index da5825e84..543cfd671 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 90511 2010-09-12 10:03:56Z pierre $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 144356 2011-12-05 01:48:51Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
 # Contributor: Sergio Jovani Guzman <moret@paretux.org>
 
 pkgname=konversation
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.4
+pkgrel=1
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://konversation.kde.org"
-depends=('kdebase-runtime' 'kdepimlibs')
+depends=('kdebase-runtime' 'kdepimlibs' 'python')
 makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
 license=('GPL2' 'FDL')
 install=${pkgname}.install
 options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f43ac55e4925e9578e87b13fde173671')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
 
 build() {
-  cd ${srcdir}
-  sed 's#/usr/bin/env python#/usr/bin/python2#' \
-	-i ${pkgname}-${pkgver}/data/scripts/media
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -31,6 +30,11 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+  
+  # Remove a bunch of symlinks pointing to non-existant files
+  for lang in pt_BR uk sv et de en nl; do
+     rm  "${pkgdir}"/usr/share/doc/kde/html/${lang}/konversation/common
+  done
 }
diff --git a/extra/konversation/konversation.install b/extra/konversation/konversation.install
index e70c054ec..5a3809d3f 100644
--- a/extra/konversation/konversation.install
+++ b/extra/konversation/konversation.install
@@ -1,5 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+   update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD
index a3907bc85..97ef4c538 100644
--- a/extra/lcms/PKGBUILD
+++ b/extra/lcms/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=lcms
 pkgver=1.19
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Lightweight color management development library/engine"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
diff --git a/extra/libcaca/PKGBUILD b/extra/libcaca/PKGBUILD
index 8252e22ee..75ebd7d0b 100644
--- a/extra/libcaca/PKGBUILD
+++ b/extra/libcaca/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libcaca
 pkgver=0.99.beta17
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Color AsCii Art library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index b107ffa9a..ce429f367 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 132812 2011-07-26 11:18:58Z ibiru $
+# $Id: PKGBUILD 144053 2011-12-02 20:54:26Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
 pkgver=20100913
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
@@ -15,10 +15,9 @@ provides=('liborigin')
 source=(http://download.berlios.de/qtiplot/${pkgbase}-13092010.zip
 	liborigin.pro.archlinux
 	http://tree.phi-sci.com/tree.hh)
-md5sums=('e2b41c4d8a1e2d357dd2b5b331d31375' '2b19f7a4bd120f6d689edc327468e48e'\
-         'd24a1c3bdd811354ea7f5885d86ddacb')
-sha1sums=('3f17d5a8c484ddb864a29a91a94d677b0b3b18d7' '1664b00929d6fba6e5ebcf7cb422e1da1b3897a5'\
-         'd10344d969e0b892c21e1bd5bd3541d838526b24')
+md5sums=('e2b41c4d8a1e2d357dd2b5b331d31375'
+         '2b19f7a4bd120f6d689edc327468e48e'
+         '966ef25cb42d192a694a71eedf484c1c')
 
 build() {
 	cd "${srcdir}/${pkgbase}"
@@ -35,7 +34,7 @@ build() {
 
 package_liborigin2() {
         pkgdesc="A library for reading OriginLab OPJ project files"
-        depends=('gcc-libs' 'boost-libs')
+        depends=('boost-libs')
 
         cd "${srcdir}/${pkgbase}"
 
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 10ccfe074..b9d706267 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132809 2011-07-26 11:04:44Z ibiru $
+# $Id: PKGBUILD 144055 2011-12-02 20:54:29Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
 pkgver=0.6.53
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index fe7c8f49d..7974c9390 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 140204 2011-10-09 10:15:48Z ibiru $
+# $Id: PKGBUILD 144057 2011-12-02 20:54:34Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.15.8
+pkgver=0.15.9
 pkgrel=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
@@ -11,17 +11,18 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('boost-libs' 'python2')
 makedepends=('boost')
-source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('9e21ebfa6fba19b237754a10ae9b8007781c48f0')
+options=('!libtool' '!emptydirs')
+source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+sha1sums=('d86eb9d4452d07715a355d3a67312f162d6eff3a')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr --enable-python-binding
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index e3c91ccb8..c81995711 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 137636 2011-09-10 09:15:43Z ronald $
+# $Id: PKGBUILD 144059 2011-12-02 20:54:39Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.1
-pkgrel=2
-pkgdesc="An advanced open-source document processor."
+pkgrel=3
+pkgdesc="An advanced open-source document processor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lyx.org"
 depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
 makedepends=('boost')
 license=('GPL')
-source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz \
+source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
         lyx.desktop lyxrc.dist)
 backup=('etc/lyx/lyxrc.dist')
 install=lyx.install
@@ -36,10 +36,12 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # install desktop entry
-  install -Dm644 "${srcdir}/lyx.desktop" "${pkgdir}/usr/share/applications/lyx.desktop"
+  install -Dm644 "${srcdir}/lyx.desktop" \
+    "${pkgdir}/usr/share/applications/lyx.desktop"
+  install -Dm644 "lib/images/lyx.png" \
+    "${pkgdir}/usr/share/pixmaps/lyx.png"
 
   # install default config file
-  install -Dm644 ${srcdir}/lyxrc.dist ${pkgdir}/etc/lyx/lyxrc.dist
-  ln -sf /etc/lyx/lyxrc.dist ${pkgdir}/usr/share/lyx/lyxrc.dist
+  install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
+  ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"
 }
-
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 4e6e9240d..ecd33c675 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141720 2011-11-02 15:09:38Z giovanni $
+# $Id: PKGBUILD 144344 2011-12-04 21:37:38Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.0
+pkgver=2.0.1
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('38f439a63bae1687d385758c8ad3d53e'
+md5sums=('16576b3089a88a84a35edc30e17a03a9'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 1d1ff869f..c45eb034c 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 141066 2011-10-23 00:15:19Z giovanni $
+# $Id: PKGBUILD 144061 2011-12-02 20:54:42Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.0.1
-pkgrel=4
+pkgver=5.1.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'\
+makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('93fbbe946de6013eca699c0c2a93a4e9')
+md5sums=('fed878893a7f292969e8bd81c7ab9209')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -20,12 +21,19 @@ build() {
   sed -i -e '/curl/d' configure.in
   export CURL_CFLAGS="" CURL_LIBS=""
 
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
+  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
+  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
 
   autoreconf
 
   ./configure --prefix=/usr \
+              --with-boost-libdir=/usr/lib \
+              --disable-gui
+  rake
+
+  mv src/mkvinfo{,-cli}
+
+  ./configure --prefix=/usr \
               --with-boost-libdir=/usr/lib
   rake
 }
@@ -40,6 +48,9 @@ package_mkvtoolnix-cli() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   rake DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/bin/mkvinfo
+  install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
+
   rm -rf "${pkgdir}"/usr/bin/mmg
   rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
@@ -59,6 +70,9 @@ package_mkvtoolnix-gtk() {
 
   rake DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/bin/mkv*
+  install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
+  sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
+
   rm -rf "${pkgdir}"/usr/share/doc
   rm -rf "${pkgdir}"/usr/share/locale
   rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index 373444048..8653eac60 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,42 +1,42 @@
-# $Id: PKGBUILD 140175 2011-10-08 12:02:46Z ibiru $
+# $Id: PKGBUILD 144089 2011-12-03 12:24:56Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.81
+pkgver=0.82
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
 url="http://www.bitwizard.nl/mtr/"
-md5sums=('b7a7914f1fc1b5a21ab10bdca44356e1')
+md5sums=('10601ea543fda3e51545c4bce195b64c')
 
 build() {
-    install -d  "${srcdir}/"{mtr-cli,mtr-gtk}
-    cd "${srcdir}/mtr-cli"
-    ../${pkgbase}-${pkgver}/configure --prefix=/usr --disable-gtktest --without-gtk
+    install -d  "$srcdir/"{mtr-cli,mtr-gtk}
+    cd "$srcdir/mtr-cli"
+    ../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
     make
 
-    cd "${srcdir}/mtr-gtk"
-    ../${pkgbase}-${pkgver}/configure --prefix=/usr
+    cd "$srcdir/mtr-gtk"
+    ../$pkgbase-$pkgver/configure --prefix=/usr
     make
 }
 
 package_mtr() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)"
     depends=('ncurses')
-    cd "${srcdir}/mtr-cli"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/mtr-cli"
+    make DESTDIR="$pkgdir" install
 }
 
 package_mtr-gtk() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (GTK version)"
     depends=('ncurses' "gtk2")
     conflicts=("mtr")
-    provides=("mtr=${pkgver}")
+    provides=("mtr=$pkgver")
 
-    cd "${srcdir}/mtr-gtk"
-    make DESTDIR="${pkgdir}" install
+    cd "$srcdir/mtr-gtk"
+    make DESTDIR="$pkgdir" install
 }
diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD
index 43ea70fd4..3250a33a4 100644
--- a/extra/netpbm/PKGBUILD
+++ b/extra/netpbm/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=netpbm
 pkgver=10.47.24
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A toolkit for manipulation of graphic images"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom' 'BSD' 'GPL' 'LGPL')
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index fb2ee89fc..4ded98b7e 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 142640 2011-11-12 17:15:38Z ibiru $
+# $Id: PKGBUILD 144087 2011-12-03 09:31:31Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.3.1
-pkgrel=2
+pkgver=2.3.1_a
+_realver=2.3.1
+pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030'
+depends=('jasper' 'gstreamer0.10-base' 'openexr'
          'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
 makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('python2-numpy: Python 2.x interface'
-            'eigen2')
+optdepends=('opencv-docs'
+            'opencv-samples'
+            'eigen2'
+            'python2-numpy: Python 2.x interface')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2")
-md5sums=('827c9f8aa14384c531c73aa165f9b777')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2")
+md5sums=('82e4b6bfa349777233eea09b075e931e')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
@@ -45,7 +48,7 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D USE_FAST_MATH=ON')
 
 build() {
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$_realname-$_realver"
 
   # x64, i.e "Athlon64" and upwards, can use SSE3
   [ $CARCH = x86_64 ] && \
@@ -57,14 +60,12 @@ build() {
 }
 
 package_opencv() {
-  install=$pkgname.install
-
-  cd "$srcdir/$_realname-$pkgver"
+  cd "$srcdir/$_realname-$_realver"
 
   make DESTDIR="$pkgdir" install
 
   # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   cd "$pkgdir/usr/share"
@@ -85,8 +86,8 @@ package_opencv() {
 
 package_opencv-docs() {
   pkgdesc+=" (documentation)"
-  depends=()
-  optdepends=()
+  unset depends
+  unset optdepends
   options=('docs')
 
   cd "$srcdir"
@@ -97,9 +98,9 @@ package_opencv-docs() {
 
 package_opencv-samples() {
   pkgdesc+=" (samples)"
-  depends=()
-  optdepends=()
-  options=()
+  depends=('bash')
+  unset optdepends
+  unset options
 
   cd "$srcdir"
 
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index 3155b0967..c6fe0f765 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 134578 2011-08-06 08:18:12Z andrea $
+# $Id: PKGBUILD 144346 2011-12-04 21:50:29Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
 
 pkgbase=redland
 epoch=1
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
-pkgver=1.0.14
+pkgver=1.0.15
 pkgrel=1
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
-makedepends=('rasqal>=0.9.26' 'raptor>=2.0.4' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
+makedepends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
 options=('!libtool')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz
         rpath.diff)
-md5sums=('3400579d137da82c4175debf9f6d53ba'
+md5sums=('b0deb87f3c7d3237a3d587c1e0f2f266'
          'acc85e784f01a656bd56777f95880787')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--enable-release \
 	--disable-static \
@@ -27,52 +27,52 @@ build() {
 	--with-sqlite=3
 
   # nuke rpath
-  patch -Np0 -i ${srcdir}/rpath.diff
+  patch -Np0 -i "${srcdir}/rpath.diff"
 
   make
 }
 
 package_redland() {
  pkgdesc="Library that provides a high-level interface to RDF data"
- depends=('rasqal>=0.9.26' 'raptor>=2.0.4' 'libtool')
+ depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libtool')
  
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/lib/redland
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}/usr/lib/redland"
 }
 
 package_redland-storage-mysql() {
  pkgdesc="MySQL storage support for Redland"
  depends=('redland' 'libmysqlclient')
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  install -dm755 ${pkgdir}/usr/lib/redland
-  install -m755 src/.libs/librdf_storage_mysql.so ${pkgdir}/usr/lib/redland/librdf_storage_mysql.so 
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -dm755 "${pkgdir}/usr/lib/redland"
+  install -m755 src/.libs/librdf_storage_mysql.so "${pkgdir}/usr/lib/redland/librdf_storage_mysql.so"
 }
 
 package_redland-storage-postgresql() {
  pkgdesc="PostgreSQL storage support for Redland"
  depends=('redland' 'postgresql-libs')
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  install -dm755 ${pkgdir}/usr/lib/redland
-  install -m755 src/.libs/librdf_storage_postgresql.so ${pkgdir}/usr/lib/redland/
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -dm755 "${pkgdir}/usr/lib/redland"
+  install -m755 src/.libs/librdf_storage_postgresql.so "${pkgdir}/usr/lib/redland/"
 }
 
 package_redland-storage-virtuoso() {
  pkgdesc="Virtuoso storage support for Redland"
  depends=('redland' 'unixodbc' 'db')
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  install -dm755 ${pkgdir}/usr/lib/redland
-  install -m755 src/.libs/librdf_storage_virtuoso.so ${pkgdir}/usr/lib/redland/
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -dm755 "${pkgdir}/usr/lib/redland"
+  install -m755 src/.libs/librdf_storage_virtuoso.so "${pkgdir}/usr/lib/redland/"
 }
 
 package_redland-storage-sqlite() {
  pkgdesc="SQLite storage support for Redland"
  depends=('redland' 'sqlite3' 'db')
  
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  install -dm755 ${pkgdir}/usr/lib/redland
-  install -m755 src/.libs/librdf_storage_sqlite.so ${pkgdir}/usr/lib/redland/
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -dm755 "${pkgdir}/usr/lib/redland"
+  install -m755 src/.libs/librdf_storage_sqlite.so "${pkgdir}/usr/lib/redland/"
 }
diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog
index d4275a700..a374f7b27 100644
--- a/extra/rxvt-unicode/ChangeLog
+++ b/extra/rxvt-unicode/ChangeLog
@@ -1,3 +1,6 @@
+2011-12-02  Angel Velasquez <angvp@archlinux.org>
+	* Moved perl from optdepend to depend (closes FS#25782)
+
 2011-05-22  Angel Velasquez <angvp@archlinux.org>
 	* Rebuilt against perl 5.14.0
 
diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD
index 919693667..ef8c89f59 100644
--- a/extra/rxvt-unicode/PKGBUILD
+++ b/extra/rxvt-unicode/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 129923 2011-06-29 23:05:47Z stephane $
+# $Id: PKGBUILD 144079 2011-12-03 04:45:00Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
 pkgver=9.12
-pkgrel=1
+pkgrel=2
 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://software.schmorp.de/pkg/rxvt-unicode.html"
 license=('GPL')
-depends=('gcc-libs' 'libxft' 'gdk-pixbuf2')
-optdepends=('perl: lots of utilities' 'gtk2-perl: to use the urxvt-tabbed')
+depends=('gcc-libs' 'libxft' 'gdk-pixbuf2' 'perl')
+optdepends=('gtk2-perl: to use the urxvt-tabbed')
 changelog=ChangeLog
 source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \
         ${pkgname}.desktop)
diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD
index 2a07a7c2c..5a72f859e 100644
--- a/extra/sdl_gfx/PKGBUILD
+++ b/extra/sdl_gfx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96464 2010-10-21 10:33:40Z allan $
+# $Id: PKGBUILD 144350 2011-12-04 22:59:47Z heftig $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_gfx
-pkgver=2.0.22
+pkgver=2.0.23
 pkgrel=1
 pkgdesc="SDL Graphic Primitives"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ options=(!libtool)
 url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx"
 source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz)
 depends=('sdl')
-md5sums=('330f291f1f09a1bdf397c9b40d92ca41')
+md5sums=('fcc3c4f2d1b4943409bf7e67dd65d03a')
 
 build() {
   cd ${srcdir}/SDL_gfx-${pkgver}
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index a40896dd4..333ad967f 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136931 2011-09-03 00:12:21Z giovanni $
+# $Id: PKGBUILD 144063 2011-12-02 20:54:47Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD
index f9cfe45e5..2ef0460bf 100644
--- a/extra/thinkfinger/PKGBUILD
+++ b/extra/thinkfinger/PKGBUILD
@@ -1,27 +1,35 @@
-# $Id: PKGBUILD 101457 2010-11-29 10:02:41Z allan $
-# Maintainer: François Charette <francois.archlinux.org>
+# $Id: PKGBUILD 144027 2011-12-02 07:42:30Z andrea $
+# Maintainer:
+# Contributor: François Charette <francois.archlinux.org>
 # Contributor: Damir Perisa <damir.archlinux.org>
 # Contributor: Björn Martensen <bjoern.martensen@gmail.com>
 
 pkgname=thinkfinger
 pkgver=0.3
-pkgrel=4
-pkgdesc="ThinkFinger is a driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads"
+pkgrel=5
+pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads"
 url="http://thinkfinger.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=("GPL")
 depends=('pam' 'libusb-compat')
 install=thinkfinger.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/thinkfinger/$pkgname-$pkgver.tar.gz thinkfinger-uinput-hack.patch)
+options=('!libtool' 'emptydirs')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        'thinkfinger-uinput-hack.patch'
+        'gcc46.patch')
 md5sums=('588565233bcbea5ff0a7f5314361c380'
-         '71dc334282d19e6db4f6254542ba563c')
+         '71dc334282d19e6db4f6254542ba563c'
+         '93c80f342329a5bd40f5f324fe670225')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+
   # Patch from Ubuntu: see http://bugs.archlinux.org/task/12580
-  patch -p0 < ../thinkfinger-uinput-hack.patch
-  ./configure 	--prefix=/usr \
+  patch -p0 -i "${srcdir}"/thinkfinger-uinput-hack.patch
+
+  patch -p1 -i "${srcdir}"/gcc46.patch
+
+  ./configure --prefix=/usr \
   		--with-securedir=/lib/security \
 		--with-birdir=/etc/pam_thinkfinger
   make
@@ -35,4 +43,3 @@ package() {
   
   make DESTDIR=$pkgdir install
 }
-
diff --git a/extra/thinkfinger/gcc46.patch b/extra/thinkfinger/gcc46.patch
new file mode 100644
index 000000000..24e4b534f
--- /dev/null
+++ b/extra/thinkfinger/gcc46.patch
@@ -0,0 +1,22 @@
+--- a/pam/Makefile.am
++++ b/pam/Makefile.am
+@@ -8,7 +8,7 @@ pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h p
+ else
+ pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ endif
+-pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
++pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
+ pam_thinkfinger_so_CFLAGS = $(CFLAGS)
+ pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+ 
+--- a/pam/Makefile.in
++++ b/pam/Makefile.in
+@@ -201,7 +201,7 @@ pamdir = $(SECUREDIR)
+ INCLUDES = -I$(top_srcdir)/libthinkfinger
+ @HAVE_OLD_PAM_FALSE@pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+ @HAVE_OLD_PAM_TRUE@pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c
+-pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
++pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed
+ pam_thinkfinger_so_CFLAGS = $(CFLAGS)
+ pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS)
+ all: all-am
diff --git a/extra/wesnoth/PKGBUILD b/extra/wesnoth/PKGBUILD
index 9a2ef8d08..ed809500d 100644
--- a/extra/wesnoth/PKGBUILD
+++ b/extra/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 132797 2011-07-26 09:16:15Z ibiru $
+# $Id: PKGBUILD 144065 2011-12-02 20:54:51Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Jacobo Arvelo <unix4all@ya.com>
@@ -6,7 +6,7 @@
 
 pkgname=wesnoth
 pkgver=1.8.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -14,18 +14,33 @@ url="http://www.wesnoth.org/"
 depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core')
 makedepends=('boost')
 install=wesnoth.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+options=(!emptydirs)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
         wesnoth-libpng-1.4.0.patch
-        wesnoth-1.8.6-boost-foreach.patch)
+        wesnoth-1.8.6-boost-foreach.patch
+        wesnoth.tmpfiles.conf)
 md5sums=('f1c3179869b01b61e253e74aeb241034'
          'ca7412ffc4682ef55ddf82d56b0e2f08'
-         'dc414ab7e1334941548e9db6db9c2460')
+         'dc414ab7e1334941548e9db6db9c2460'
+         'b8122f5054e3895c9c054e87460869dc')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/wesnoth-libpng-1.4.0.patch"
-  patch -Np1 -i "${srcdir}/wesnoth-1.8.6-boost-foreach.patch"
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch"
+  patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch"
   ./autogen.sh
-  ./configure --prefix=/usr --localstatedir=/var --enable-tools --enable-editor --enable-server
-  make DESTDIR="${pkgdir}" install-exec
+  ./configure --prefix=/usr --localstatedir=/var --enable-tools \
+      --enable-editor --enable-server --with-fifodir=/run/wesnothd
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install-exec
+  install -dm755 "$pkgdir/usr/lib/tmpfiles.d/"
+  install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf"
+
+  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager"
+  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent"
+  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope"
+  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint"
 }
diff --git a/extra/wesnoth/wesnoth.tmpfiles.conf b/extra/wesnoth/wesnoth.tmpfiles.conf
new file mode 100644
index 000000000..3ec0f6013
--- /dev/null
+++ b/extra/wesnoth/wesnoth.tmpfiles.conf
@@ -0,0 +1 @@
+D /run/wesnothd 0700 root root -
diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index f22c7665c..0ff24e168 100644
--- a/extra/xine-ui/PKGBUILD
+++ b/extra/xine-ui/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 118860 2011-04-09 04:40:36Z eric $
+# $Id: PKGBUILD 144037 2011-12-02 17:33:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-ui
 pkgver=0.99.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.xine-project.org"
-depends=('xine-lib' 'curl' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft'
-	'libxxf86vm' 'readline' 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
-	'desktop-file-utils' 'lirc-utils')
+depends=('xine-lib' 'curl' 'libxtst'  'libpng' 'libxft' 'libxxf86vm'
+	 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
+	 'desktop-file-utils' 'lirc-utils')
 makedepends=('libxt')
-options=('!emptydirs' '!strip')
+options=('!strip')
 install=xine-ui.install
 source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz
 	lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch 
         fix_lirc.diff xine-ui-xdg.diff)
-md5sums=('d468b4e7fe39ff19888261e1da9be914'
-         '4f06f63f5fd55b08a648e5d63f881898'
-         '9f5acaf14f3945aa2ce428631d09cd47'
-         '0174bd096756b9c6f47e9b8b5ff6e145'
-         '5972b4061acf3b553760de9ae2178d38')
+sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e'
+          'b2df43ede3a9d1a34b80139704a4cbbc7295c584'
+          '8bbd39f61de7b6991385457a4944b8ea104da88b'
+          '2361df9ddad59c426b0f863414c6d527b463a38a'
+          '9c70c6543dae6815710b239b4638ffe3843bac86')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,6 +29,7 @@ build() {
   patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch"
   patch -p1 < "${srcdir}/fix_lirc.diff"
   patch -p1 < "${srcdir}/xine-ui-xdg.diff"
+  sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c
   autoconf
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --with-x --enable-lirc --without-aalib --enable-debug
@@ -37,7 +38,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/usr/share/applications"
-  mv "${pkgdir}/usr/share/xine/desktop/xine.desktop" "${pkgdir}/usr/share/applications"
+  make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install
 }