Mon Apr 1 00:05:25 PDT 2013

23 files changed, 192 insertions, 67 deletions

diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 2a7e08f66..6fe2fbdaf 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180678 2013-03-25 19:15:27Z bpiotrowski $
+# $Id: PKGBUILD 181115 2013-03-31 19:16:36Z stephane $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
 pkgver=1.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://community.kde.org/KDE_PIM/Akonadi'
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 9a0b47174..a043648bb 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,29 +1,35 @@
-# $Id: PKGBUILD 176282 2013-01-28 16:48:15Z stephane $
+# $Id: PKGBUILD 181116 2013-03-31 19:16:38Z stephane $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
 license=('GPL2')
 depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost' 'doxygen' 'mesa')
+makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl')
 install=avogadro.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('f4fbef5ffc69cc312b2316426c36a78d')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'boost153.patch')
+md5sums=('f4fbef5ffc69cc312b2316426c36a78d'
+         'aa2573f78d5dbd85b3cb79e08acde8ab')
 
 build() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/boost153.patch
+  cd ../
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
+    -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
   make
 }
 
diff --git a/extra/avogadro/boost153.patch b/extra/avogadro/boost153.patch
new file mode 100644
index 000000000..fd8685974
--- /dev/null
+++ b/extra/avogadro/boost153.patch
@@ -0,0 +1,60 @@
+--- avogadro-1.1.0/libavogadro/src/pythonengine_p.h~	2013-03-29 12:46:16.306165881 +0000
++++ avogadro-1.1.0/libavogadro/src/pythonengine_p.h	2013-03-29 12:45:43.123089622 +0000
+@@ -27,7 +27,9 @@
+ 
+ #include <avogadro/global.h>
+ #include <avogadro/engine.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ namespace Avogadro {
+ 
+--- avogadro-1.1.0/libavogadro/src/pythonextension_p.h~	2013-03-29 12:46:32.156043085 +0000
++++ avogadro-1.1.0/libavogadro/src/pythonextension_p.h	2013-03-29 12:47:07.265771087 +0000
+@@ -29,7 +29,9 @@
+ #include <avogadro/extension.h>
+ #include <avogadro/primitive.h>
+ #include <avogadro/glwidget.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ #include <QWidget>
+ #include <QList>
+--- avogadro-1.1.0/libavogadro/src/pythontool_p.h~	2013-03-29 12:47:33.335569185 +0000
++++ avogadro-1.1.0/libavogadro/src/pythontool_p.h	2013-03-29 12:47:50.732101147 +0000
+@@ -27,7 +27,9 @@
+ 
+ #include <avogadro/global.h>
+ #include <avogadro/tool.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ #include <QObject>
+ #include <QAction>
+--- avogadro-1.1.0/libavogadro/src/pythoninterpreter.h~	2013-03-29 12:50:46.550738652 +0000
++++ avogadro-1.1.0/libavogadro/src/pythoninterpreter.h	2013-03-29 12:51:00.853961341 +0000
+@@ -26,7 +26,9 @@
+ #define PYTHONINTERPRETER_H
+ 
+ #include <avogadro/global.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ #include <avogadro/primitive.h>
+ #include <QString>
+ 
+--- avogadro-1.1.0/libavogadro/src/pythonscript.h~	2013-03-29 12:52:00.723488935 +0000
++++ avogadro-1.1.0/libavogadro/src/pythonscript.h	2013-03-29 12:52:11.676745364 +0000
+@@ -27,7 +27,9 @@
+ #define PYTHONSCRIPT_H
+ 
+ #include <avogadro/global.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ 
+ #include "pythonerror.h"
+ 
diff --git a/extra/barcode/PKGBUILD b/extra/barcode/PKGBUILD
index b69e764d5..9d264fd57 100644
--- a/extra/barcode/PKGBUILD
+++ b/extra/barcode/PKGBUILD
@@ -1,31 +1,28 @@
-# $Id: PKGBUILD 143715 2011-11-28 16:39:50Z giovanni $
+# $Id: PKGBUILD 181063 2013-03-31 07:43:24Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=barcode
-pkgver=0.98
-pkgrel=4
+pkgver=0.99
+pkgrel=1
 pkgdesc="A tool to convert text strings to printed bars"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/barcode/"
 license=('GPL')
 depends=('glibc')
 install=barcode.install
-source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7f10c3307b84a19a4ab2fa4b3f2974da')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('cdc504ee1020e27fbfeebcb0718de054')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --infodir=/usr/share/info
+  ./configure --prefix=/usr
+
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make prefix="${pkgdir}/usr" MAN1DIR="${pkgdir}/usr/share/man/man1" \
-    MAN3DIR="${pkgdir}/usr/share/man/man3" INFODIR="${pkgdir}/usr/share/info" install || return 1
-  gzip ${pkgdir}/usr/share/info/barcode.info
+  make prefix="${pkgdir}/usr" install
 }
diff --git a/extra/barcode/barcode.install b/extra/barcode/barcode.install
index 2f566fcfd..83966a37d 100644
--- a/extra/barcode/barcode.install
+++ b/extra/barcode/barcode.install
@@ -2,18 +2,18 @@ infodir=/usr/share/info
 filelist=(barcode.info.gz)
 
 post_install() {
-  [ -x usr/bin/install-info ] || return 0
+  [ -x usr/bin/install-info ]
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
+  [ -x usr/bin/install-info ]
   for file in ${filelist[@]}; do
     install-info --delete $infodir/$file $infodir/dir 2> /dev/null
   done
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 4ca50f46f..d2ecd0b95 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180862 2013-03-27 13:30:16Z stephane $
+# $Id: PKGBUILD 181117 2013-03-31 19:16:40Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
@@ -8,16 +8,16 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.52.0
+pkgver=1.53.0
 _boostver=${pkgver//./_}
-pkgrel=3
+pkgrel=2
 url="http://www.boost.org/"
 arch=('i686' 'x86_64')
 license=('custom')
 makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        boost-1.52.0-python3.patch)
-sha1sums=('1120430030315b0a94b6d63fc04662960db2444c'
+        boost-1.53.0-python3.patch)
+sha1sums=('0e4ef26cc7780c6bbc63987ef2f29be920e2395b'
           '34026072a7cb2534164f20e77bb71a5c75093307')
 
 _stagedir="${srcdir}/stagedir"
@@ -29,7 +29,7 @@ build() {
 
    # Fix build errors with python 3
    sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
-   patch -Np1 -i ../boost-1.52.0-python3.patch
+   patch -Np1 -i ../boost-1.53.0-python3.patch
 
    # Shut up strict aliasing warnings
    echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam
diff --git a/extra/boost/boost-1.52.0-python3.patch b/extra/boost/boost-1.53.0-python3.patch
index 8d2f59269..8d2f59269 100644
--- a/extra/boost/boost-1.52.0-python3.patch
+++ b/extra/boost/boost-1.53.0-python3.patch
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 1d0672c96..09602b212 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178391 2013-02-21 05:39:42Z heftig $
+# $Id: PKGBUILD 181118 2013-03-31 19:16:41Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=4.0.1
-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/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index 3de8f7cd9..bb983bc6a 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176285 2013-01-28 16:48:18Z stephane $
+# $Id: PKGBUILD 181119 2013-03-31 19:16:43Z stephane $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=enblend-enfuse
 pkgver=4.0
-pkgrel=9
+pkgrel=10
 pkgdesc="Intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64")
 license=('GPL')
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index a4dbefbd4..0f4dfca35 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176286 2013-01-28 16:48:18Z stephane $
+# $Id: PKGBUILD 181120 2013-03-31 19:16:44Z stephane $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=hugin
 pkgver=2012.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index 434a5bfbf..b95de8ebe 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179377 2013-03-05 15:31:42Z andrea $
+# $Id: PKGBUILD 181121 2013-03-31 19:16:45Z stephane $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
 arch=('i686' 'x86_64')
@@ -16,7 +16,6 @@ source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
 sha1sums=('44b6c9d6585d42cb1b5d9970fd6a43c9c0610ca1')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../kig-${pkgver} \
@@ -27,7 +26,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 
   # Use the python2 executable
diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD
index eba18f661..4d528d475 100644
--- a/extra/libkolabxml/PKGBUILD
+++ b/extra/libkolabxml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179113 2013-03-03 18:40:24Z andrea $
+# $Id: PKGBUILD 181122 2013-03-31 19:16:46Z stephane $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkolabxml
 pkgver=0.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Kolab XML Format Schema Definitions Library"
 url='http://git.kolab.org/libkolabxml/'
 arch=('i686' 'x86_64')
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index e46845188..c54ba288a 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176290 2013-01-28 16:48:23Z stephane $
+# $Id: PKGBUILD 181123 2013-03-31 19:16:47Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
 pkgver=0.6.54
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 087d55f7d..6e0c63505 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180922 2013-03-28 12:43:45Z ioni $
+# $Id: PKGBUILD 181124 2013-03-31 19:16:50Z stephane $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
 pkgver=0.16.9
-pkgrel=1
+pkgrel=2
 epoch=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/"
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index f1557447c..4f3355d44 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178969 2013-03-01 10:22:04Z andrea $
+# $Id: PKGBUILD 181125 2013-03-31 19:16:53Z stephane $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Advanced graphical ICQ clone and more for Unix" 
 arch=('i686' 'x86_64')
 url="http://www.licq.org"
@@ -17,8 +17,6 @@ md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  . /etc/profile.d/qt4.sh
-
   # licq
   mkdir build
   cd build
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index a9e616335..c476c39b7 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180835 2013-03-26 16:00:15Z giovanni $
+# $Id: PKGBUILD 181055 2013-03-31 07:01:25Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.03.23
+pkgver=2013.03.31
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('e9a75e0cfbf4f25aedd4ee4a10a7c26f')
+md5sums=('710afff186631aa7f6a28b7c105b92ab')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index e67dfe54f..3b238c079 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178970 2013-03-01 10:22:14Z andrea $
+# $Id: PKGBUILD 181126 2013-03-31 19:16:54Z stephane $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64')
 url="http://www.lyx.org"
@@ -23,8 +23,6 @@ sha1sums=('a822e99484c1652c4df5df717819dd7048fcff75'
           '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
 
 build() {
-  . /etc/profile.d/qt4.sh
-
   cd "${srcdir}/${pkgname}-${pkgver}"
   find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
   sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 966fb6211..be7a24849 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 179090 2013-03-03 11:15:28Z giovanni $
+# $Id: PKGBUILD 181127 2013-03-31 19:16:55Z stephane $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=6.1.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 6251d9f30..c34e6aa7f 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176932 2013-02-02 19:24:03Z giovanni $
+# $Id: PKGBUILD 181128 2013-03-31 19:16:57Z stephane $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index de2f174dc..6de9dd1b2 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180557 2013-03-23 09:37:02Z andyrtr $
+# $Id: PKGBUILD 181129 2013-03-31 19:16:58Z stephane $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.9.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
 license=('custom:MIT')
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index d31735366..d5f9a2eea 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180213 2013-03-18 16:09:19Z andyrtr $
+# $Id: PKGBUILD 181070 2013-03-31 08:09:15Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-savage
 pkgver=2.3.6
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org savage video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,11 +14,14 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
 optdepends=('savage-dri: DRI1 support from community repo')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git_fixes.diff)
+sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6'
+            'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git_fixes.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-savage/git_fixes.diff b/extra/xf86-video-savage/git_fixes.diff
new file mode 100644
index 000000000..8d5ef49b0
--- /dev/null
+++ b/extra/xf86-video-savage/git_fixes.diff
@@ -0,0 +1,64 @@
+From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@gmail.com>
+Date: Wed, 18 Jul 2012 08:52:38 +0000
+Subject: savage: move compat-api.h down to proper place.
+
+This screws up when DRI isn't enabled.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index b604292..ec4b1ea 100644
+--- a/src/savage_driver.h
++++ b/src/savage_driver.h
+@@ -85,8 +85,6 @@
+ #include "GL/glxint.h"
+ #include "xf86drm.h"
+ 
+-#include "compat-api.h"
+-
+ /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
+  * to 32 clients. */
+ #define SAVAGE_NUM_BUFFERS 32
+@@ -153,6 +151,8 @@ typedef struct _server{
+ 
+ #endif
+ 
++#include "compat-api.h"
++
+ typedef enum {
+     MT_NONE,
+     MT_CRT,
+--
+cgit v0.9.0.2-2-gbebe
+From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@gmail.com>
+Date: Sat, 22 Dec 2012 10:00:00 +0000
+Subject: savage: fix default accel arch when built with no XAA
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index 026bf5c..5b49e60 100644
+--- a/src/savage_driver.c
++++ b/src/savage_driver.c
+@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
+         from = X_DEFAULT;
+ 	char *strptr;
+         if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
++#ifdef HAVE_XAA_H
+ 	    if(!xf86NameCmp(strptr,"XAA")) {
+ 	        from = X_CONFIG;
+ 	        psav->useEXA = FALSE;
+@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
+ 	       from = X_CONFIG;
+ 	       psav->useEXA = TRUE;
+ 	    }
++#else
++	    psav->useEXA = TRUE;
++#endif
+        }
+        xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
+ 		psav->useEXA ? "EXA" : "XAA");
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xsd/PKGBUILD b/extra/xsd/PKGBUILD
index 9d9c53775..3f616afd0 100644
--- a/extra/xsd/PKGBUILD
+++ b/extra/xsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 176296 2013-01-28 16:48:29Z stephane $
+# $Id: PKGBUILD 181130 2013-03-31 19:17:00Z stephane $
 # Maintainer:
 # Contributor: kevku <kevku@gmx.com>
 
 pkgname=xsd
 pkgver=3.3.0
 _pkgver=3.3.0-2+dep
-pkgrel=7
+pkgrel=8
 pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler"
 arch=('i686' 'x86_64')
 url="http://www.codesynthesis.com/products/xsd"