Sat Nov 10 01:23:30 PST 2012

author: root <root@rshg054.dnsready.net> 2012-11-10 01:23:31 -0800
committer: root <root@rshg054.dnsready.net> 2012-11-10 01:23:31 -0800
commit: 6eea0bd1e92ed5aa53cb5f59102529c88e9e1786 (patch)
tree: b069468f4084f5af5ad3ba2ecab7e6b4deb90267
parent: 3f7cb62ef558ea147661abe007a4293c0069fc62 (diff)
135 files changed, 2902 insertions, 506 deletions
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index 390e6f6f5..665ec24e3 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77106 2012-10-05 10:14:22Z spupykin $
+# $Id: PKGBUILD 79626 2012-11-09 09:24:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
 pkgver=3.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64')
 depends=('gmime24' 'libzdb' 'mhash' 'libevent')
@@ -19,8 +19,6 @@ url="http://www.dbmail.org"
 license=('GPL')
 options=('!libtool' 'zipman')
 backup=(etc/conf.d/dbmail)
-conflicts=('dbmail')
-provides=('dbmail')
 source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
 	dbmail.conf.d
 	dbmail.rc.d
@@ -31,10 +29,10 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz
 md5sums=('eb32235abffdf967253ee9d004e0e4a9'
          'e7f72bc360decdb2475266391ad12329'
          '30774513fb016b9da08e9cf6f2a0b8e7'
-         '845b8bfe40864c366f7ab69768d1faa2'
-         '81a59222a43ae89f59299fe798b8e072'
-         '2e9a9a56ae56218142a115bff3f9a272'
-         'd1fb94edb272d2a717af1944ecfd7fce')
+         '84efa46eaac66057c4eb131d9bc27fa8'
+         '19560277f6a56d1f3f2fdb02315dcf0f'
+         '89a0f793737eaf36291409f8c840891e'
+         'dd1b5b2c542f55d9d934a58a36d0513d')
 
 build() {
   cd $srcdir/dbmail-${pkgver/_/-}/
diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service
index 110bbbdc4..e67e0c4e8 100644
--- a/community/dbmail/dbmail-imapd.service
+++ b/community/dbmail/dbmail-imapd.service
@@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/dbmail-imapd
+PIDFile=/var/run/dbmail/dbmail-imapd.pid
+ExecStart=/usr/sbin/dbmail-imapd -p /var/run/dbmail/dbmail-imapd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service
index e531b2e3e..2a059a15c 100644
--- a/community/dbmail/dbmail-lmtpd.service
+++ b/community/dbmail/dbmail-lmtpd.service
@@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/dbmail-lmtpd
+PIDFile=/var/run/dbmail/dbmail-lmtpd.pid
+ExecStart=/usr/sbin/dbmail-lmtpd -p /var/run/dbmail/dbmail-lmtpd.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service
index eacef4459..907f43b2b 100644
--- a/community/dbmail/dbmail-pop3d.service
+++ b/community/dbmail/dbmail-pop3d.service
@@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/dbmail-pop3d
+PIDFile=/var/run/dbmail/dbmail-pop3d.pid
+ExecStart=/usr/sbin/dbmail-pop3d -p /var/run/dbmail/dbmail-pop3d.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service
index 847b69580..7f34bacec 100644
--- a/community/dbmail/dbmail-timsieved.service
+++ b/community/dbmail/dbmail-timsieved.service
@@ -4,7 +4,8 @@ After=syslog.target network.target mysqld.service postgresql.service
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/dbmail-timsieved
+PIDFile=/var/run/dbmail/dbmail-timsieved.pid
+ExecStart=/usr/sbin/dbmail-timsieved -p /var/run/dbmail/dbmail-timsieved.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
new file mode 100644
index 000000000..e3be09540
--- /dev/null
+++ b/community/fcitx/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 79645 2012-11-10 00:57:49Z ebelanger $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: csslayer <wengxt AT gmail com>
+
+pkgbase=fcitx
+pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt')
+pkgver=4.2.6.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fcitx/"
+license=('GPL')
+makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' 'wget' \
+             'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant')
+source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz)
+sha1sums=('dc4577bb6bd6de41317f978196f377fc801cc63a')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_OPENCC=OFF \
+    -DFORCE_PRESAGE=ON \
+    -DENABLE_TEST=ON \
+    -DENABLE_GTK3_IM_MODULE=ON \
+    -DENABLE_QT_IM_MODULE=ON
+  make
+}
+
+check() {
+  cd "${srcdir}"/build
+  make test
+}
+
+package_fcitx() {
+  pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system"
+  depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \
+           'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \
+           'libxfixes' 'dbus-core' 'icu')
+  optdepends=('enchant: for word predication support')
+  install=fcitx.install
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+
+  rm -r "${pkgdir}"/usr/lib/{gtk-2.0,gtk-3.0,qt}
+}
+
+package_fcitx-gtk2() {
+  pkgdesc='GTK2 IM Module for fcitx'
+  depends=('gtk2' 'fcitx')
+  install=fcitx-gtk2.install
+
+  cd "${srcdir}"/build/src/frontend/gtk2
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-gtk3() {
+  pkgdesc='GTK3 IM Module for fcitx'
+  depends=('gtk3' 'fcitx')
+  install=fcitx-gtk3.install
+
+  cd "${srcdir}"/build/src/frontend/gtk3
+  make DESTDIR="${pkgdir}" install
+}
+
+package_fcitx-qt() {
+  pkgdesc='QT IM Module for fcitx'
+  depends=('qt' 'fcitx')
+
+  cd "${srcdir}"/build/src/frontend/qt
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/fcitx/fcitx-gtk2.install b/community/fcitx/fcitx-gtk2.install
new file mode 100644
index 000000000..7503c05eb
--- /dev/null
+++ b/community/fcitx/fcitx-gtk2.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/fcitx/fcitx-gtk3.install b/community/fcitx/fcitx-gtk3.install
new file mode 100644
index 000000000..b44958797
--- /dev/null
+++ b/community/fcitx/fcitx-gtk3.install
@@ -0,0 +1,11 @@
+post_install() {
+    usr/bin/gtk-query-immodules-3.0 --update-cache
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/fcitx/fcitx.install b/community/fcitx/fcitx.install
new file mode 100644
index 000000000..7f156e002
--- /dev/null
+++ b/community/fcitx/fcitx.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD
index fc69f80fb..dc22aa950 100644
--- a/community/giggle/PKGBUILD
+++ b/community/giggle/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57210 2011-10-24 13:47:08Z ibiru $
+# $Id: PKGBUILD 79629 2012-11-09 09:55:35Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: neodreams <yanbrodeur@gmail.com>
 
 pkgname=giggle
-pkgver=0.6.1
+pkgver=0.7
 pkgrel=1
 pkgdesc="Git repository viewer"
 arch=('i686' 'x86_64')
@@ -11,13 +11,13 @@ url="http://live.gnome.org/giggle"
 license=('GPL')
 depends=('git' 'gtksourceview3' 'vte3')
 makedepends=('intltool' 'itstool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.6/${pkgname}-${pkgver}.tar.xz)
+source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz)
 options=(!libtool)
 install=giggle.install
-sha256sums=('6c0b5c2b417217509bf88096447afa4af70fd33e8a6db5caa0aa86b44c01a5b8')
+sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
 
   ./configure \
     --prefix=/usr
@@ -25,7 +25,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD
new file mode 100644
index 000000000..8f6b37ea6
--- /dev/null
+++ b/community/python-matplotlib/PKGBUILD
@@ -0,0 +1,74 @@
+# $Id: PKGBUILD 79647 2012-11-10 00:59:34Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
+
+pkgbase=python-matplotlib
+pkgname=('python2-matplotlib' 'python-matplotlib')
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="A python plotting library, making publication quality plots"
+arch=('i686' 'x86_64')
+url="http://matplotlib.sourceforge.net/"
+license=('custom')
+backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc)
+makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt'
+             'python-pytz' 'python-numpy' 'pyqt')
+source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz"
+         setup.cfg)
+sha1sums=('1d0c319b2bc545f1a7002f56768e5730fe573518'
+          '370a08120bcb3046f590c527b3d29d18ae874818')
+
+build() {
+   cd "${srcdir}"/matplotlib-${pkgver}
+
+   # use system python-six
+   rm lib/six.py
+
+   cp ../setup.cfg .
+
+   # For numpy 1.7
+   sed -i '/include/s/numpy\/arrayobject.h/numpy\/oldnumeric.h/g' \
+      src/*.{c,cpp,h} lib/matplotlib/delaunay/*.{cpp,h} lib/matplotlib/tri/*.h
+
+   cd ..
+   cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py3
+
+   # Build python2
+   cd matplotlib-${pkgver}
+   for file in $(find . -name '*.py' -print); do
+      sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
+             -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
+   done
+
+   python2 setup.py build
+
+   # Build python3
+   cd ../matplotlib-${pkgver}-py3
+   for file in $(find . -name '*.py' -print); do
+      sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python3|" \
+             -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python3|" ${file}
+   done
+
+   python3 setup.py build
+}
+
+package_python2-matplotlib() {
+   depends=('python2-pytz' 'python2-numpy' 'python2-pyqt' 'python2-dateutil')
+
+   cd "${srcdir}"/matplotlib-${pkgver}
+   python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
+
+   install -dm755 "${pkgdir}"/usr/share/licenses/python2-matplotlib
+   install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python2-matplotlib
+}
+
+package_python-matplotlib() {
+   depends=('python-pytz' 'python-numpy' 'pyqt' 'python-dateutil')
+   cd "${srcdir}"/matplotlib-${pkgver}-py3
+   python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
+
+   install -dm755 "${pkgdir}"/usr/share/licenses/python-matplotlib
+   install -m 644 doc/users/license.rst "${pkgdir}"/usr/share/licenses/python-matplotlib
+}
diff --git a/community/python-matplotlib/setup.cfg b/community/python-matplotlib/setup.cfg
new file mode 100644
index 000000000..bed844776
--- /dev/null
+++ b/community/python-matplotlib/setup.cfg
@@ -0,0 +1,83 @@
+# Rename this file to setup.cfg to modify matplotlib's
+# build options.
+
+[egg_info]
+tag_svn_revision = 1
+
+[directories]
+# Uncomment to override the default basedir in setupext.py.
+# This can be a single directory or a space-delimited list of directories.
+#basedirlist = /usr
+
+[status]
+# To suppress display of the dependencies and their versions
+# at the top of the build log, uncomment the following line:
+#suppress = True
+#
+# Uncomment to insert lots of diagnostic prints in extension code
+#verbose = True
+
+[provide_packages]
+# By default, matplotlib checks for a few dependencies and
+# installs them if missing. This feature can be turned off
+# by uncommenting the following lines. Acceptible values are:
+#     True: install, overwrite an existing installation
+#     False: do not install
+#     auto: install only if the package is unavailable. This
+#           is the default behavior
+#
+## Date/timezone support:
+#pytz = False
+dateutil = False
+
+[gui_support]
+# Matplotlib supports multiple GUI toolkits, including Cocoa,
+# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
+# these toolkits requires AGG, the Anti-Grain Geometry library,
+# which is provided by matplotlib and built by default.
+#
+# Some backends are written in pure Python, and others require
+# extension code to be compiled. By default, matplotlib checks
+# for these GUI toolkits during installation and, if present,
+# compiles the required extensions to support the toolkit. GTK
+# support requires the GTK runtime environment and PyGTK. Wx
+# support requires wxWidgets and wxPython. Tk support requires
+# Tk and Tkinter. The other GUI toolkits do not require any
+# extension code, and can be used as long as the libraries are
+# installed on your system.
+#
+# You can uncomment any the following lines if you know you do
+# not want to use the GUI toolkit. Acceptible values are:
+#     True: build the extension. Exits with a warning if the
+#           required dependencies are not available
+#     False: do not build the extension
+#     auto: build if the required dependencies are available,
+#           otherwise skip silently. This is the default
+#           behavior
+#
+gtk = False
+gtkagg = False
+tkagg = False
+wxagg = False
+macosx = False
+
+[rc_options]
+# User-configurable options
+#
+# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
+# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
+#
+# The Agg, Ps, Pdf and SVG backends do not require external
+# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
+# if you have disabled the relevent extension modules.  Agg will be used
+# by default.
+#
+backend = Qt4Agg
+#
+# The numerix module was historically used to provide
+# compatibility between the Numeric, numarray, and NumPy array
+# packages. Now that NumPy has emerge as the universal array
+# package for python, numerix is not really necessary and is
+# maintained to provide backward compatibility. Do not change
+# this unless you have a compelling reason to do so.
+numerix = numpy
diff --git a/community/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD
index 46feb657f..31b2dd46d 100644
--- a/community/sylpheed/PKGBUILD
+++ b/community/sylpheed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73041 2012-06-29 12:56:08Z speps $
+# $Id: PKGBUILD 79631 2012-11-09 11:59:26Z speps $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=sylpheed
-pkgver=3.2.0
+pkgver=3.3.0
 pkgrel=1
 pkgdesc="Lightweight and user-friendly e-mail client"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ depends=('gpgme' 'gtkspell' 'desktop-file-utils')
 makedepends=('compface' 'openssl')
 options=('!libtool')
 install="$pkgname.install"
-source=("http://sylpheed.sraoss.jp/$pkgname/v3.2/$pkgname-$pkgver.tar.bz2")
-md5sums=('bbb691cf2bb11f84b329e68b58a62918')
+source=("http://sylpheed.sraoss.jp/$pkgname/v3.3/$pkgname-$pkgver.tar.bz2")
+md5sums=('20442f81dbb4e7c59462360ad0bb1afb')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD
index 0eaa673bb..54e33f731 100644
--- a/community/xl2tpd/PKGBUILD
+++ b/community/xl2tpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77112 2012-10-05 10:17:51Z spupykin $
+# $Id: PKGBUILD 79633 2012-11-09 12:06:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Hengfu <rhfcaesar@gmail.com>
 
 pkgname=xl2tpd
-pkgver=1.3.0
-pkgrel=3
+pkgver=1.3.1
+pkgrel=1
 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
 arch=('i686' 'x86_64')
 url="http://www.xelerance.com/services/software/xl2tpd/"
@@ -12,8 +12,7 @@ license=('GPL')
 depends=('ppp')
 options=(emptydirs zipman docs)
 backup=(etc/ppp/options.l2tpd)
-#source=(ftp://ftp.xelerance.com/$pkgname/$pkgname-$pkgver.tar.gz
-source=(http://arch.p5n.pp.ru/~sergej/dl/2012/xl2tpd-$pkgver.tar.gz
+source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz
 	xl2tpd.rc
 	xl2tpd.conf.client-example
 	xl2tpd.conf.server-example
@@ -21,7 +20,7 @@ source=(http://arch.p5n.pp.ru/~sergej/dl/2012/xl2tpd-$pkgver.tar.gz
 	xl2tpd.service
 	xl2tpd.tmpfiles
 	ipparam.patch)
-md5sums=('28264284552c442b24cf421755a2bb48'
+md5sums=('38c2461d3562f98b08454ca403706886'
          '1439d13084fc09c2a19c97b24a834345'
          '5f0ae07026e61a3dd15a76fd4144a6d5'
          '16ed0886115d4dcc21072cfb847250bb'
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index aba084385..f91d7b265 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170091 2012-11-01 08:20:49Z andrea $
+# $Id: PKGBUILD 170679 2012-11-09 09:15:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.10
+pkgver=2.8.10.1
 pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('qt')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d4aef1eab859df61d2664721a72732c0')
+md5sums=('aabf16d8e957f99921a0095885381373')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index d43a047d0..7f81e462d 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 169857 2012-10-30 22:24:35Z heftig $
+# $Id: PKGBUILD 170683 2012-11-09 12:41:46Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
 pkgver=0.1.24
-pkgrel=1
+pkgrel=2
 pkgdesc="System daemon for managing color devices"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/software/colord"
 license=('GPL2')
-depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'udev')
+depends=('lcms2' 'libgusb' 'polkit' 'shared-color-profiles' 'sqlite' 'udev')
 makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
 source=($url/releases/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index 0e764637f..bf0ccd3a6 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 169923 2012-10-30 22:45:08Z heftig $
+# $Id: PKGBUILD 170685 2012-11-09 13:29:21Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gobject-introspection
 pkgver=1.34.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Introspection system for GObject-based libraries"
 url="https://live.gnome.org/GObjectIntrospection"
 arch=('x86_64' 'i686')
 license=('LGPL' 'GPL')
-depends=('glib2' 'python2')
+depends=('glib2' 'python2' 'python2-mako')
 makedepends=('cairo')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
@@ -16,7 +16,7 @@ sha256sums=('85b9ac268d34311138f3c6bf646c07975eebfae6ae67d9239e1066a42c5d525b')
 
 build() {
   cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static --enable-doctool
   make
 }
 
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index abd57f3a5..8d55c9c74 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 169944 2012-10-30 22:46:15Z heftig $
+# $Id: PKGBUILD 170696 2012-11-09 20:17:29Z eric $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 
 pkgname=ibus
-pkgver=1.4.99.20121006
+pkgver=1.4.99.20121109
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
 arch=('i686' 'x86_64')
 url="http://ibus.googlecode.com"
 license=('LGPL')
-makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool')
 depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject')
+makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool')
 options=('!libtool')
 install=ibus.install
 source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('e324382caa8dde8e4ea9c3d60a6ec5c96a313a86')
+sha1sums=('e534d836117b968b8d0eab2eea5a1fac09ea85fb')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -28,7 +28,8 @@ build() {
     --disable-gconf \
     --enable-dconf \
     --disable-memconf \
-    --enable-ui
+    --enable-ui \
+    --enable-python-library
   make
 }
 
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
index 45b4ef127..5a6410d0e 100644
--- a/extra/kactivities/PKGBUILD
+++ b/extra/kactivities/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167762 2012-10-03 14:39:04Z andrea $
+# $Id: PKGBUILD 170583 2012-11-09 08:25:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kactivities
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='API for using and interacting with the Activity Manager'
@@ -11,7 +11,7 @@ license=('GPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('7e5ec2aa1492450ea1de40f9e110561f6221b5ca')
+sha1sums=('79a9c14e10147c7deb20bfe924de9d63a8edb1ab')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
index 36cfd941e..ce9c8a728 100644
--- a/extra/kdeaccessibility-jovie/PKGBUILD
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167790 2012-10-03 14:41:24Z andrea $
+# $Id: PKGBUILD 170607 2012-11-09 08:26:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-jovie
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A text to speech application'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdeaccessibility-kttsd')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz")
-sha1sums=('fbf63de8b286e8238383f49991ffb7651f9099d2')
+sha1sums=('116caae94fb3aee0270ce9c6069a5da82289ff70')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
index 79fc607a7..886434b9e 100644
--- a/extra/kdeaccessibility-kaccessible/PKGBUILD
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167791 2012-10-03 14:41:27Z andrea $
+# $Id: PKGBUILD 170608 2012-11-09 08:26:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kaccessible
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Provides accessibility services like focus tracking and a screenreader'
@@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdelibs' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
-sha1sums=('e55ccb92ce22250a8d8139d2367ef9f35c5b34d1')
+sha1sums=('6ea2b1751d97643bd2be1e625bed9d634d628a33')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
index 28a811c8c..2a1e4d17d 100644
--- a/extra/kdeaccessibility-kmag/PKGBUILD
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167792 2012-10-03 14:41:32Z andrea $
+# $Id: PKGBUILD 170609 2012-11-09 08:26:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmag
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Screen Magnifier'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz")
-sha1sums=('4429196f346271a825e721be56e92189a3c0da2a')
+sha1sums=('6d6fe858e504ed088bc7813854b5655431cf1ed5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
index 62a117a30..c1d2a3b7d 100644
--- a/extra/kdeaccessibility-kmousetool/PKGBUILD
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167793 2012-10-03 14:41:38Z andrea $
+# $Id: PKGBUILD 170610 2012-11-09 08:26:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmousetool
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz")
-sha1sums=('c9e27c71fd9bb01ee498cb0799d848611d031dcc')
+sha1sums=('e76d255b2333cf0b964a4b904d558c0b58a495a2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
index 014130c08..2b1c98f62 100644
--- a/extra/kdeaccessibility-kmouth/PKGBUILD
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167794 2012-10-03 14:41:44Z andrea $
+# $Id: PKGBUILD 170611 2012-11-09 08:27:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmouth
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Speech Synthesizer Frontend'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz")
-sha1sums=('7e982aa5a57a9f671ec69f3504ca4dc50076778d')
+sha1sums=('6f82859510cd90594c4f9b5bb74f35413c9cb4c1')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
index 336fcb4d3..3b6619d0e 100644
--- a/extra/kdeadmin/PKGBUILD
+++ b/extra/kdeadmin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167795 2012-10-03 14:41:51Z andrea $
+# $Id: PKGBUILD 170612 2012-11-09 08:27:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron'
          'kdeadmin-ksystemlog'
          'kdeadmin-kuser'
          'kdeadmin-system-config-printer-kde')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
@@ -15,7 +15,7 @@ groups=('kde' 'kdeadmin')
 makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'syslog-path.patch')
-sha1sums=('0b97528870a23440ba450f87be878e3abdf9e0e1'
+sha1sums=('3fa7f1c3018f156b6185a806b66364c8daf7547c'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 build() {
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 8f984a727..6332fc541 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167796 2012-10-03 14:41:55Z andrea $
+# $Id: PKGBUILD 170613 2012-11-09 08:27:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -13,16 +13,16 @@ pkgname=('kdeartwork-aurorae'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
 makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace'
-             'libkexiv2')
+             'libkexiv2' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('6a93ed5fd33b27b88b653c15c546b223ed880a4d')
+sha1sums=('777e3b50546e3a75bc2253ee13962bd1955db921')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index 0ee08e512..a37c7e12a 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167797 2012-10-03 14:41:59Z andrea $
+# $Id: PKGBUILD 170614 2012-11-09 08:27:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('bab9dcab839cc975fb3b94ac383d25b94066fe92')
+sha1sums=('6d6f0894350ca1976c7403b8eb5d8c197b57c884')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index bc329f0e5..164614471 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170060 2012-10-31 10:38:11Z andrea $
+# $Id: PKGBUILD 170596 2012-11-09 08:26:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.9.2
-pkgrel=6
+pkgver=4.9.3
+pkgrel=1
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -25,11 +25,8 @@ install="${pkgname}.install"
 backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'logind-support.patch'
-        'logind-support2.patch'
-        'fix-mesa9.patch')
-sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('f6c527361e76aacae980f661294b32a7f3df46a0'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -38,10 +35,7 @@ sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
           'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514'
-          'ccde71c42e19feaf40d3bd76e7396a0cb6df012f'
-          '8f27ebd4bcc2f833a73d453837f4522b2be0aa1f'
-          'c57583555bf8acd213295316512b92b6dc07703e')
+          'd509dac592bd8b310df27991b208c95b6d907514')
 
 build() {
 	cd ${_pkgname}-${pkgver}
@@ -53,11 +47,6 @@ build() {
 
     # KDEBUG#202629
 	patch -p0 -i "${srcdir}"/terminate-server.patch
-    # KDEBUG#307412 (fixed upstream)
-    patch -p1 -i "${srcdir}"/logind-support.patch
-    patch -p1 -i "${srcdir}"/logind-support2.patch
-    # KDEBUG#308385 (fixed upstream)
-    patch -p1 -i "${srcdir}"/fix-mesa9.patch
 
     cd ../
 
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index ec1987368..3efa2eb5e 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167779 2012-10-03 14:40:36Z andrea $
+# $Id: PKGBUILD 170597 2012-11-09 08:26:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin'
          'kdebase-konqueror'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66')
+sha1sums=('282b8704d54f081a16894bb94aa901e72eb5e694')
 
 build() {
 	cd ${srcdir}
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index 291cbf193..35b5e7a68 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167798 2012-10-03 14:42:03Z andrea $
+# $Id: PKGBUILD 170615 2012-11-09 08:27:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono"
@@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz")
-sha1sums=('d8c762a6a65323f80e47cadbfa732b529a07dbc1')
+sha1sums=('8f9571ede6e2801eba40ab59c44d47a3854e04dc')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index 09895928c..70116831e 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167799 2012-10-03 14:42:08Z andrea $
+# $Id: PKGBUILD 170616 2012-11-09 08:27:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Ruby bindings for libraries created by the KDE community"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz"
         'ruby19.patch')
-sha1sums=('efa6b6b6bae89f8e16cbbcf8c5840c6cbdab57e3'
+sha1sums=('ade552b7a0ddd3117dcd18ac0c70016c01f19fc5'
           'c074f027bac3b9bffe70a2c2304a6a7be12be034')
 
 build() {
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index 8713e0ac1..64deec2d9 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167800 2012-10-03 14:42:11Z andrea $
+# $Id: PKGBUILD 170617 2012-11-09 08:27:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
 pkgname=('kdebindings-kross-python'
 #         'kdebindings-kross-ruby'
          'kdebindings-kross-java')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
 source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz")
-sha1sums=('9208e4ad1b8ad97f1220cd6696f22d8b1eab29cb')
+sha1sums=('862cff197c21d102d1687fb36c25b0f8cabb2397')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index faf960007..91b97c5a4 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167801 2012-10-03 14:42:15Z andrea $
+# $Id: PKGBUILD 170618 2012-11-09 08:27:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
@@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
             'kdegraphics-okular' 'kdesdk-kate')
 source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
-sha1sums=('7ed1e54f5216e5bfd6b9709900d3df6b606910b5')
+sha1sums=('9504e5f31787df5f31686aabab96d30af96f33b7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index f2fa972d2..cb3374cf1 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167773 2012-10-03 14:39:50Z andrea $
+# $Id: PKGBUILD 170591 2012-11-09 08:25:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'perl-list-moreutils')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz")
-sha1sums=('1f7d70401c84fa54e937979a7c03d3fa8d7d59c2')
+sha1sums=('b41f57df71d7001b9fb079b9eb64fe7b5e08690c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 7d98dec23..71e02eeb3 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD 168996 2012-10-17 10:19:28Z allan $
+# $Id: PKGBUILD 170592 2012-11-09 08:25:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2')
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
              'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
-        'pyqt495.patch')
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
-          '0935c32e55806873f2d088613594559285da7e9c')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
+sha1sums=('4a72a307d5780f013e12607b9cddb425f81ffeef')
 
 build() {
   export PYTHONDONTWRITEBYTECODE="TRUE"
 
-  cd pykde4-${pkgver}
-  patch -p1 -i "${srcdir}"/pyqt495.patch
-  cd ../ 
-
   mkdir build
   cd build
   cmake ../pykde4-${pkgver} \
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index 09871e43c..ebb38b07c 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167776 2012-10-03 14:40:01Z andrea $
+# $Id: PKGBUILD 170594 2012-11-09 08:25:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Ruby bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
-sha1sums=('7d74ef9d0c66ef6c54fd25aeff89de7f06685dda')
+sha1sums=('f4cc60e378c4bf0d235affba5d042d0031560009')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index 3b99b49be..88eab809b 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167775 2012-10-03 14:39:58Z andrea $
+# $Id: PKGBUILD 170593 2012-11-09 08:25:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto"
@@ -12,11 +12,17 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz")
-sha1sums=('549f386325cf02662c685f83b1844c72149255d1')
+source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz"
+        'cmake2810.patch')
+sha1sums=('24397a09c50ccc2e87dcd5d07f33d74cc9c5113f'
+          'f7745cb0fc4768dc8cab0e0d58b1159fb19805f5')
 
 build() {
-  cd "${srcdir}"
+  cd qyoto-${pkgver}
+  # KDEBUG#209652
+  patch -p1 -i "${srcdir}"/cmake2810.patch
+  cd ../
+ 
   mkdir build
   cd build
   cmake ../qyoto-${pkgver} \
@@ -26,6 +32,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdebindings-qyoto/cmake2810.patch b/extra/kdebindings-qyoto/cmake2810.patch
new file mode 100644
index 000000000..9c0343a27
--- /dev/null
+++ b/extra/kdebindings-qyoto/cmake2810.patch
@@ -0,0 +1,15 @@
+diff -up qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10 qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake
+--- qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake.cmake_2_8_10	2012-08-13 04:00:53.000000000 -0500
++++ qyoto-4.9.3/cmake/CMakeDetermineCSharpCompiler.cmake	2012-11-06 15:31:18.719822193 -0600
+@@ -84,6 +84,9 @@ endif (CMAKE_CSharp_COMPILER)
+ get_filename_component(script_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
+ 
+ # configure variables set in this file for fast reload later on
+-configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
+-  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
++ if(NOT CMAKE_PLATFORM_INFO_DIR) # pre-2.8.10
++   set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
++ endif()
++ configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
++   ${CMAKE_PLATFORM_INFO_DIR}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
+ set(CMAKE_CSharp_COMPILER_ENV_VAR "CSC")
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index 65ad2b5ba..16c692e88 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167766 2012-10-03 14:39:21Z andrea $
+# $Id: PKGBUILD 170586 2012-11-09 08:25:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz")
-sha1sums=('f7ac776e18ad0df7535280ca5e6ea951cde159fb')
+sha1sums=('0f5fc7634140434fad6c96f59055d91754b8f784')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index 47a81295a..bc3ca9024 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167772 2012-10-03 14:39:47Z andrea $
+# $Id: PKGBUILD 170590 2012-11-09 08:25:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
@@ -16,7 +16,7 @@ optdepends=('kdesdk-kate: Kate bindings'
             'kdegraphics-okular: Okular bindings')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
-sha1sums=('ad541046cf64df5a9ffda29979f8868a9c29c354')
+sha1sums=('4cc26577b84cf78253aac5fbfed88da9667dbcea')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index 380fff71b..f7bc62e62 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167767 2012-10-03 14:39:25Z andrea $
+# $Id: PKGBUILD 170587 2012-11-09 08:25:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
-sha1sums=('a2f70eb2cb67942456604a6538e9cabe8a48aad5')
+sha1sums=('08ffb9d5bfe8c624f1da28b49f26dfa746fc8bcf')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
index aaa0aa352..ac5162ec5 100644
--- a/extra/kdeedu-analitza/PKGBUILD
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167787 2012-10-03 14:41:10Z andrea $
+# $Id: PKGBUILD 170604 2012-11-09 08:26:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-analitza
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A library to add mathematical features to your program"
 url="https://projects.kde.org/projects/kde/kdeedu/analitza"
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('065e449af454e08f02ece846fe5b28db09bda1be')
+sha1sums=('96fc22e59b86fdd22d9f716b342c2635013c4807')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index eb5633790..0609047ab 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167802 2012-10-03 14:42:22Z andrea $
+# $Id: PKGBUILD 170619 2012-11-09 08:27:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz")
-sha1sums=('4f13e61086929da9ba75ee3b73612540054888b1')
+sha1sums=('b979cbcd000266f49b620f556811a6846d434e2d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index 6c4c7fb61..438c50ca5 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167803 2012-10-03 14:42:27Z andrea $
+# $Id: PKGBUILD 170620 2012-11-09 08:27:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
@@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend'
             'r: R backend')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz")
-sha1sums=('51b6cf08d43b6ea9fc285283a8ee1d8097b7349b')
+sha1sums=('01526ddfe5f9abf26e9eba3914e8439596ea594e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index fe0ca29f2..eb308f73d 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167804 2012-10-03 14:42:32Z andrea $
+# $Id: PKGBUILD 170621 2012-11-09 08:27:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
@@ -10,10 +10,10 @@ arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
-makedepends=('cmake' 'automoc4')
+makedepends=('cmake' 'automoc4' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz")
-sha1sums=('93aceea871e10eff771645f627563517684a11a5')
+sha1sums=('5c61c468af41246242c25bf9a483ea36a39d8b22')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index 6ae05f4b1..a85fc3058 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167805 2012-10-03 14:42:37Z andrea $
+# $Id: PKGBUILD 170622 2012-11-09 08:27:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
@@ -12,10 +12,17 @@ groups=('kde' 'kdeedu')
 depends=('kdelibs' 'avogadro' 'ocaml' 'facile')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
-sha1sums=('d328ad31f50a33aefeb009411a1adb51c29850a2')
+source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz"
+        'fix-linking.patch')
+sha1sums=('7b4a50aabd960752d6b746740cc6b4bf6cae3b30'
+          '478697adc8ae191355ee64b824f30e11bd7af682')
 
 build() {
+  # KDEBUG#308939 (Fixed upstream)
+  cd kalzium-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-linking.patch
+  cd ../
+
   cd "${srcdir}"
   mkdir build
   cd build
diff --git a/extra/kdeedu-kalzium/fix-linking.patch b/extra/kdeedu-kalzium/fix-linking.patch
new file mode 100644
index 000000000..6b0c1df7c
--- /dev/null
+++ b/extra/kdeedu-kalzium/fix-linking.patch
@@ -0,0 +1,24 @@
+commit ffac09556f6f3d5d758bac9ba2b91117e6014ea7
+Author: Christoph Feck <christoph@maxiom.de>
+Date:   Fri Nov 2 17:31:48 2012 +0100
+
+    SVN_SILENT link
+    
+    If possible, please include this build fix in 4.9.3 tag.
+    
+    BUG: 308939
+    CCMAIL: kde-release-team@kde.org
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 03eabf3..c8f425a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -138,7 +138,7 @@ target_link_libraries(kalzium ${KDE4_KHTML_LIBRARY} ${KDE4_KNEWSTUFF3_LIBS} ${KD
+ if (OPENBABEL2_FOUND)
+    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
+    if (EIGEN2_FOUND AND Avogadro_FOUND)
+-      target_link_libraries(kalzium compoundviewer avogadro)
++      target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro)
+    endif (EIGEN2_FOUND AND Avogadro_FOUND)
+ endif (OPENBABEL2_FOUND)
+ 
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index 98603f0cd..f1c016966 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167806 2012-10-03 14:42:42Z andrea $
+# $Id: PKGBUILD 170623 2012-11-09 08:27:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz")
-sha1sums=('b6fd76d854473ab6dbfdfdcb09347e7c4363a580')
+sha1sums=('e0ba84ac0d091dad0fb5af712a680a98abc17355')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index f1fdc8f34..61bf4663c 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167807 2012-10-03 14:42:47Z andrea $
+# $Id: PKGBUILD 170624 2012-11-09 08:27:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz")
-sha1sums=('82c7c573d6c0c248ae2d8db24504d1943824d0da')
+sha1sums=('9676d6866e28a33cb65dbe3f4b8da1d0041a0596')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index b05d0b8cf..4909b7078 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167808 2012-10-03 14:42:53Z andrea $
+# $Id: PKGBUILD 170625 2012-11-09 08:27:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz")
-sha1sums=('a68b02fd9ba765bce5d95b754dfd7eef70fa5743')
+sha1sums=('15d6f44bed780afbd75fe5d89c0d2e041904af25')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index a54425cfd..1990689f3 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167809 2012-10-03 14:42:58Z andrea $
+# $Id: PKGBUILD 170626 2012-11-09 08:27:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz")
-sha1sums=('6c11cf05fca993b7ddb7f92f68299a34470b5cd5')
+sha1sums=('75f08151c66a14adee3f5a2494439aba12e1dd66')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index d89b73500..e0137d52b 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167810 2012-10-03 14:43:03Z andrea $
+# $Id: PKGBUILD 170627 2012-11-09 08:28:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
-sha1sums=('13b3d40b0d33b1a60b36278760e35f337089cc73')
+sha1sums=('ed999bf98caef1107e01ddec90f1b5b9b09d75c8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index 9d565ffd2..41283d733 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167811 2012-10-03 14:43:09Z andrea $
+# $Id: PKGBUILD 170628 2012-11-09 08:28:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz")
-sha1sums=('86b4bd5f4b7ccc4f6e0769a8360e55ffebdc2eaf')
+sha1sums=('8bbfd5de164aff394bad508f1e15509f65d6efea')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index 3359c8188..5000d0d7a 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167812 2012-10-03 14:43:15Z andrea $
+# $Id: PKGBUILD 170629 2012-11-09 08:28:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz")
-sha1sums=('177413e9f9e490a4c72d8f85d3bdd36ffd1ba934')
+sha1sums=('a651c0ee96ba4cdfe0cbbd3dc555f52218eb0830')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index e6651994b..74b9d2369 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167813 2012-10-03 14:43:21Z andrea $
+# $Id: PKGBUILD 170630 2012-11-09 08:28:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz")
-sha1sums=('66fba97fc152925f87551be2dd283d4cbf06683f')
+sha1sums=('f89aa657b98a36e357c65567c0a2df85c2600611')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index a34af026e..ad8628de5 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167814 2012-10-03 14:43:26Z andrea $
+# $Id: PKGBUILD 170631 2012-11-09 08:28:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libindi')
 makedepends=('cmake' 'automoc4' 'eigen')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('144409ebfb2a2c3d040ab4a1ad130b5677dd23b6')
+sha1sums=('35f88135c42483144d17013c520243e7a77bde95')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index 89ea12e6f..07a4418f0 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167815 2012-10-03 14:43:31Z andrea $
+# $Id: PKGBUILD 170632 2012-11-09 08:28:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('99133b52b29a7ee4d3dd6da664ad8c47fd637b71')
+sha1sums=('921f60e26097c63373b157a5c4b7ca53512d95e6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index 2e88ad891..cd17d8553 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167816 2012-10-03 14:43:37Z andrea $
+# $Id: PKGBUILD 170633 2012-11-09 08:28:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz")
-sha1sums=('c30e80f71dc622b818d6539054f91584b0dce444')
+sha1sums=('c1077d3190c931b740360be4b1b343e279f94b6a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index d797f12ed..92b919c50 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167817 2012-10-03 14:43:43Z andrea $
+# $Id: PKGBUILD 170634 2012-11-09 08:28:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz")
-sha1sums=('53c702a88bd9cb0c8fba54d6353d06005760bd71')
+sha1sums=('bacfc371da7c0612fa8bf730280b12f0e29bdc46')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index 4822deb73..a6efefa3f 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167781 2012-10-03 14:40:47Z andrea $
+# $Id: PKGBUILD 170599 2012-11-09 08:26:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('71f0ab4845a7bf5505eba0bf5b654720a59d4028')
+sha1sums=('f15e058468b5edcb0a2d274c50ef9ef98e22ad34')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD
index 723c88ebb..9c80d1dad 100644
--- a/extra/kdeedu-pairs/PKGBUILD
+++ b/extra/kdeedu-pairs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167818 2012-10-03 14:43:49Z andrea $
+# $Id: PKGBUILD 170635 2012-11-09 08:28:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-pairs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A memory and pairs game for KDE"
 url="https://projects.kde.org/projects/kde/kdeedu/pairs"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz")
-sha1sums=('8ed40356ee7df8059935e945e070667dfffcc77b')
+sha1sums=('ad0567efd16cd024a59acd399bbbd549118334d7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index 7ffa8d1d0..aa9824498 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167819 2012-10-03 14:43:55Z andrea $
+# $Id: PKGBUILD 170636 2012-11-09 08:28:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz")
-sha1sums=('397e58d783f75f48e8cf5a3a35f1fa441010b50b')
+sha1sums=('98f10445a5d983ea81a812e288bc00991b9b247c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index b139bb757..6361d42c3 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167820 2012-10-03 14:43:59Z andrea $
+# $Id: PKGBUILD 170637 2012-11-09 08:28:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('8c3ba1c2b15a795147110f246853217d301f903b')
+sha1sums=('bbd95c3e058c106e8b88a132a642c6af39c1c10d')
 options=('!makeflags')
 
 build() {
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index 4c30b65da..60bbacb47 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167821 2012-10-03 14:44:05Z andrea $
+# $Id: PKGBUILD 170638 2012-11-09 08:28:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl')
 makedepends=('cmake' 'automoc4' 'eigen')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('7545eee07323935773466cfd3a241fbd8786ef13')
+sha1sums=('822b8f7266f7bd8170db1c02510480bb98d03e6f')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index c9ca5192b..415dfb6d4 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167822 2012-10-03 14:44:33Z andrea $
+# $Id: PKGBUILD 170639 2012-11-09 08:28:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -43,16 +43,16 @@ pkgname=('kdegames-bomber'
          'kdegames-libkmahjongg'
          'kdegames-lskat'
          'kdegames-palapeli')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2'
-             'openal')
+             'openal' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('a751f6b9ed6c24f8a420d6737be87f2bbb0c2cb3')
+sha1sums=('c5b61b6df2d6683fa96f294bebeb09b1403ce6d8')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index 11e909491..c45a3c409 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167823 2012-10-03 14:44:39Z andrea $
+# $Id: PKGBUILD 170640 2012-11-09 08:28:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins: extra plugins to share photos')
 install=$pkgname.install
 source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz")
-sha1sums=('5a48c195d4c305f166b2d9fc1a483457c4698156')
+sha1sums=('ec383c32b5a277e7f9567af67c48bcf19b6128e8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index dd4840ca0..dfe4e649a 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168467 2012-10-12 06:40:18Z andrea $
+# $Id: PKGBUILD 170641 2012-11-09 08:28:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libgphoto2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz")
-sha1sums=('5b5b68b8996fdb1cb6541704c03d36cf506e8827')
+sha1sums=('add7f186d05fe5896f1a6c0b470f6539aa803a42')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index f3c2d41c4..821fb5316 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167825 2012-10-03 14:44:49Z andrea $
+# $Id: PKGBUILD 170642 2012-11-09 08:28:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz")
-sha1sums=('7e34705505140cc3e6085fc057365ce4cab2c0a0')
+sha1sums=('777c6158427906609d6ad429a88c53ba239b18d2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index 216cf6eaa..8e2c94836 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167826 2012-10-03 14:44:53Z andrea $
+# $Id: PKGBUILD 170643 2012-11-09 08:28:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz")
-sha1sums=('553d40c87000c57a10f64f01313ca519148530da')
+sha1sums=('c53d48a1b883a26b084fa91c016c3a543e067d6c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index fc52da4e2..6dae509b5 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167827 2012-10-03 14:44:58Z andrea $
+# $Id: PKGBUILD 170644 2012-11-09 08:29:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz")
-sha1sums=('a7a8fb6c63dc87e239bb54c2f178d2d5412296f3')
+sha1sums=('245706ffc337a44b55f88010088a7531ac37c4fe')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index 25422a0fa..f399ad877 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167828 2012-10-03 14:45:04Z andrea $
+# $Id: PKGBUILD 170645 2012-11-09 08:29:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz")
-sha1sums=('59fe8c2246d3d7e8c8307a4d72fae78caec20681')
+sha1sums=('7ca618561f7bb96db04e0978d69dc0984f892bd3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index 85fcd0893..f0d71eac9 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167829 2012-10-03 14:45:07Z andrea $
+# $Id: PKGBUILD 170646 2012-11-09 08:29:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz")
-sha1sums=('91b1ef55620bc621a81d0e75643e47d0a115e524')
+sha1sums=('0e403a2bd1d6f05c8bd958197246b4a9d6223bce')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index fc802be8e..332e09fba 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167830 2012-10-03 14:45:13Z andrea $
+# $Id: PKGBUILD 170647 2012-11-09 08:29:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz")
-sha1sums=('3496d070420f8aff10e69c98728c5c1ca34f6d47')
+sha1sums=('61bc95baed704821d597686ccb16e9bba40965fe')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 7357d10f6..e009262ed 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167831 2012-10-03 14:45:19Z andrea $
+# $Id: PKGBUILD 170648 2012-11-09 08:29:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
@@ -15,7 +15,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('81590d0958cebc3a052a4d973334f3fe4a9eabe4')
+sha1sums=('a7a5e63c8a4df1f079fb9381106df2f10b6f47ba')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index 22771c805..544a688a8 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167768 2012-10-03 14:39:31Z andrea $
+# $Id: PKGBUILD 170588 2012-11-09 08:25:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kdegraphics-mobipocket: mobipocket support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('2260afa2f0b7bf6afb2da5129fefd95b144dcd74')
+sha1sums=('33e6f1c3f282bf384d09f3fd1d535a35af572df6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index 213d6706f..719a0feb8 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167832 2012-10-03 14:45:23Z andrea $
+# $Id: PKGBUILD 170649 2012-11-09 08:29:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d9923f5e52fc58c50bf83d7854ce1ec615407753')
+sha1sums=('72739f16b23fb2ea51fd2a1f64d350214649e898')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index 90e1d52a5..f9973a225 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167833 2012-10-03 14:45:27Z andrea $
+# $Id: PKGBUILD 170650 2012-11-09 08:29:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A KPart for viewing SVGs"
 url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz")
-sha1sums=('06584ae6652d0ea2265c47599dbb6789c973f1fc')
+sha1sums=('b2fff50f76dcaaf0d2505679060cfa3175731b48')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index 7ab95847b..9c7937ad9 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167835 2012-10-03 14:45:31Z andrea $
+# $Id: PKGBUILD 170651 2012-11-09 08:29:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c87d00fa6af8fd1d57b0da74cdb382dd7d6f5311')
+sha1sums=('d14e20809c3d6703ba7029169fa2fa83d04ba5e2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD
index 37cf2eb1b..48fb989d5 100644
--- a/extra/kdemultimedia-audiocd-kio/PKGBUILD
+++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167836 2012-10-03 14:45:35Z andrea $
+# $Id: PKGBUILD 170652 2012-11-09 08:29:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-audiocd-kio
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Kioslave for accessing audio CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
@@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz")
-sha1sums=('822b2a151cb03cdf2708d3731a07b0fa23ee8e34')
+sha1sums=('55628ce0d00e98067abba2eb33e210a273bc404b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD
index a71078c64..60cb28fdc 100644
--- a/extra/kdemultimedia-dragonplayer/PKGBUILD
+++ b/extra/kdemultimedia-dragonplayer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167837 2012-10-03 14:45:41Z andrea $
+# $Id: PKGBUILD 170653 2012-11-09 08:29:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-dragonplayer
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A multimedia player where the focus is on simplicity, instead of
 features"
@@ -14,7 +14,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz")
-sha1sums=('ebe0021892c76f2b7ffd637ebf035801851ed3b5')
+sha1sums=('a5b8319414c6d4980ee4c4f5cd33318c499597b3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
index b96bac5da..47584cc1d 100644
--- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167838 2012-10-03 14:45:44Z andrea $
+# $Id: PKGBUILD 170654 2012-11-09 08:29:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='FFmpeg-based thumbnail creator for video files'
 url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
@@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia')
 depends=('kdelibs' 'ffmpeg')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz")
-sha1sums=('a0083c2cda9c194663676b70beb6d23dba0d4f1d')
+sha1sums=('f2cecd0677b9d57e60af394b4ba4815bf95a10d0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD
index f0739be03..4ee673a33 100644
--- a/extra/kdemultimedia-juk/PKGBUILD
+++ b/extra/kdemultimedia-juk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167839 2012-10-03 14:45:51Z andrea $
+# $Id: PKGBUILD 170655 2012-11-09 08:29:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-juk
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='A jukebox, tagger and music collection manager'
 url='http://kde.org/applications/multimedia/juk/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz")
-sha1sums=('64e0c7ea030434cba9bdc9db05901aa81e1aaa97')
+sha1sums=('e5fd939da08de0ca0b080812b36ef6eef02036fd')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index 8266c18c7..a92b9c461 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167840 2012-10-03 14:45:56Z andrea $
+# $Id: PKGBUILD 170656 2012-11-09 08:29:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kmix
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE volume control program"
 url='http://kde.org/applications/multimedia/kmix/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('581955c6a097c69f3cf511a6c55c58d2d2d9ceb7')
+sha1sums=('9eeb903eeaa464b4f15205b4a7c4c204e13a56d7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD
index 26a42117d..2c2a41673 100644
--- a/extra/kdemultimedia-kscd/PKGBUILD
+++ b/extra/kdemultimedia-kscd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167841 2012-10-03 14:46:02Z andrea $
+# $Id: PKGBUILD 170657 2012-11-09 08:29:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kscd
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE CD player"
 url='http://kde.org/applications/multimedia/kscd/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz")
-sha1sums=('9130d1f35713f5ebb2f81a4f1b91f3fe16f18861')
+sha1sums=('42aa1db2d61fbb3e17b605aeb3f16517f3237a7a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
index b39e28c2e..b3ea84166 100644
--- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD
+++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167842 2012-10-03 14:46:05Z andrea $
+# $Id: PKGBUILD 170658 2012-11-09 08:29:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="MPlayer based thumbnail generator for video files"
 url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'mplayer')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz")
-sha1sums=('a70d8f522d31529444ba957cdadd97c22dab7090')
+sha1sums=('6ff6a8d536bf8fda538f68d6da90525832d0b594')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
index 374c73669..7a9a4b061 100644
--- a/extra/kdenetwork/PKGBUILD
+++ b/extra/kdenetwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170573 2012-11-09 00:21:48Z eric $
+# $Id: PKGBUILD 170699 2012-11-09 20:50:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -23,7 +23,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
 sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6'
-          '808fa0400dc419d446d4ff8a9b536b5fddcb4727')
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 build() {
     cd ${pkgbase}-${pkgver}
diff --git a/extra/kdenetwork/use-libotr3.patch b/extra/kdenetwork/use-libotr3.patch
index c36d1a00c..1e96c98d6 100644
--- a/extra/kdenetwork/use-libotr3.patch
+++ b/extra/kdenetwork/use-libotr3.patch
@@ -1,5 +1,6 @@
---- kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake~	2012-11-06 10:51:56.566038215 +0000
-+++ kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake	2012-11-06 10:53:38.861993686 +0000
+diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
+--- a/kopete/cmake/modules/FindLibOTR.cmake	2012-08-12 18:08:59.000000000 -0600
++++ b/kopete/cmake/modules/FindLibOTR.cmake	2012-11-09 12:14:24.251450904 -0700
 @@ -13,13 +13,13 @@
      SET(LIBOTR_FIND_QUIETLY TRUE)
  ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
@@ -18,3 +19,53 @@
    STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
    STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
    # Check if version is at least 3.2.0
+diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
+--- a/kopete/plugins/otr/authenticationwizard.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/authenticationwizard.h	2012-11-09 12:15:11.181265336 -0700
+@@ -26,7 +26,7 @@
+   */
+ 
+ extern "C"{
+-#include "libotr/proto.h"
++#include "libotr3/proto.h"
+ }
+ 
+ #include "kopetechatsession.h"
+diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
+--- a/kopete/plugins/otr/otrlchatinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlchatinterface.h	2012-11-09 12:16:10.141032744 -0700
+@@ -36,10 +36,10 @@
+ #include "authenticationwizard.h"
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
+ }
+ 
+ 
+diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
+--- a/kopete/plugins/otr/otrlconfinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlconfinterface.h	2012-11-09 12:15:56.961084991 -0700
+@@ -32,11 +32,11 @@
+ #include <kopetechatsession.h>
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
+-#include <libotr/context.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
++#include <libotr3/context.h>
+ }
+ 
+ class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index c6e87355c..3a1f340d9 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167765 2012-10-03 14:39:17Z andrea $
+# $Id: PKGBUILD 170585 2012-11-09 08:25:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi')
 makedepends=('cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('4eeef5c706ea786d35ebaddf6c46084cf666680a')
+sha1sums=('85e293b3894e5a6c529c33e5ed72964a0172e920')
 
 build() {
     cd "${srcdir}"
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index ce5809eed..3ecc77828 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167844 2012-10-03 14:46:36Z andrea $
+# $Id: PKGBUILD 170659 2012-11-09 08:29:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-ktnef'
          'kdepim-libkdepim')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
@@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
              'kde-agent')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'fix-build.patch')
-sha1sums=('49e33e54e61bc499e54cdcd3470719cb4c22d2be'
+sha1sums=('5f0786a85db599a7b566a5d02d19c55222a64bcc'
           '974056ad2c3a00b33a8ac9403b369ab636000832')
 
 build() {
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index 683cb79c5..ae510dba3 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167759 2012-10-03 14:38:52Z andrea $
+# $Id: PKGBUILD 170580 2012-11-09 08:25:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
 makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
 install='kdepimlibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('247820f8f8de5bcd66e19c45afc2033e50f0fd01')
+sha1sums=('a1aa00a83cfd7c1998927dcedc3843a0a0006740')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index da60347b4..385e97699 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170053 2012-10-31 10:13:04Z andrea $
+# $Id: PKGBUILD 170660 2012-11-09 08:30:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -75,24 +75,18 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-potd'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.9.2
-pkgrel=3
+pkgver=4.9.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL')
 groups=('kde' 'kdeplasma-addons')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
              'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'fix-spell-crash.patch')
-sha1sums=('9f6493d52beb2ed723038e60f5f9ab53beec4e44'
-          '1ff0e61d73a4fce8ee7f585504a129ff50405ae6')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('e8b642b325acf2f7c8819e57176bbc2357cf78bd')
 
 build() {
-    cd ${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-spell-crash.patch
-    cd ../
-
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index baa7f3272..35a4c589f 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 167771 2012-10-03 14:39:42Z andrea $
+# $Id: PKGBUILD 170589 2012-11-09 08:25:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
 pkgname=('kdebase-katepart'
          'kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
         'pkgbuild-syntax-highlight.patch')
-sha1sums=('d3a1f58a5207b305e62a2a3dc7a34802289be42e'
+sha1sums=('d48c4671dfc13cefecf95e595403a5f75bc56d5b'
           '0a928253bd2077f0264d96a6c8823c69c47b6a8d')
 
 build() {
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 8844f309a..e18fee0b8 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169699 2012-10-26 08:57:54Z andrea $
+# $Id: PKGBUILD 170661 2012-11-09 08:30:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,8 +20,8 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-scripts'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
              'kdebase-lib')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'fix-python2-path.patch')
-sha1sums=('8acefc3701f12834b1e5606b635aef4b500e0aee'
+sha1sums=('ad45975bcda3a23fc7b77d93c7e7c0bd5f2f351c'
           '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
 
 build() {
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
index dbaea88f5..1bba44f1f 100644
--- a/extra/kdetoys/PKGBUILD
+++ b/extra/kdetoys/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167847 2012-10-03 14:47:16Z andrea $
+# $Id: PKGBUILD 170662 2012-11-09 08:30:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -6,7 +6,7 @@ pkgbase=kdetoys
 pkgname=('kdetoys-amor'
          'kdetoys-kteatime'
          'kdetoys-ktux')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('fe26e217edb2bc88ee3510bbe2fd32c3acd941b6')
+sha1sums=('2a5c07734fd4b65e181ddc2bce47ab57c5a1a557')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
index 669cc85f5..e03421ce3 100644
--- a/extra/kdeutils-filelight/PKGBUILD
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167849 2012-10-03 14:47:27Z andrea $
+# $Id: PKGBUILD 170664 2012-11-09 08:30:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-filelight
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='View disk usage information'
 url='http://kde.org/applications/utilities/filelight'
@@ -15,7 +15,7 @@ replaces=('filelight')
 conflicts=('filelight')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz")
-sha1sums=('f1d4c7604fb94a4bbe36e136955dd5f6f0f1fdf1')
+sha1sums=('c339bf9918e4f8e3bd12f31a89262a9580e500d6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
index 4b4c01d0b..279acc404 100644
--- a/extra/kdeutils-kcalc/PKGBUILD
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167850 2012-10-03 14:47:33Z andrea $
+# $Id: PKGBUILD 170665 2012-11-09 08:30:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcalc
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Scientific Calculator'
 url='http://kde.org/applications/utilities/kcalc/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('f28ed638e433c26e43c7e57e0193cdec67de9f22')
+sha1sums=('d426f061fba14bd311927f04bd3ba655d4a7fef7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
index f215018fd..3d8b1342e 100644
--- a/extra/kdeutils-kcharselect/PKGBUILD
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167851 2012-10-03 14:47:36Z andrea $
+# $Id: PKGBUILD 170666 2012-11-09 08:30:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcharselect
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Character Selector'
 url="http://kde.org/applications/utilities/kcharselect/"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz")
-sha1sums=('77f9077f2ec75de8f764140306c63c1a79888d33')
+sha1sums=('f97cd586a1d461ece4401388693a2a60389c6464')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
index 5a16a0c77..17c2dc0fb 100644
--- a/extra/kdeutils-kdf/PKGBUILD
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167852 2012-10-03 14:47:41Z andrea $
+# $Id: PKGBUILD 170667 2012-11-09 08:30:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kdf
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 url="http://kde.org/applications/system/kdiskfree/"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz")
-sha1sums=('022151b4f2170411037be31d2bbf9ce26f003313')
+sha1sums=('a14ab2740ec4d5be1839ad8b0650fd02106c0ce7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
index 73a0a3ec2..1ad807022 100644
--- a/extra/kdeutils-kfloppy/PKGBUILD
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167853 2012-10-03 14:47:46Z andrea $
+# $Id: PKGBUILD 170668 2012-11-09 08:30:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kfloppy
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Floppy Formatter'
 url='http://kde.org/applications/utilities/kfloppy/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz")
-sha1sums=('dbf5ceed22cd0ef0d898dacc466ea6db3da7c980')
+sha1sums=('5ea028f8e2628cef27b331b2a5c087efb45c4864')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
index 8233c5677..2a9b0f50e 100644
--- a/extra/kdeutils-kgpg/PKGBUILD
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167854 2012-10-03 14:47:51Z andrea $
+# $Id: PKGBUILD 170669 2012-11-09 08:30:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kgpg
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='A GnuPG frontend'
 url='http://kde.org/applications/utilities/kgpg/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('2ec3ceb0d623ce1c2345025292a8a3c2e6b9923a')
+sha1sums=('3acc06395c17c68ff2e74f613d8d8565c43ca2d6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
index 41814687c..e8e229117 100644
--- a/extra/kdeutils-kremotecontrol/PKGBUILD
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kremotecontrol
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Configure your remote controls for use with applications'
 url='http://kde.org/applications/utilities/kremotecontrol/'
@@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc')
 conflicts=('kdeutils-kdelirc')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz")
-sha1sums=('142a28d72f07690a5b342c554493fcfb2e7ae6b5')
+sha1sums=('59cac67bb4f19688c0ce17b7cc5c69db5b01f745')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
index b5ada2bf2..961ef57e6 100644
--- a/extra/kdeutils-ktimer/PKGBUILD
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167856 2012-10-03 14:48:01Z andrea $
+# $Id: PKGBUILD 170671 2012-11-09 08:31:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ktimer
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Countdown Launcher'
 url='http://kde.org/applications/utilities/ktimer/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz")
-sha1sums=('e621ca273d1cb2490f9212f3c2ecf8d57a6efdd3')
+sha1sums=('817ea9617fc1264f7340a42e04efdd0fd8190cfa')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
index e8ad2069c..2206d2131 100644
--- a/extra/kdeutils-kwallet/PKGBUILD
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167857 2012-10-03 14:48:06Z andrea $
+# $Id: PKGBUILD 170672 2012-11-09 08:31:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kwallet
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='Wallet Management Tool'
 url='http://kde.org/applications/system/kwalletmanager/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz")
-sha1sums=('e77e2cbf91f14e95ccd45fb1931df274f6c68cc7')
+sha1sums=('135e563de2724b923ee7359ec4439097a5c0485b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
index 7e33f0557..20e9d0910 100644
--- a/extra/kdeutils-superkaramba/PKGBUILD
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167860 2012-10-03 14:48:13Z andrea $
+# $Id: PKGBUILD 170674 2012-11-09 08:31:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-superkaramba
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='An engine for cool desktop eyecandy'
 url='http://kde.org/applications/utilities/superkaramba/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz")
-sha1sums=('3e2e42316fe7ac357c58fbfa1e1387c347c31b30')
+sha1sums=('2558e05331a62ea3949d8949aa66e6aae29d95da')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
index 92e53e1d2..bbc8a078b 100644
--- a/extra/kdeutils-sweeper/PKGBUILD
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167861 2012-10-03 14:48:16Z andrea $
+# $Id: PKGBUILD 170675 2012-11-09 08:31:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-sweeper
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc='System Cleaner'
 url='http://kde.org/applications/utilities/sweeper'
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz")
-sha1sums=('31732ac3dd0be4864f6db9a7810b67a1634fc57d')
+sha1sums=('13a6ac2aa84643a615d09137cb10b0a9847f0d1d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index 3ab8ca69d..0d115dd48 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167862 2012-10-03 14:48:24Z andrea $
+# $Id: PKGBUILD 170676 2012-11-09 08:31:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kimagemapeditor'
          'kdewebdev-klinkstatus'
          'kdewebdev-kommander')
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdewebdev')
 makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b811adaa5e996d9f588215be411a6a8d07f493ef')
+sha1sums=('590a6da889357c16246ac8b5e0a16b7fb4679414')
 
 build() {
 	cd $srcdir
diff --git a/extra/libgusb/PKGBUILD b/extra/libgusb/PKGBUILD
index ec1f2617e..0cf8084de 100644
--- a/extra/libgusb/PKGBUILD
+++ b/extra/libgusb/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 144366 2011-12-05 11:59:52Z ibiru $
+# $Id: PKGBUILD 170681 2012-11-09 12:30:03Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgusb
-pkgver=0.1.3
+pkgver=0.1.4
 pkgrel=1
 pkgdesc="GLib wrapper around libusb1"
 arch=('i686' 'x86_64')
 url="https://gitorious.org/gusb/"
 license=('LGPL2.1')
-depends=('udev')
+depends=('udev' 'libusbx')
+makedepends=('gobject-introspection')
 source=(http://people.freedesktop.org/~hughsient/releases/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
-sha256sums=('4eebb56700d9366c513bfa8f9321a60388f61bade0236a90d66854caea97f0e6')
+sha256sums=('64294a649e54df2009545f47577f41438ec50c2fc571dd7b08cf32cb14de37b9')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD
index e67d70ae4..a86699841 100644
--- a/extra/libkcddb/PKGBUILD
+++ b/extra/libkcddb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167788 2012-10-03 14:41:14Z andrea $
+# $Id: PKGBUILD 170605 2012-11-09 08:26:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcddb
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="KDE CDDB library"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('11a83fcf8e699d787b0c037e50f2031874470d70')
+sha1sums=('6a9d99cea33143cfdd89766b9647aa463b3f560f')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD
index 1f84c5fe3..7ea600fd9 100644
--- a/extra/libkcompactdisc/PKGBUILD
+++ b/extra/libkcompactdisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167789 2012-10-03 14:41:18Z andrea $
+# $Id: PKGBUILD 170606 2012-11-09 08:26:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcompactdisc
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A library for interfacing with CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('daea966e1d6bc06b3dc7001455e31f5004a05423')
+sha1sums=('fc5ec113a34787ae36120581f8e9a1508fdee5a0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index ed57e15d4..4c1844679 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167782 2012-10-03 14:40:52Z andrea $
+# $Id: PKGBUILD 170600 2012-11-09 08:26:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('022e5e59fb4b0a9ac7942b967f488795a42786e0')
+sha1sums=('be92e3e5c6b9cde30ebed4ef328ed454ed968b55')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index 8957699de..32641ae41 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167780 2012-10-03 14:40:42Z andrea $
+# $Id: PKGBUILD 170598 2012-11-09 08:26:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e03310dbb1bcc02095f238fbdd4684a59e98d710')
+sha1sums=('5469a7c5cea78b922ddfd3427a3f8cefdd04d383')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index ed078f7f6..e9956736e 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167783 2012-10-03 14:40:55Z andrea $
+# $Id: PKGBUILD 170601 2012-11-09 08:26:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('60956d88677346bdd4e343b1454a61a2210a39c6')
+sha1sums=('ea41341a49b524d946b844fc4146652011cdb980')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index d768ff29b..b778ee56f 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('36d9bd240409e4ec3063fe02279671502fb65c26')
+sha1sums=('0752fadb0757abb6f1954bb0cda407c074628cd8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index 815121e7d..26fca0a49 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 167786 2012-10-03 14:41:06Z andrea $
+# $Id: PKGBUILD 170603 2012-11-09 08:26:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.9.2
+pkgver=4.9.3
 pkgrel=1
 pkgdesc="An image scanning library"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e8578ec3a65ba91a8772c88612f61116ee9f38a8')
+sha1sums=('2ca77dc024bf5254a7bd7ebd22c3b83bab4e07cc')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
index b11c9a7de..daebd5ba6 100644
--- a/extra/libva-intel-driver/PKGBUILD
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 168383 2012-10-09 16:37:25Z ibiru $
+# $Id: PKGBUILD 170694 2012-11-09 19:58:58Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva-intel-driver
-pkgver=1.0.18
+pkgver=1.0.19
 pkgrel=1
 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
 arch=('i686' 'x86_64')
@@ -11,15 +11,12 @@ license=('MIT')
 depends=('libva')
 options=('!libtool')
 replaces=('libva-driver-intel')
-source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
-        build-fix.patch)
-sha1sums=('2cbf6f8c9f59516cceb5c4245576d53d26612256'
-          '447987d81800b2a5c434e6b6b19b6f8ec9c675d1')
+source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha1sums=('9b1c92ca2b59b3b150fd45cb01775e0c114a41a7')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../build-fix.patch
-  ./configure --prefix=/usr
+  ./autogen.sh --prefix=/usr
   make
 }
 
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD
index 898cdb05a..dc824adc8 100644
--- a/extra/nepomuk-core/PKGBUILD
+++ b/extra/nepomuk-core/PKGBUILD
@@ -1,26 +1,19 @@
-# $Id: PKGBUILD 167761 2012-10-03 14:39:00Z andrea $
+# $Id: PKGBUILD 170582 2012-11-09 08:25:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-core
-pkgver=4.9.2
-pkgrel=2
+pkgver=4.9.3
+pkgrel=1
 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'regression-crash.patch')
-sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b'
-          'f49436046cfd98b172a53eeaffb0d5df6bf5e1ee')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d235f033206fdd6d0dbad63143bfa89dde99b19d')
 
 build() {
-  # KDEBUG 307388
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/regression-crash.patch
-  cd ../
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 229c21a0d..cdeadc91c 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170195 2012-11-04 17:25:47Z schiv $
+# $Id: PKGBUILD 170692 2012-11-09 19:50:58Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -6,22 +6,24 @@ pkgbase=opencv
 pkgname=('opencv' 'opencv-docs' 'opencv-samples')
 _realname=OpenCV
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('BSD')
 url="http://opencv.org/"
-depends=('jasper' 'gstreamer0.10-base' 'gtk2'
-         'xine-lib' 'libdc1394' 'openexr')
+depends=('jasper' 'gstreamer0.10-base' 'intel-tbb'
+         'xine-lib' 'libdc1394' 'openexr' 'gtk2')
 makedepends=('cmake' 'python2-numpy' 'eigen2')
 optdepends=('opencv-docs'
             'opencv-samples'
             'eigen2'
             'python2-numpy: Python 2.x interface')
 source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2"
-        'pkgconfig.patch')
+        'pkgconfig.patch'
+        'fsh.patch')
 md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe'
-         'cb916260b5ec594fe7a0cc2e54fc569f')
+         'cb916260b5ec594fe7a0cc2e54fc569f'
+         '35256e3ccace373feba8131d1540a0de')
 
 _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
@@ -36,7 +38,7 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
             '-D WITH_UNICAP=OFF'
             '-D WITH_PVAPI=OFF'
             '-D WITH_OPENNI=OFF'
-            '-D WITH_TBB=OFF'
+            '-D WITH_TBB=ON'
             '-D WITH_IPP=OFF'
             '-D WITH_CUDA=OFF'
             '-D USE_FAST_MATH=ON')
@@ -48,6 +50,10 @@ build() {
   # see https://bugs.archlinux.org/task/32430
   patch -Np1 -i "$srcdir/pkgconfig.patch"
 
+  # fix another upstream mess
+  # see http://code.opencv.org/issues/2512
+  patch -Np1 -i "$srcdir/fsh.patch"
+
   cmake ${_cmakeopts[@]} .
 
   make
@@ -65,10 +71,11 @@ package_opencv() {
   cd "$pkgdir/usr/share"
 
   # separate docs package; also be -R friendly
-  [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc"
+  [ -d doc/$pkgname ] && mv doc/$pkgname "$srcdir/opencv-doc" \
+    && rm -r doc
 
   # separate samples package
-  [ -d $_realname/samples ] && mv $_realname/samples "$srcdir/opencv-samples"
+  [ -d $pkgname/samples ] && mv $pkgname/samples "$srcdir/opencv-samples"
 }
 
 package_opencv-docs() {
@@ -80,7 +87,7 @@ package_opencv-docs() {
   cd "$srcdir"
 
   mkdir -p "$pkgdir/usr/share/doc"
-  cp -r opencv-doc "$pkgdir/usr/share/doc/$_realname"
+  cp -r opencv-doc "$pkgdir/usr/share/doc/$pkgname"
 
   # install license file
   install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
@@ -95,8 +102,8 @@ package_opencv-samples() {
 
   cd "$srcdir"
 
-  mkdir -p "$pkgdir/usr/share/$_realname"
-  cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples"
+  mkdir -p "$pkgdir/usr/share/$pkgname"
+  cp -r opencv-samples "$pkgdir/usr/share/$pkgname/samples"
 
   # install license file
   install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
diff --git a/extra/opencv/fsh.patch b/extra/opencv/fsh.patch
new file mode 100644
index 000000000..fc6fb4b2a
--- /dev/null
+++ b/extra/opencv/fsh.patch
@@ -0,0 +1,103 @@
+diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
+--- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake	2012-11-05 18:42:32.460958392 +0000
++++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake	2012-11-05 18:52:43.766689315 +0000
+@@ -47,7 +47,7 @@
+ 
+   #need better solution....
+   if(libpath MATCHES "3rdparty")
+-    set(installDir "share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
++    set(installDir "share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
+   else()
+     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
+   endif()
+diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
+--- OpenCV-2.4.3.orig/CMakeLists.txt	2012-11-05 18:42:32.700956757 +0000
++++ OpenCV-2.4.3/CMakeLists.txt	2012-11-05 18:55:42.358787848 +0000
+@@ -221,9 +221,9 @@
+ if(ANDROID OR WIN32)
+   set(OPENCV_DOC_INSTALL_PATH doc)
+ elseif(INSTALL_TO_MANGLED_PATHS)
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION})
+ else()
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
+ endif()
+ 
+ if(ANDROID)
+@@ -237,14 +237,14 @@
+   set(LIBRARY_OUTPUT_PATH         "${OpenCV_BINARY_DIR}/lib")
+   set(3P_LIBRARY_OUTPUT_PATH      "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
+   set(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
+-  set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
++  set(OPENCV_3P_LIB_INSTALL_PATH  share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
+   set(OPENCV_INCLUDE_INSTALL_PATH include)
+ 
+   math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
+   if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
+     set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
+   else()
+-    set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
++    set(OPENCV_CONFIG_INSTALL_PATH share/opencv)
+   endif()
+ endif()
+ 
+diff -Nbaur OpenCV-2.4.3.orig/data/CMakeLists.txt OpenCV-2.4.3/data/CMakeLists.txt
+--- OpenCV-2.4.3.orig/data/CMakeLists.txt	2012-11-05 18:42:32.460958392 +0000
++++ OpenCV-2.4.3/data/CMakeLists.txt	2012-11-05 18:52:43.816688977 +0000
+@@ -5,6 +5,6 @@
+   install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT main)
+   install(FILES ${LBP_CASCADES}  DESTINATION sdk/etc/lbpcascades  COMPONENT main)
+ elseif(NOT WIN32)
+-  install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
+-  install(FILES ${LBP_CASCADES}  DESTINATION share/OpenCV/lbpcascades  COMPONENT main)
++  install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
++  install(FILES ${LBP_CASCADES}  DESTINATION share/opencv/lbpcascades  COMPONENT main)
+ endif()
+diff -Nbaur OpenCV-2.4.3.orig/samples/c/CMakeLists.txt OpenCV-2.4.3/samples/c/CMakeLists.txt
+--- OpenCV-2.4.3.orig/samples/c/CMakeLists.txt	2012-11-05 18:42:32.697623446 +0000
++++ OpenCV-2.4.3/samples/c/CMakeLists.txt	2012-11-05 18:52:43.826688906 +0000
+@@ -54,7 +54,7 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${C_SAMPLES}
+-          DESTINATION share/OpenCV/samples/c
++          DESTINATION share/opencv/samples/c
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif ()
+ 
+diff -Nbaur OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt OpenCV-2.4.3/samples/cpp/CMakeLists.txt
+--- OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt	2012-11-05 18:42:32.677623583 +0000
++++ OpenCV-2.4.3/samples/cpp/CMakeLists.txt	2012-11-05 18:52:43.823355598 +0000
+@@ -64,7 +64,7 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${C_SAMPLES}
+-          DESTINATION share/OpenCV/samples/cpp
++          DESTINATION share/opencv/samples/cpp
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+ 
+diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt
+--- OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt	2012-11-05 18:42:32.670956962 +0000
++++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt	2012-11-05 18:52:43.820022288 +0000
+@@ -64,7 +64,7 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${install_list}
+-          DESTINATION share/OpenCV/samples/${project}
++          DESTINATION share/opencv/samples/${project}
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+ 
+diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt
+--- OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt	2012-11-05 18:42:32.674290272 +0000
++++ OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt	2012-11-05 18:52:43.823355598 +0000
+@@ -21,6 +21,6 @@
+ if(INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB GPU_FILES performance/*.cpp performance/*.h)
+   install(FILES ${GPU_FILES}
+-          DESTINATION share/OpenCV/samples/gpu/performance
++          DESTINATION share/opencv/samples/gpu/performance
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
diff --git a/extra/portmidi/PKGBUILD b/extra/portmidi/PKGBUILD
new file mode 100644
index 000000000..ac16436ff
--- /dev/null
+++ b/extra/portmidi/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 170712 2012-11-10 01:03:47Z eric $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Denis Martinez <deuns.martinez AT gmail DOT com>
+
+pkgname=portmidi
+pkgver=217
+pkgrel=3
+pkgdesc="Platform independent library for real-time MIDI input/output."
+arch=('i686' 'x86_64')
+url='http://portmedia.sourceforge.net/'
+license=('GPL')
+depends=('alsa-lib')
+makedepends=('cmake' 'java-environment')
+source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip"
+        'portmidi-217-build-fix.patch')
+md5sums=('03f46fd3947e2ef4c8c465baaf832241'
+         '59cb428b29a33bab3bb5811cda479a9b')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+
+  sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py
+  mkdir -p pm_java/Release
+
+  # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118)
+  patch -p1 -i ../portmidi-217-build-fix.patch
+
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \
+    -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \
+    -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # Fix missing symlink for libporttime.so (FS#21528).
+  mv "${pkgdir}/usr/lib/libportmidi_s.a" "${pkgdir}/usr/lib/libportmidi.a"
+  ln -s "/usr/lib/libportmidi.so" "${pkgdir}/usr/lib/libporttime.so"
+  ln -s "/usr/lib/libportmidi.a" "${pkgdir}/usr/lib/libporttime.a"
+}
diff --git a/extra/portmidi/portmidi-217-build-fix.patch b/extra/portmidi/portmidi-217-build-fix.patch
new file mode 100644
index 000000000..3e2dfef29
--- /dev/null
+++ b/extra/portmidi/portmidi-217-build-fix.patch
@@ -0,0 +1,29 @@
+diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
+--- portmidi.orig/pm_java/CMakeLists.txt	2009-11-04 16:20:44.000000000 +0100
++++ portmidi/pm_java/CMakeLists.txt	2012-01-24 21:13:08.513182169 +0100
+@@ -15,13 +15,11 @@ if(UNIX)
+     add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class
+         COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
+-	DEPENDS pmdefaults/PmDefaults.java
+-	WORKING_DIRECTORY pm_java)
++	DEPENDS pmdefaults/PmDefaults.java)
+     add_custom_command(OUTPUT pmdefaults/PmDefaults.class
+         COMMAND javac -classpath . pmdefaults/PmDefaults.java
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaults.java
+-	DEPENDS pmdefaults/PmDefaultsFrame.java
+-	WORKING_DIRECTORY pm_java)
++	DEPENDS pmdefaults/PmDefaultsFrame.java)
+     add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
+         COMMAND	cp pmdefaults/portmusic_logo.png .
+         COMMAND	jar cmf pmdefaults/manifest.txt pmdefaults.jar
+@@ -31,8 +29,7 @@ if(UNIX)
+ 	COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+ 	COMMAND rm portmusic_logo.png
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaults.class
+-	DEPENDS ${PMDEFAULTS_ALL_CLASSES}
+-	WORKING_DIRECTORY pm_java)
++	DEPENDS ${PMDEFAULTS_ALL_CLASSES})
+     add_custom_target(pmdefaults_target ALL 
+         DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
+     # message(STATUS "add_custom_target: pmdefaults.jar")
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index 7d12f19bf..19b78fc17 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 164387 2012-08-01 01:21:35Z allan $
+# $Id: PKGBUILD 170721 2012-11-10 04:48:01Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcl
-pkgver=8.5.12
+pkgver=8.5.13
 pkgrel=1
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-md5sums=('174b2b4c619ba8f96875d8a051917703')
+md5sums=('fa3a9bf9b2d6ed2431f1baa46f4058b8')
 
 build() {
   cd ${srcdir}/tcl${pkgver}/unix
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index cb5e31c2f..b9bf23732 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164388 2012-08-01 01:21:39Z allan $
+# $Id: PKGBUILD 170723 2012-11-10 04:52:11Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tk
-pkgver=8.5.12
+pkgver=8.5.13
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('a01640176845c1f654a412cfc9bab13b')
+md5sums=('1fc7dbb7495160756dbc805224afa360')
 
 build() {
   cd ${srcdir}/tk${pkgver}/unix
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index fced03774..a7b1c5475 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169655 2012-10-25 05:32:33Z ibiru $
+# $Id: PKGBUILD 170688 2012-11-09 17:02:04Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="Open Source 2D acceleration driver for nVidia cards"
 arch=('i686' 'x86_64')
@@ -12,10 +12,11 @@ license=('GPL')
 depends=('libdrm' 'udev' 'nouveau-dri')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 install=$pkgname.install
 source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a2ae34046324e1ec620f5a8dee3c8fe5a295acbb5d51825604c8ad28fb75a559')
+sha256sums=('1a8290489cf4f48d2094a541ec9a6b68beb80299741d047e322e650c30ceb7c1')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD
index d008b2df0..cc18267a8 100644
--- a/extra/xf86-video-sisimedia/PKGBUILD
+++ b/extra/xf86-video-sisimedia/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 162836 2012-07-01 08:04:55Z andyrtr $
+# $Id: PKGBUILD 170686 2012-11-09 14:38:32Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisimedia
 pkgver=0.9.1
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org SiS 671 video driver"
 arch=(i686 x86_64)
 url="http://www.linuxconsulting.ro/xorg-drivers/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa' 'xf86dgaproto')
-optdepends=('sis-dri: DRI1 support from community repo')
-conflicts=('xorg-server<1.12.0')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
         xf86-video-sis-0.9.1-20102701.patch
@@ -36,6 +35,9 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-
         xf86MapDomainMemory-pci_device_map_legacy.patch
         sync-with-freedesktop.patch
         fix-xv-crash.patch
+        sisimedia-no-xaa.patch
+        sisimedia-xorg-1.13.patch
+        deprecated-sym2.patch
         COPYING)
 sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '61715bb86180decde55a56fad9a12d841c89fbb2'
@@ -60,6 +62,9 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '4ea8d76b3e74172109e7013a2931e571d3a2f4e1'
           '1d29504466840d2fbe1fc355d78666c1a9cd9b76'
           '1fdd74a2aef9455ac5c37d1fe0146d81aa905d2d'
+          '370af234867df98206a98c8cd0a6c89323593f6b'
+          '4ea333d659abe2b78f07511467c5356f39bf8695'
+          '9bef0b61c0505cc64464073d73684e6933d3f84c'
           'a64e244f274bcb155f892d0488a1a4b1b2f7d70d')
 
 build() {
@@ -86,6 +91,10 @@ build() {
   patch -Np1 -i "${srcdir}/xf86MapDomainMemory-pci_device_map_legacy.patch"
   patch -Np1 -i "${srcdir}/sync-with-freedesktop.patch"
   patch -Np0 -i "${srcdir}/fix-xv-crash.patch"
+  patch -Np1 -i "${srcdir}/sisimedia-no-xaa.patch"
+  patch -Np1 -i "${srcdir}/sisimedia-xorg-1.13.patch"
+
+  patch -Np1 -i "${srcdir}/deprecated-sym2.patch"
 
   sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am
   sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h
@@ -93,7 +102,7 @@ build() {
 
   autoreconf -fi
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-dri
   make
 }
 
diff --git a/extra/xf86-video-sisimedia/deprecated-sym2.patch b/extra/xf86-video-sisimedia/deprecated-sym2.patch
new file mode 100644
index 000000000..f02682333
--- /dev/null
+++ b/extra/xf86-video-sisimedia/deprecated-sym2.patch
@@ -0,0 +1,1068 @@
+This patch for remove all depreceated / obselete symbol on compiling
+Contributor saa7_go < saa7.go@gmail.com > 
+
+diff -u xf86-video-sismedia-0.9.1/src/initextx.c xf86-video-sismedia-0.9.1-dep-clean/src/initextx.c
+--- xf86-video-sismedia-0.9.1/src/initextx.c	2011-03-06 11:27:56.368767584 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/initextx.c	2011-03-06 11:34:50.298266877 +0700
+@@ -284,10 +284,10 @@
+ 	}
+       }
+ 
+-      if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
++      if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
+       memset(new, 0, sizeof(DisplayModeRec));
+-      if(!(new->name = xalloc(10))) {
+-	 xfree(new);
++      if(!(new->name = malloc(10))) {
++	 free(new);
+ 	 return first;
+       }
+       if(!first) first = new;
+@@ -436,11 +436,11 @@
+ 		     }
+ 		  }
+ 
+-		  if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
++		  if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
+ 
+ 		  memset(new, 0, sizeof(DisplayModeRec));
+-		  if(!(new->name = xalloc(12))) {
+-		     xfree(new);
++		  if(!(new->name = malloc(12))) {
++		     free(new);
+ 		     return first;
+ 		  }
+ 		  if(!first) first = new;
+@@ -521,11 +521,11 @@
+ 
+ 	 if(pSiS->SiS_Pr->CP_DataValid[i]) {
+ 
+-	    if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
++	    if(!(new = malloc(sizeof(DisplayModeRec)))) return first;
+ 
+ 	    memset(new, 0, sizeof(DisplayModeRec));
+-	    if(!(new->name = xalloc(10))) {
+-	       xfree(new);
++	    if(!(new->name = malloc(10))) {
++	       free(new);
+ 	       return first;
+ 	    }
+ 	    if(!first) first = new;
+diff -u xf86-video-sismedia-0.9.1/src/sis6326_video.c xf86-video-sismedia-0.9.1-dep-clean/src/sis6326_video.c
+--- xf86-video-sismedia-0.9.1/src/sis6326_video.c	2011-03-06 11:27:56.376768671 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis6326_video.c	2011-03-06 12:24:06.324251591 +0700
+@@ -171,7 +171,7 @@
+ 		adaptors = &newAdaptor;
+ 	} else {
+ 		/* need to free this someplace */
+-		newAdaptors = xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
++		newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+ 		if(newAdaptors) {
+ 			memcpy(newAdaptors, adaptors, num_adaptors *
+ 				sizeof(XF86VideoAdaptorPtr));
+@@ -186,7 +186,7 @@
+ 	xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+ 
+     if(newAdaptors)
+-	xfree(newAdaptors);
++	free(newAdaptors);
+ }
+ 
+ /* client libraries expect an encoding */
+@@ -532,7 +532,7 @@
+        return NULL;
+ #endif
+ 
+-    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+                             sizeof(SISPortPrivRec) +
+                             sizeof(DevUnion))))
+        return NULL;
+diff -u xf86-video-sismedia-0.9.1/src/sis_cursor.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_cursor.c
+--- xf86-video-sismedia-0.9.1/src/sis_cursor.c	2011-03-06 11:27:56.376768671 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_cursor.c	2011-03-06 12:24:06.400262694 +0700
+@@ -1253,11 +1253,11 @@
+     SISPtr pSiS = SISPTR(pScrn);
+     xf86CursorInfoPtr infoPtr;
+ 
+-    if(!(pSiS->CursorScratch = xcalloc(1, max(2048, pSiS->CursorSize))))
++    if(!(pSiS->CursorScratch = calloc(1, max(2048, pSiS->CursorSize))))
+        return FALSE;
+ 
+     if(!(infoPtr = xf86CreateCursorInfoRec())) {
+-       xfree(pSiS->CursorScratch);
++       free(pSiS->CursorScratch);
+        pSiS->CursorScratch = NULL;
+        return FALSE;
+     }
+diff -u xf86-video-sismedia-0.9.1/src/sis_dga.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_dga.c
+--- xf86-video-sismedia-0.9.1/src/sis_dga.c	2011-03-06 11:27:56.380769214 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_dga.c	2011-03-06 11:34:50.458289501 +0700
+@@ -156,18 +156,18 @@
+ 
+ 	if(pMode->HDisplay != otherPitch) {
+ 
+-	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
+ 	    oneMore  = TRUE;
+ 
+ 	} else {
+ 
+-	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
+ 	    oneMore  = FALSE;
+ 
+ 	}
+ 
+ 	if(!newmodes) {
+-	    xfree(modes);
++	    free(modes);
+ 	    return NULL;
+ 	}
+ 	modes = newmodes;
+@@ -353,12 +353,12 @@
+     newdgamodes = SISDGAMakeModes(pScrn, &newdgamodenum, TRUE);
+ 
+     if(DGAReInitModes(screenInfo.screens[pScrn->scrnIndex], newdgamodes, newdgamodenum)) {
+-       xfree(pSiS->DGAModes);
++       free(pSiS->DGAModes);
+        pSiS->DGAModes = newdgamodes;
+        pSiS->numDGAModes = newdgamodenum;
+        return TRUE;
+     } else {
+-       xfree(newdgamodes);
++       free(newdgamodes);
+        return FALSE;
+     }
+ #else
+diff -u xf86-video-sismedia-0.9.1/src/sis_dri.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_dri.c
+--- xf86-video-sismedia-0.9.1/src/sis_dri.c	2011-03-06 11:27:56.380769214 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_dri.c	2011-03-06 12:24:06.456270873 +0700
+@@ -156,19 +156,19 @@
+   case 32:
+     numConfigs = (useZ16) ? 8 : 16;
+ 
+-    if(!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig),
++    if(!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
+ 						   numConfigs))) {
+        return FALSE;
+     }
+-    if(!(pSISConfigs = (SISConfigPrivPtr)xcalloc(sizeof(SISConfigPrivRec),
++    if(!(pSISConfigs = (SISConfigPrivPtr)calloc(sizeof(SISConfigPrivRec),
+ 						    numConfigs))) {
+-       xfree(pConfigs);
++       free(pConfigs);
+        return FALSE;
+     }
+-    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)xcalloc(sizeof(SISConfigPrivPtr),
++    if(!(pSISConfigPtrs = (SISConfigPrivPtr*)calloc(sizeof(SISConfigPrivPtr),
+ 							  numConfigs))) {
+-       xfree(pConfigs);
+-       xfree(pSISConfigs);
++       free(pConfigs);
++       free(pSISConfigs);
+        return FALSE;
+     }
+     for(i=0; i<numConfigs; i++) pSISConfigPtrs[i] = &pSISConfigs[i];
+@@ -330,7 +330,7 @@
+      pDRIInfo->busIdString = DRICreatePCIBusID(pSIS->PciInfo);
+   } else {
+ #endif
+-     pDRIInfo->busIdString = xalloc(64);
++     pDRIInfo->busIdString = malloc(64);
+      sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
+ 	     pSIS->PciBus, pSIS->PciDevice, pSIS->PciFunc);
+ #ifdef SISHAVECREATEBUSID
+@@ -389,7 +389,7 @@
+   pDRIInfo->SAREASize = SAREA_MAX;
+ #endif
+ 
+-  if(!(pSISDRI = (SISDRIPtr)xcalloc(sizeof(SISDRIRec), 1))) {
++  if(!(pSISDRI = (SISDRIPtr)calloc(sizeof(SISDRIRec), 1))) {
+      DRIDestroyInfoRec(pSIS->pDRIInfo);
+      pSIS->pDRIInfo = 0;
+      return FALSE;
+@@ -407,7 +407,7 @@
+ 
+   if(!DRIScreenInit(pScreen, pDRIInfo, &pSIS->drmSubFD)) {
+      xf86DrvMsg(pScreen->myNum, X_ERROR, "[dri] DRIScreenInit failed. Disabling the DRI.\n");
+-     xfree(pDRIInfo->devPrivate);
++     free(pDRIInfo->devPrivate);
+      pDRIInfo->devPrivate = 0;
+      DRIDestroyInfoRec(pSIS->pDRIInfo);
+      pSIS->pDRIInfo = 0;
+@@ -867,7 +867,7 @@
+ 
+   if(pSIS->pDRIInfo) {
+      if(pSIS->pDRIInfo->devPrivate) {
+-	xfree(pSIS->pDRIInfo->devPrivate);
++	free(pSIS->pDRIInfo->devPrivate);
+ 	pSIS->pDRIInfo->devPrivate = NULL;
+      }
+      DRIDestroyInfoRec(pSIS->pDRIInfo);
+@@ -875,12 +875,12 @@
+   }
+ 
+   if(pSIS->pVisualConfigs) {
+-     xfree(pSIS->pVisualConfigs);
++     free(pSIS->pVisualConfigs);
+      pSIS->pVisualConfigs = NULL;
+   }
+ 
+   if(pSIS->pVisualConfigsPriv) {
+-     xfree(pSIS->pVisualConfigsPriv);
++     free(pSIS->pVisualConfigsPriv);
+      pSIS->pVisualConfigsPriv = NULL;
+   }
+ 
+diff -u xf86-video-sismedia-0.9.1/src/sis_driver.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_driver.c
+--- xf86-video-sismedia-0.9.1/src/sis_driver.c	2011-03-06 11:27:56.384769757 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_driver.c	2011-03-06 12:24:06.512279052 +0700
+@@ -497,7 +497,7 @@
+ 			numDevSections, drv, &usedChipsXGI);
+ 
+     /* Free it since we don't need that list after this */
+-    xfree(devSections);
++    free(devSections);
+ 
+     numUsed = numUsedSiS + numUsedXGI;
+ xf86DrvMsg(0, X_INFO, "SISPRobe - test1\n");
+@@ -595,8 +595,8 @@
+ 
+     }
+ 
+-    if(usedChipsSiS) xfree(usedChipsSiS);
+-    if(usedChipsXGI) xfree(usedChipsXGI);
++    if(usedChipsSiS) free(usedChipsSiS);
++    if(usedChipsXGI) free(usedChipsXGI);
+ xf86DrvMsg(0, X_INFO, "SISProbe end\n");
+     return foundScreen;
+ }
+@@ -642,12 +642,12 @@
+ #endif
+ 
+     if(pSiS->pstate) {
+-       xfree(pSiS->pstate);
++       free(pSiS->pstate);
+        pSiS->pstate = NULL;
+     }
+ 
+     if(pSiS->fonts) {
+-       xfree(pSiS->fonts);
++       free(pSiS->fonts);
+        pSiS->fonts = NULL;
+     }
+ 
+@@ -660,15 +660,15 @@
+ 	   * head.
+ 	   */
+ 	  if(pSiSEnt->BIOS)
+-	     xfree(pSiSEnt->BIOS);
++	     free(pSiSEnt->BIOS);
+ 	  pSiSEnt->BIOS = pSiS->BIOS = NULL;
+ 
+ 	  if(pSiSEnt->SiS_Pr)
+-	     xfree(pSiSEnt->SiS_Pr);
++	     free(pSiSEnt->SiS_Pr);
+ 	  pSiSEnt->SiS_Pr = pSiS->SiS_Pr = NULL;
+ 
+ 	  if(pSiSEnt->RenderAccelArray)
+-	     xfree(pSiSEnt->RenderAccelArray);
++	     free(pSiSEnt->RenderAccelArray);
+ 	  pSiSEnt->RenderAccelArray = pSiS->RenderAccelArray = NULL;
+ 
+ 	  pSiSEnt->pScrn_1 = NULL;
+@@ -681,17 +681,17 @@
+     } else {
+ #endif
+        if(pSiS->BIOS) {
+-          xfree(pSiS->BIOS);
++          free(pSiS->BIOS);
+           pSiS->BIOS = NULL;
+        }
+ 
+        if(pSiS->SiS_Pr) {
+-          xfree(pSiS->SiS_Pr);
++          free(pSiS->SiS_Pr);
+           pSiS->SiS_Pr = NULL;
+        }
+ 
+        if(pSiS->RenderAccelArray) {
+-          xfree(pSiS->RenderAccelArray);
++          free(pSiS->RenderAccelArray);
+           pSiS->RenderAccelArray = NULL;
+        }
+ #ifdef SISDUALHEAD
+@@ -699,17 +699,17 @@
+ #endif
+ #ifdef SISMERGED
+     if(pSiS->CRT2HSync) {
+-       xfree(pSiS->CRT2HSync);
++       free(pSiS->CRT2HSync);
+        pSiS->CRT2HSync = NULL;
+     }
+ 
+     if(pSiS->CRT2VRefresh) {
+-       xfree(pSiS->CRT2VRefresh);
++       free(pSiS->CRT2VRefresh);
+        pSiS->CRT2VRefresh = NULL;
+     }
+ 
+     if(pSiS->MetaModes) {
+-       xfree(pSiS->MetaModes);
++       free(pSiS->MetaModes);
+        pSiS->MetaModes = NULL;
+     }
+ 
+@@ -721,9 +721,9 @@
+ 	  while(pSiS->CRT2pScrn->monitor->Modes) {
+ 	     xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
+ 	  }
+-	  xfree(pSiS->CRT2pScrn->monitor);
++	  free(pSiS->CRT2pScrn->monitor);
+        }
+-       xfree(pSiS->CRT2pScrn);
++       free(pSiS->CRT2pScrn);
+        pSiS->CRT2pScrn = NULL;
+     }
+ 
+@@ -735,10 +735,10 @@
+ 	     do {
+ 	        DisplayModePtr p = pScrn->currentMode->next;
+ 	        if(pScrn->currentMode->Private)
+-	 	   xfree(pScrn->currentMode->Private);
++	 	   free(pScrn->currentMode->Private);
+ 	 	if(pScrn->currentMode->name)
+-	 	   xfree(pScrn->currentMode->name);
+-	        xfree(pScrn->currentMode);
++	 	   free(pScrn->currentMode->name);
++	        free(pScrn->currentMode);
+ 	        pScrn->currentMode = p;
+ 	     } while(pScrn->currentMode != pScrn->modes);
+ 	  }
+@@ -758,22 +758,22 @@
+     }
+ 
+     if(pSiS->currcrt1analogedid) {
+-       xfree(pSiS->currcrt1analogedid);
++       free(pSiS->currcrt1analogedid);
+        pSiS->currcrt1analogedid = NULL;
+     }
+ 
+     if(pSiS->currcrt1digitaledid) {
+-       xfree(pSiS->currcrt1digitaledid);
++       free(pSiS->currcrt1digitaledid);
+        pSiS->currcrt1digitaledid = NULL;
+     }
+ 
+     if(pSiS->currcrt2analogedid) {
+-       xfree(pSiS->currcrt2analogedid);
++       free(pSiS->currcrt2analogedid);
+        pSiS->currcrt2analogedid = NULL;
+     }
+ 
+     if(pSiS->currcrt2digitaledid) {
+-       xfree(pSiS->currcrt2digitaledid);
++       free(pSiS->currcrt2digitaledid);
+        pSiS->currcrt2digitaledid = NULL;
+     }
+ 
+@@ -784,7 +784,7 @@
+ 
+     while(pSiS->SISVESAModeList) {
+        sisModeInfoPtr mp = pSiS->SISVESAModeList->next;
+-       xfree(pSiS->SISVESAModeList);
++       free(pSiS->SISVESAModeList);
+        pSiS->SISVESAModeList = mp;
+     }
+ 
+@@ -801,7 +801,7 @@
+     if(pScrn->driverPrivate == NULL)
+         return;
+ 
+-    xfree(pScrn->driverPrivate);
++    free(pScrn->driverPrivate);
+     pScrn->driverPrivate = NULL;
+ }
+ 
+@@ -1017,22 +1017,22 @@
+ 	     Bool gotit = FALSE;
+ 
+  	     if(!ioctl(fd, SISFB_GET_INFO_SIZE, &sisfbinfosize)) {
+- 		if((mysisfbinfo = xalloc(sisfbinfosize))) {
++ 		if((mysisfbinfo = malloc(sisfbinfosize))) {
+  		   if(!ioctl(fd, (SISFB_GET_INFO | (sisfbinfosize << 16)), mysisfbinfo)) {
+  		      gotit = TRUE;
+  		   } else {
+- 		      xfree(mysisfbinfo);
++ 		      free(mysisfbinfo);
+  		      mysisfbinfo = NULL;
+  		   }
+  		}
+  	     } else {
+- 		if((mysisfbinfo = xalloc(sizeof(*mysisfbinfo) + 16))) {
++ 		if((mysisfbinfo = malloc(sizeof(*mysisfbinfo) + 16))) {
+  		   if(!ioctl(fd, SISFB_GET_INFO_OLD, mysisfbinfo)) {
+  		      gotit = TRUE;
+ 		      xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 				"Possibly old version of sisfb detected. Please update.\n");
+ 		   } else {
+-		      xfree(mysisfbinfo);
++		      free(mysisfbinfo);
+ 		      mysisfbinfo = NULL;
+ 		   }
+ 		}
+@@ -1171,7 +1171,7 @@
+ 		      }
+ 		   }
+ 	        }
+-		xfree(mysisfbinfo);
++		free(mysisfbinfo);
+ 		mysisfbinfo = NULL;
+ 	     }
+ 	     close (fd);
+@@ -1250,7 +1250,7 @@
+        }
+ #endif
+        if(!pSiS->BIOS) {
+-	  if(!(pSiS->BIOS = xcalloc(1, BIOS_SIZE))) {
++	  if(!(pSiS->BIOS = calloc(1, BIOS_SIZE))) {
+ 	     xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 		"Could not allocate memory for video BIOS image\n");
+ 	  } else {
+@@ -1352,7 +1352,7 @@
+ 	     } else {
+ 	        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 			 "Could not find/read video BIOS\n");
+-		xfree(pSiS->BIOS);
++		free(pSiS->BIOS);
+ 		pSiS->BIOS = NULL;
+ 	     }
+           }
+@@ -1851,7 +1851,7 @@
+ {
+    if((*ptr)) {
+       memcpy((*ptr), pMonitor, sizeof(xf86Monitor));
+-      xfree(pMonitor);
++      free(pMonitor);
+    } else {
+       (*ptr) = pMonitor;
+    }
+@@ -1882,7 +1882,7 @@
+       }
+ #endif
+ 
+-      xfree((*ptr));
++      free((*ptr));
+       *ptr = NULL;
+ 
+    }
+@@ -2158,7 +2158,7 @@
+ 		xf86PrintEDID(pMonitor);
+ 		if(pMonitor->rawData) {
+ 		   /* Get rid of raw data */
+-		   xfree(pMonitor->rawData);
++		   free(pMonitor->rawData);
+ 		   pMonitor->rawData = NULL;
+ 		}
+ 		pScrn->monitor->DDC = pMonitor = SiSSetEDIDPtr(&pSiS->currcrt1analogedid, pMonitor);
+@@ -2821,12 +2821,12 @@
+     DisplayModePtr dest = NULL;
+ 
+     if(source) {
+-       if((dest = xalloc(sizeof(DisplayModeRec)))) {
++       if((dest = malloc(sizeof(DisplayModeRec)))) {
+ 	  memcpy(dest, source, sizeof(DisplayModeRec));
+ 	  dest->name = NULL;
+ 	  dest->next = dest->prev = NULL;
+-	  if(!(dest->name = xalloc(strlen(source->name) + 1))) {
+-	     xfree(dest);
++	  if(!(dest->name = malloc(strlen(source->name) + 1))) {
++	     free(dest);
+ 	     dest = NULL;
+ 	  } else {
+ 	     strcpy(dest->name, source->name);
+@@ -5256,7 +5256,7 @@
+     /* MergedFB: Create CRT2 pScrn and make it a copy of pScrn */
+ #ifdef SISMERGED
+     if(pSiS->MergedFB) {
+-       pSiS->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
++       pSiS->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
+        if(!pSiS->CRT2pScrn) {
+           SISErrorLog(pScrn, "Failed to allocate memory for 2nd pScrn, %s\n", mergeddisstr);
+ 	  pSiS->MergedFB = FALSE;
+@@ -5292,7 +5292,7 @@
+ 	     } else {
+ 		SISErrorLog(pScrn, mergednocrt1, mergeddisstr);
+ 	     }
+-	     if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
++	     if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
+ 	     pSiS->CRT2pScrn = NULL;
+ 	     pSiS->MergedFB = FALSE;
+ 	  }
+@@ -5341,7 +5341,7 @@
+ 	   } else {
+ 	      SISErrorLog(pScrn, mergednocrt2, mergeddisstr);
+ 	   }
+-	   if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
++	   if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
+ 	   pSiS->CRT2pScrn = NULL;
+ 	   pSiS->MergedFB = FALSE;
+ 	}
+@@ -5711,7 +5711,7 @@
+ #endif
+ 
+     /* Don't need the clock ranges from here on */
+-    xfree(clockRanges);
++    free(clockRanges);
+ 
+     /* Set display resolution */
+ #ifdef SISMERGED
+@@ -6719,7 +6719,7 @@
+ 	     (function == MODE_SAVE)) {
+ 	     /* don't rely on the memory not being touched */
+ 	     if(!pSiS->pstate) {
+-		pSiS->pstate = xalloc(pSiS->stateSize);
++		pSiS->pstate = malloc(pSiS->stateSize);
+ 	     }
+ 	     memcpy(pSiS->pstate, pSiS->state, pSiS->stateSize);
+ 	  }
+@@ -9086,10 +9086,10 @@
+    if(!(nramp = xf86GetGammaRampSize(pScreen))) return;
+ 
+    for(i=0; i<3; i++) {
+-      ramp[i] = (UShort *)xalloc(nramp * sizeof(UShort));
++      ramp[i] = (UShort *)malloc(nramp * sizeof(UShort));
+       if(!ramp[i]) {
+-	 if(ramp[0]) { xfree(ramp[0]); ramp[0] = NULL; }
+-	 if(ramp[1]) { xfree(ramp[1]); ramp[1] = NULL; }
++	 if(ramp[0]) { free(ramp[0]); ramp[0] = NULL; }
++	 if(ramp[1]) { free(ramp[1]); ramp[1] = NULL; }
+ 	 return;
+       }
+    }
+@@ -9149,9 +9149,9 @@
+ 
+    xf86ChangeGammaRamp(pScreen, nramp, ramp[0], ramp[1], ramp[2]);
+ 
+-   xfree(ramp[0]);
+-   xfree(ramp[1]);
+-   xfree(ramp[2]);
++   free(ramp[0]);
++   free(ramp[1]);
++   free(ramp[2]);
+    ramp[0] = ramp[1] = ramp[2] = NULL;
+ }
+ #endif
+@@ -9442,7 +9442,7 @@
+ 
+     if(pSiS->ShadowFB) {
+        pSiS->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
+-       pSiS->ShadowPtr = xalloc(pSiS->ShadowPitch * height);
++       pSiS->ShadowPtr = malloc(pSiS->ShadowPitch * height);
+        displayWidth = pSiS->ShadowPitch / (pScrn->bitsPerPixel >> 3);
+        FBStart = pSiS->ShadowPtr;
+     } else {
+@@ -9626,14 +9626,14 @@
+ 
+ 	  pSiS->CRT2ColNum = 1 << pScrn->rgbBits;
+ 
+-	  if((pSiS->crt2gcolortable = xalloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
++	  if((pSiS->crt2gcolortable = malloc(pSiS->CRT2ColNum * 2 * sizeof(LOCO)))) {
+ 	     pSiS->crt2colors = &pSiS->crt2gcolortable[pSiS->CRT2ColNum];
+-	     if((pSiS->crt2cindices = xalloc(256 * sizeof(int)))) {
++	     if((pSiS->crt2cindices = malloc(256 * sizeof(int)))) {
+ 		int i = pSiS->CRT2ColNum;
+ 		SISCalculateGammaRampCRT2(pScrn);
+ 		while(i--) pSiS->crt2cindices[i] = i;
+ 	     } else {
+-		xfree(pSiS->crt2gcolortable);
++		free(pSiS->crt2gcolortable);
+ 		pSiS->crt2gcolortable = NULL;
+ 		pSiS->CRT2SepGamma = FALSE;
+ 	     }
+@@ -10810,7 +10810,7 @@
+     if(pSiS->useEXA) {
+        if(pSiS->EXADriverPtr) {
+           exaDriverFini(pScreen);
+-          xfree(pSiS->EXADriverPtr);
++          free(pSiS->EXADriverPtr);
+           pSiS->EXADriverPtr = NULL;
+           pSiS->exa_scratch = NULL;
+        }
+@@ -10823,38 +10823,38 @@
+     }
+ 
+     if(pSiS->CursorScratch) {
+-       xfree(pSiS->CursorScratch);
++       free(pSiS->CursorScratch);
+        pSiS->CursorScratch = NULL;
+     }
+ 
+     if(pSiS->ShadowPtr) {
+-       xfree(pSiS->ShadowPtr);
++       free(pSiS->ShadowPtr);
+        pSiS->ShadowPtr = NULL;
+     }
+ 
+     if(pSiS->DGAModes) {
+-       xfree(pSiS->DGAModes);
++       free(pSiS->DGAModes);
+        pSiS->DGAModes = NULL;
+     }
+ 
+     if(pSiS->adaptor) {
+-       xfree(pSiS->adaptor);
++       free(pSiS->adaptor);
+        pSiS->adaptor = NULL;
+        pSiS->ResetXv = pSiS->ResetXvGamma = pSiS->ResetXvDisplay = NULL;
+     }
+ 
+     if(pSiS->blitadaptor) {
+-       xfree(pSiS->blitadaptor);
++       free(pSiS->blitadaptor);
+        pSiS->blitadaptor = NULL;
+     }
+ 
+     if(pSiS->crt2gcolortable) {
+-       xfree(pSiS->crt2gcolortable);
++       free(pSiS->crt2gcolortable);
+        pSiS->crt2gcolortable = NULL;
+     }
+ 
+     if(pSiS->crt2cindices) {
+-       xfree(pSiS->crt2cindices);
++       free(pSiS->crt2cindices);
+        pSiS->crt2cindices = NULL;
+     }
+ 
+diff -u xf86-video-sismedia-0.9.1/src/sis_hwmc.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_hwmc.c
+--- xf86-video-sismedia-0.9.1/src/sis_hwmc.c	2011-03-06 11:27:56.388770300 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_hwmc.c	2011-03-06 12:24:06.612293658 +0700
+@@ -274,7 +274,7 @@
+  *  Set *num_priv to the number of 32bit words that make up the size of
+  *  of the data that priv will point to.
+  *
+- *  *priv = (long *) xcalloc (elements, sizeof(element))
++ *  *priv = (long *) calloc (elements, sizeof(element))
+  *  *num_priv = (elements * sizeof(element)) >> 2;
+  *
+  **************************************************************************/
+@@ -310,7 +310,7 @@
+     return BadAlloc;
+   }
+ 
+-  *priv = xcalloc(1,sizeof(SiSXvMCCreateContextRec));
++  *priv = calloc(1,sizeof(SiSXvMCCreateContextRec));
+   contextRec = (SiSXvMCCreateContextRec *)*priv;
+ 
+   if(!*priv) {
+@@ -322,7 +322,7 @@
+   if(drmCreateContext(pSiS->drmSubFD, &(contextRec->drmcontext) ) < 0) {
+     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+         "[MC] SiSXvMCCreateContext: Unable to create DRMContext!\n");
+-    xfree(*priv);
++    free(*priv);
+     return BadAlloc;
+   }
+ 
+@@ -336,7 +336,7 @@
+   	DRM_FRAME_BUFFER, 0, &pSiS->fb_handle) < 0){
+   	
+ 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"[MC] Frame buffer AddMap  failed!\n");
+-		xfree(*priv);
++		free(*priv);
+ 		*num_priv = 0;
+ 		return BadAlloc;
+   }
+@@ -357,7 +357,7 @@
+      break;
+   default:
+       xf86DrvMsg(pScrn->scrnIndex, X_ERROR," [MC] XvMC is not supposted on this chip! Stop.\n");
+-      xfree(*priv);
++      free(*priv);
+       *num_priv = 0;
+       return BadValue;
+   }
+@@ -408,7 +408,7 @@
+ #endif
+ 
+ 
+-  *priv = xcalloc(1,sizeof(SiSXvMCCreateSurfaceRec));
++  *priv = calloc(1,sizeof(SiSXvMCCreateSurfaceRec));
+   
+ 
+   if(!*priv) {
+@@ -435,7 +435,7 @@
+   }
+ 
+   
+-  xfree(*priv);
++  free(*priv);
+   return BadAlloc;
+ 
+ }
+@@ -454,7 +454,7 @@
+ 				  __FUNCTION__, __FILE__);
+ #endif
+ 
+-   *priv = (long *)xcalloc(1,sizeof(long));
++   *priv = (long *)calloc(1,sizeof(long));
+ 
+    if(!*priv) {
+       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+diff -u xf86-video-sismedia-0.9.1/src/sis_memcpy.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_memcpy.c
+--- xf86-video-sismedia-0.9.1/src/sis_memcpy.c	2011-03-06 11:27:56.388770300 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_memcpy.c	2011-03-06 11:34:50.694322870 +0700
+@@ -637,13 +637,13 @@
+     (*buf1) = (UChar *)pSiS->FbBase + offset;
+     (*buf1) = (UChar *)(((ULong)(*buf1) + 31) & ~31);
+ 
+-    if(!((*buf2) = (UChar *)xalloc(BUFFERSIZE + 15))) {
++    if(!((*buf2) = (UChar *)malloc(BUFFERSIZE + 15))) {
+        SISFreeFBMemory(pScrn, &handle);
+        return NULL;
+     }
+ 
+-    if(!((*buf3) = (UChar *)xalloc(BUFFERSIZE + 15))) {
+-       xfree((*buf2));
++    if(!((*buf3) = (UChar *)malloc(BUFFERSIZE + 15))) {
++       free((*buf2));
+        SISFreeFBMemory(pScrn, &handle);
+        return NULL;
+     }
+@@ -1101,8 +1101,8 @@
+ 
+     /* Free buffers */
+     SISFreeFBMemory(pScrn, &fbhandle);
+-    xfree(buf2);
+-    xfree(buf3);
++    free(buf2);
++    free(buf3);
+ 
+     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+ 	       "Using %s method for aligned data transfers %s video RAM\n",
+diff -u xf86-video-sismedia-0.9.1/src/sis_mergedfb.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_mergedfb.c
+--- xf86-video-sismedia-0.9.1/src/sis_mergedfb.c	2011-03-06 11:27:56.388770300 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_mergedfb.c	2011-03-06 22:18:01.785310903 +0700
+@@ -170,13 +170,13 @@
+     char namebuffer[32], namebuf1[64], namebuf2[64];
+     char printbuffer[256];
+ 
+-    if(!((mode = xalloc(sizeof(DisplayModeRec)))))
++    if(!((mode = malloc(sizeof(DisplayModeRec)))))
+        return dest;
+ 
+     memcpy(mode, i, sizeof(DisplayModeRec));
+ 
+-    if(!((mode->Private = xalloc(sizeof(SiSMergedDisplayModeRec))))) {
+-       xfree(mode);
++    if(!((mode->Private = malloc(sizeof(SiSMergedDisplayModeRec))))) {
++       free(mode);
+        return dest;
+     }
+ 
+@@ -265,8 +265,8 @@
+ 		"Skipped \"%s\" (%dx%d), not enough video RAM or beyond hardware specs\n",
+ 		mode->name, mode->HDisplay, mode->VDisplay);
+        }
+-       xfree(mode->Private);
+-       xfree(mode);
++       free(mode->Private);
++       free(mode);
+ 
+        return dest;
+     }
+@@ -306,7 +306,7 @@
+ 
+     /* Generate a mode name */
+     sprintf(namebuffer, "%dx%d", mode->HDisplay, mode->VDisplay);
+-    if((mode->name = xalloc(strlen(namebuffer) + 1))) {
++    if((mode->name = malloc(strlen(namebuffer) + 1))) {
+        strcpy(mode->name, namebuffer);
+     }
+ 
+@@ -849,7 +849,7 @@
+ 
+     if(pSiS->MergedFB) {
+ 
+-       pSiS->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
++       pSiS->CRT2pScrn->monitor = malloc(sizeof(MonRec));
+ 
+        if(pSiS->CRT2pScrn->monitor) {
+ 
+@@ -889,7 +889,7 @@
+        } else {
+ 
+ 	  SISErrorLog(pScrn, "Failed to allocate memory for CRT2 monitor, MergedFB mode disabled.\n");
+-	  if(pSiS->CRT2pScrn) xfree(pSiS->CRT2pScrn);
++	  if(pSiS->CRT2pScrn) free(pSiS->CRT2pScrn);
+ 	  pSiS->CRT2pScrn = NULL;
+ 	  pSiS->MergedFB = FALSE;
+ 
+@@ -911,9 +911,9 @@
+ 		xf86DeleteMode(&pSiS->CRT2pScrn->monitor->Modes, pSiS->CRT2pScrn->monitor->Modes);
+ 	  }
+ 	  pSiS->CRT2pScrn->monitor->DDC = NULL;
+-	  xfree(pSiS->CRT2pScrn->monitor);
++	  free(pSiS->CRT2pScrn->monitor);
+        }
+-       xfree(pSiS->CRT2pScrn);
++       free(pSiS->CRT2pScrn);
+        pSiS->CRT2pScrn = NULL;
+     }
+ }
+@@ -1917,7 +1917,7 @@
+     ClientPtr				client;
+     xXineramaLayoutChangeNotifyEvent	se;
+ 
+-    pHead = (SiSXineramaEventPtr *)LookupIDByType(pWin->drawable.id, EventType);
++    dixLookupResourceByType((pointer) &pHead, pWin->drawable.id, EventType, NullClient, DixUnknownAccess);
+     if(!pHead) {
+        return WT_WALKCHILDREN;
+     }
+@@ -2628,6 +2628,7 @@
+     WindowPtr pWin;
+     SiSXineramaEventPtr pXineramaEvent, pNewXineramaEvent, *pHead;
+     XID clientResource;
++    int lookup_ret;
+ 
+     REQUEST_SIZE_MATCH(xXineramaSelectInputReq);
+     /*IvansLee define NEW_XORG_VERSION.*/
+@@ -2640,9 +2641,10 @@
+     if(!pWin)
+        return BadWindow;
+     #if NEW_XORG_VERSION == 1 /*New Xorg Version >= 1.4 */
+-     pHead = (SiSXineramaEventPtr *)SecurityLookupIDByType(client,
+-						 pWin->drawable.id, EventType,
+-						 DixWriteAccess);
++	 lookup_ret = dixLookupResourceByType((pointer) &pHead, 
++						 pWin->drawable.id, EventType, 
++						 client, DixWriteAccess);
++	 pHead = (lookup_ret == Success ? pHead : NULL);
+     #else
+       pHead = (SiSXineramaEventPtr *)SecurityLookupIDByType(client,
+                                                  pWin->drawable.id, EventType,
+@@ -2661,7 +2663,7 @@
+        }
+ 
+        /* Build a new entry */
+-       if(!(pNewXineramaEvent = (SiSXineramaEventPtr)xalloc(sizeof(SiSXineramaEventRec)))) {
++       if(!(pNewXineramaEvent = (SiSXineramaEventPtr)malloc(sizeof(SiSXineramaEventRec)))) {
+ 	  return BadAlloc;
+        }
+        pNewXineramaEvent->next = 0;
+@@ -2686,7 +2688,7 @@
+ 	* done through the resource database.
+ 	*/
+        if(!pHead) {
+-	  pHead = (SiSXineramaEventPtr *)xalloc(sizeof(SiSXineramaEventPtr));
++	  pHead = (SiSXineramaEventPtr *)malloc(sizeof(SiSXineramaEventPtr));
+ 	  if(!pHead || !AddResource(pWin->drawable.id, EventType, (pointer)pHead)) {
+ 	     FreeResource(clientResource, RT_NONE);
+ 	     return BadAlloc;
+@@ -2715,7 +2717,7 @@
+ 	     } else {
+ 		*pHead = pXineramaEvent->next;
+ 	     }
+-	     xfree(pXineramaEvent);
++	     free(pXineramaEvent);
+ 	     SiSXineramaClientsListening--;
+ 	  }
+        }
+@@ -2854,7 +2856,7 @@
+ {
+     /* Called by CloseDownExtensions() */
+     if(SiSXineramadataPtr) {
+-       Xfree(SiSXineramadataPtr);
++       free(SiSXineramadataPtr);
+        SiSXineramadataPtr = NULL;
+     }
+ }
+@@ -2866,7 +2868,7 @@
+     SiSXineramaEventPtr *pHead, pCur, pPrev;
+     WindowPtr pWin = pXineramaEvent->window;
+ 
+-    pHead = (SiSXineramaEventPtr *)LookupIDByType(pWin->drawable.id, EventType);
++    dixLookupResourceByType((pointer) &pHead, pWin->drawable.id, EventType, NullClient, DixUnknownAccess);
+     if(pHead) {
+        pPrev = NULL;
+        for(pCur = *pHead; pCur && pCur != pXineramaEvent; pCur = pCur->next) {
+@@ -2877,7 +2879,7 @@
+ 	  else      *pHead = pXineramaEvent->next;
+        }
+     }
+-    xfree((pointer)pXineramaEvent);
++    free((pointer)pXineramaEvent);
+     return 1;
+ }
+ 
+@@ -2890,9 +2892,9 @@
+     for(pCur = *pHead; pCur; pCur = pNext) {
+        pNext = pCur->next;
+        FreeResource(pCur->clientResource, ClientType);
+-       xfree((pointer)pCur);
++       free((pointer)pCur);
+     }
+-    xfree((pointer)pHead);
++    free((pointer)pHead);
+     return 1;
+ }
+ 
+@@ -2965,7 +2967,7 @@
+ 	  if(!pSiS->XineramaExtEntry) break;
+ 
+ 	  if(!(SiSXineramadataPtr = (SiSXineramaData *)
+-	        xcalloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
++	        calloc(SiSXineramaNumScreens, sizeof(SiSXineramaData)))) break;
+ 
+ 	  SiSXineramaEventbase = pSiS->XineramaExtEntry->eventBase;
+ 	  EventSwapVector[SiSXineramaEventbase + XineramaLayoutChangeNotify] =
+diff -u xf86-video-sismedia-0.9.1/src/sis_opt.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_opt.c
+--- xf86-video-sismedia-0.9.1/src/sis_opt.c	2011-03-06 11:27:56.388770300 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_opt.c	2011-03-06 11:34:50.818340404 +0700
+@@ -459,7 +459,7 @@
+     xf86CollectOptions(pScrn, NULL);
+ 
+     /* Process the options */
+-    if(!(pSiS->Options = xalloc(sizeof(SISOptions)))) return;
++    if(!(pSiS->Options = malloc(sizeof(SISOptions)))) return;
+ 
+     memcpy(pSiS->Options, SISOptions, sizeof(SISOptions));
+ 
+@@ -920,7 +920,7 @@
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2POS))) {
+ 	     int result;
+ 	     Bool valid = FALSE;
+-	     char *tempstr = xalloc(strlen(strptr) + 1);
++	     char *tempstr = malloc(strlen(strptr) + 1);
+ 	     result = sscanf(strptr, "%s %d", tempstr, &ival);
+ 	     if(result >= 1) {
+ 		if(!xf86NameCmp(tempstr,"LeftOf")) {
+@@ -978,18 +978,18 @@
+ 		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 		    "Except for \"Clone\", the parameter may be followed by an integer.\n");
+ 	     }
+-	     xfree(tempstr);
++	     free(tempstr);
+ 	  }
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_METAMODES))) {
+-	     pSiS->MetaModes = xalloc(strlen(strptr) + 1);
++	     pSiS->MetaModes = malloc(strlen(strptr) + 1);
+ 	     if(pSiS->MetaModes) memcpy(pSiS->MetaModes, strptr, strlen(strptr) + 1);
+ 	  }
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2HSYNC))) {
+-	     pSiS->CRT2HSync = xalloc(strlen(strptr) + 1);
++	     pSiS->CRT2HSync = malloc(strlen(strptr) + 1);
+ 	     if(pSiS->CRT2HSync) memcpy(pSiS->CRT2HSync, strptr, strlen(strptr) + 1);
+ 	  }
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_CRT2VREFRESH))) {
+-	     pSiS->CRT2VRefresh = xalloc(strlen(strptr) + 1);
++	     pSiS->CRT2VRefresh = malloc(strlen(strptr) + 1);
+ 	     if(pSiS->CRT2VRefresh) memcpy(pSiS->CRT2VRefresh, strptr, strlen(strptr) + 1);
+ 	  }
+ 	  if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_MERGEDDPI))) {
+@@ -1009,8 +1009,8 @@
+ 	     }
+ 	     if(pSiS->UseSiSXinerama) {
+ 	        if((strptr = (char *)xf86GetOptValString(pSiS->Options, OPTION_SCR0))) {
+-	           char *tempstr1 = xalloc(strlen(strptr) + 1);
+-	           char *tempstr2 = xalloc(strlen(strptr) + 1);
++	           char *tempstr1 = malloc(strlen(strptr) + 1);
++	           char *tempstr2 = malloc(strlen(strptr) + 1);
+ 	           char *tempstr;
+ 		   int i, result;
+ 		   pSiS->MFBScr0LR = pSiS->MFBScr0TB = -1;
+@@ -1037,8 +1037,8 @@
+ 			"Bad or incomplete argument(s) for Option \"%s\"\n",
+ 			pSiS->Options[SiS_FIFT(pSiS->Options, OPTION_SCR0)].name);
+ 		   }
+-		   xfree(tempstr1);
+-		   xfree(tempstr2);
++		   free(tempstr1);
++		   free(tempstr2);
+ 	        } else if(xf86GetOptValBool(pSiS->Options, OPTION_CRT2ISSCRN0, &val)) {
+ 		   xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ 			"Option \"%s\" is deprecated, use \"%s\"\n",
+diff -u xf86-video-sismedia-0.9.1/src/sis_utility.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_utility.c
+--- xf86-video-sismedia-0.9.1/src/sis_utility.c	2011-03-06 11:27:56.392770842 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_utility.c	2011-03-06 12:24:06.740312353 +0700
+@@ -2185,7 +2185,7 @@
+      * in SiSCtrlExtUnregister())
+      */
+     if(extEntry->extPrivate) {
+-       xfree(extEntry->extPrivate);
++       free(extEntry->extPrivate);
+        extEntry->extPrivate = NULL;
+     }
+ }
+@@ -2206,7 +2206,7 @@
+ 
+    if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) {
+ 
+-      if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1)))
++      if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1)))
+          return;
+ 
+       if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0,
+@@ -2216,7 +2216,7 @@
+ 				StandardMinorOpcode))) {
+          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 	 		"Failed to add SISCTRL extension\n");
+-	 xfree(myctrl);
++	 free(myctrl);
+ 	 return;
+       }
+ 
+diff -u xf86-video-sismedia-0.9.1/src/sis_vga.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_vga.c
+--- xf86-video-sismedia-0.9.1/src/sis_vga.c	2011-03-06 11:27:56.396771384 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_vga.c	2011-03-06 11:34:51.038371506 +0700
+@@ -1450,7 +1450,7 @@
+     attr10 = SiS_ReadAttr(pSiS, 0x10);
+     if(attr10 & 0x01) return;
+ 
+-    if(!(pSiS->fonts = xalloc(SIS_FONTS_SIZE * 2))) {
++    if(!(pSiS->fonts = malloc(SIS_FONTS_SIZE * 2))) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ 		"Could not save console fonts, mem allocation failed\n");
+        return;
+diff -u xf86-video-sismedia-0.9.1/src/sis_video.c xf86-video-sismedia-0.9.1-dep-clean/src/sis_video.c
+--- xf86-video-sismedia-0.9.1/src/sis_video.c	2011-03-06 11:27:56.396771384 +0700
++++ xf86-video-sismedia-0.9.1-dep-clean/src/sis_video.c	2011-03-06 12:24:06.824324624 +0700
+@@ -349,7 +349,7 @@
+        if(newAdaptor)     size++;
+        if(newBlitAdaptor) size++;
+ 
+-       newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*));
++       newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*));
+        if(newAdaptors) {
+           if(num_adaptors) {
+              memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
+@@ -379,7 +379,7 @@
+     }
+ 
+     if(newAdaptors) {
+-       xfree(newAdaptors);
++       free(newAdaptors);
+     }
+ 
+ #ifdef ENABLEXvMC
+@@ -1049,7 +1049,7 @@
+     }
+ #endif
+ 
+-    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+                             sizeof(SISPortPrivRec) +
+                             sizeof(DevUnion)))) {
+        return NULL;
+@@ -4543,7 +4543,7 @@
+    }
+ #endif
+ 
+-   if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++   if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+     			   (sizeof(DevUnion) * NUM_BLIT_PORTS) +
+                            sizeof(SISBPortPrivRec)))) {
+       return NULL;
+Common subdirectories: xf86-video-sismedia-0.9.1/src/xvmc and xf86-video-sismedia-0.9.1-dep-clean/src/xvmc
diff --git a/extra/xf86-video-sisimedia/sisimedia-no-xaa.patch b/extra/xf86-video-sisimedia/sisimedia-no-xaa.patch
new file mode 100644
index 000000000..d97ca5a2b
--- /dev/null
+++ b/extra/xf86-video-sisimedia/sisimedia-no-xaa.patch
@@ -0,0 +1,11 @@
+--- xf86-video-sis-0.9.1/src/Makefile.am.0202~	2007-05-30 04:12:02.000000000 +0200
++++ xf86-video-sis-0.9.1/src/Makefile.am	2012-10-19 23:24:31.954954666 +0200
+@@ -23,7 +23,7 @@
+ # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+ # _ladir passes a dummy rpath to libtool so the thing will actually link
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
++AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DSIS_USE_EXA
+ sis_drv_la_LTLIBRARIES = sis_drv.la
+ sis_drv_la_LDFLAGS = -module -avoid-version
+ sis_drv_ladir = @moduledir@/drivers
diff --git a/extra/xf86-video-sisimedia/sisimedia-xorg-1.13.patch b/extra/xf86-video-sisimedia/sisimedia-xorg-1.13.patch
new file mode 100644
index 000000000..25cc94fb1
--- /dev/null
+++ b/extra/xf86-video-sisimedia/sisimedia-xorg-1.13.patch
@@ -0,0 +1,654 @@
+diff -ur xf86-video-sis-0.9.1/src/sis_config.h xf86-video-sis-0.9.1-bero/src/sis_config.h
+--- xf86-video-sis-0.9.1/src/sis_config.h	2007-05-30 04:12:02.000000000 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_config.h	2012-10-19 23:27:16.178901583 +0200
+@@ -67,7 +67,7 @@
+ #endif
+ 
+ #if 1
+-#define SIS_USE_XAA		/* Include support for XAA */
++#undef SIS_USE_XAA		/* Don't include support for XAA, current xorg servers don't support it */
+ #endif
+ 
+ #ifdef SISVRAMQ
+diff -ur xf86-video-sis-0.9.1/src/sis_dga.c xf86-video-sis-0.9.1-bero/src/sis_dga.c
+--- xf86-video-sis-0.9.1/src/sis_dga.c	2012-10-20 00:10:10.325720321 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_dga.c	2012-10-19 23:34:00.514846689 +0200
+@@ -421,8 +421,8 @@
+ 	pScrn->currentMode = pSiS->CurrentLayout.mode;
+ 	pSiS->DGAactive = FALSE;
+ 
+-	(*pScrn->SwitchMode)(index, pScrn->currentMode, 0);
+-	(*pScrn->AdjustFrame)(index, pScrn->frameX0, pScrn->frameY0, 0);
++	(*pScrn->SwitchMode)(pScrn, pScrn->currentMode);
++	(*pScrn->AdjustFrame)(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     } else {	/* set new mode */
+ 
+@@ -444,10 +444,10 @@
+ 	pSiS->CurrentLayout.displayWidth  = pMode->bytesPerScanline / (pMode->bitsPerPixel >> 3);
+ 	pSiS->CurrentLayout.displayHeight = pMode->imageHeight;
+ 
+-	(*pScrn->SwitchMode)(index, pMode->mode, 0);
++	(*pScrn->SwitchMode)(pScrn, pMode->mode);
+ 	/* Adjust viewport to 0/0 after mode switch */
+ 	/* This fixes the vmware-in-dualhead problems */
+-	(*pScrn->AdjustFrame)(index, 0, 0, 0);
++	(*pScrn->AdjustFrame)(pScrn, 0, 0);
+ 	pSiS->CurrentLayout.DGAViewportX = pSiS->CurrentLayout.DGAViewportY = 0;
+     }
+ 
+@@ -471,7 +471,7 @@
+ ){
+     SISPtr pSiS = SISPTR(pScrn);
+ 
+-    (*pScrn->AdjustFrame)(pScrn->pScreen->myNum, x, y, flags);
++    (*pScrn->AdjustFrame)(pScrn, x, y);
+     pSiS->DGAViewportStatus = 0;  /* There are never pending Adjusts */
+     pSiS->CurrentLayout.DGAViewportX = x;
+     pSiS->CurrentLayout.DGAViewportY = y;
+diff -ur xf86-video-sis-0.9.1/src/sis_driver.c xf86-video-sis-0.9.1-bero/src/sis_driver.c
+--- xf86-video-sis-0.9.1/src/sis_driver.c	2012-10-20 00:10:10.379719645 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_driver.c	2012-10-20 00:06:35.196409807 +0200
+@@ -8546,9 +8546,9 @@
+ 	        /* No need to go through pScrn->AdjustFrame; the coords
+ 	         * didn't change
+ 	         */
+-		SISAdjustFrame(pSiSEnt->pScrn_2->scrnIndex,
++		SISAdjustFrame(pSiSEnt->pScrn_2,
+ 			       pSiSEnt->pScrn_2->frameX0,
+-			       pSiSEnt->pScrn_2->frameY0, 0);
++			       pSiSEnt->pScrn_2->frameY0);
+ 	     }
+ 	  } else {
+ 	     /* Head 2 (slave) is always CRT1 */
+@@ -8565,9 +8565,9 @@
+ 	        /* No need to go through pScrn->AdjustFrame; the coords
+ 	         * didn't change
+ 	         */
+-		SISAdjustFrame(pSiSEnt->pScrn_1->scrnIndex,
++		SISAdjustFrame(pSiSEnt->pScrn_1,
+ 			       pSiSEnt->pScrn_1->frameX0,
+-			       pSiSEnt->pScrn_1->frameY0, 0);
++			       pSiSEnt->pScrn_1->frameY0);
+ 	     }
+ 	  }
+ 
+@@ -8613,7 +8613,7 @@
+ 
+ 		SiS_SiSLVDSBackLight(pSiS, TRUE);
+ 
+-		(*pScrn->AdjustFrame)(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++		(*pScrn->AdjustFrame)(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+ 	     } else {
+ #endif
+@@ -8723,14 +8723,13 @@
+ /*******************************************************/
+ 
+ static void
+-SISBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
++SISBlockHandler(ScreenPtr pScreen, pointer pTimeout, pointer pReadmask)
+ {
+-    ScreenPtr pScreen = screenInfo.screens[i];
+-    ScrnInfoPtr pScrn = xf86Screens[i];
++    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+     SISPtr pSiS = SISPTR(pScrn);
+ 
+     pScreen->BlockHandler = pSiS->BlockHandler;
+-    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
++    (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
+     pScreen->BlockHandler = SISBlockHandler;
+ 
+ #ifdef SISDUALHEAD
+@@ -8747,7 +8746,7 @@
+ #endif
+ 
+     if(pSiS->AdjustFramePending && pSiS->AdjustFrame) {
+-       (*pSiS->AdjustFrame)(i, pSiS->AdjustFrameX, pSiS->AdjustFrameY, pSiS->AdjustFrameFlags);
++       (*pSiS->AdjustFrame)(pScrn, pSiS->AdjustFrameX, pSiS->AdjustFrameY);
+        /* Reset it since Xv insists on installing its own every time. */
+        pScrn->AdjustFrame = SISNewAdjustFrame;
+        pSiS->AdjustFramePending = FALSE;
+@@ -9230,7 +9229,7 @@
+  * depth, bitsPerPixel)
+  */
+ static Bool
+-SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
++SISScreenInit(ScreenPtr pScreen, int argc, char **argv)
+ {
+     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+     SISPtr pSiS = SISPTR(pScrn);
+@@ -9409,7 +9408,7 @@
+ 	  pScrn->frameY1 = pScrn->frameY0 + pScrn->currentMode->VDisplay - 1;
+        }
+     }
+-    SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++    SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     /* Reset visual list. */
+     miClearVisualTypes();
+@@ -9841,7 +9840,7 @@
+ 	     pSiS->SiS_SD_Flags |= SiS_SD_PSEUDOXINERAMA;
+ 	     if(pSiS->HaveNonRect) {
+ 		/* Reset the viewport (now eventually non-recangular) */
+-		SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++		SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 	     }
+ 	  }
+        } else {
+@@ -10177,9 +10176,8 @@
+ }
+ 
+ static ModeStatus
+-SISValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
++SISValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+ 
+     if(pSiS->UseVESA) {
+@@ -10335,9 +10333,8 @@
+ #endif
+ 
+ Bool
+-SISSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
++SISSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+    /* This is part 2 of the ugly hack in sis_shadow.c:
+     * There we set pScrn->currentMode to something
+@@ -10353,7 +10350,7 @@
+     */
+ 
+     if(!pSiS->skipswitchcheck) {
+-       if(SISValidMode(scrnIndex, mode, TRUE, flags) != MODE_OK) {
++       if(SISValidMode(pScrn, mode, TRUE, 0) != MODE_OK) {
+           return FALSE;
+        }
+     }
+@@ -10368,7 +10365,7 @@
+ 
+     (*pSiS->SyncAccel)(pScrn);
+ 
+-    if(!(SISModeInit(xf86Screens[scrnIndex], mode)))
++    if(!(SISModeInit(pScrn, mode)))
+        return FALSE;
+ 
+     /* Since RandR (indirectly) uses SwitchMode(), we need to
+@@ -10485,21 +10482,18 @@
+ }
+ 
+ static void
+-SISNewAdjustFrame(int scrnIndex, int x, int y, int flags)
++SISNewAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr      pSiS = SISPTR(pScrn);
+ 
+     pSiS->AdjustFramePending = TRUE;
+     pSiS->AdjustFrameX = x;
+     pSiS->AdjustFrameY = y;
+-    pSiS->AdjustFrameFlags = flags;
+ }
+ 
+ void
+-SISAdjustFrame(int scrnIndex, int x, int y, int flags)
++SISAdjustFrame(ScrnInfoPtr pScrn, int x, int y)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr      pSiS = SISPTR(pScrn);
+     UChar       temp, cr11backup;
+     ULong       base;
+@@ -10511,7 +10505,7 @@
+ 
+ #ifdef SISMERGED
+     if(pSiS->MergedFB) {
+-	SISMFBAdjustFrame(scrnIndex, x, y, flags);
++	SISMFBAdjustFrame(pScrn, x, y);
+ 	return;
+     }
+ #endif
+@@ -10578,9 +10572,8 @@
+ 
+ 
+ static Bool
+-SISEnterVT(int scrnIndex, int flags)
++SISEnterVT(ScrnInfoPtr pScrn)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+     SiS_SiSFB_Lock(pScrn, TRUE);
+ 
+@@ -10596,7 +10589,7 @@
+     /* No need to go through pScrn->AdjustFrame; Xv's
+      * EnterVT handles the overlay(s) anyway.
+      */
+-    SISAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++    SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+ 
+ /* Mark for 3D full-screen bug */
+@@ -10625,15 +10618,14 @@
+ 
+ 
+ static void
+-SISLeaveVT(int scrnIndex, int flags)
++SISLeaveVT(ScrnInfoPtr pScrn)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+ #ifdef SISDRI
+     ScreenPtr pScreen;
+ 
+     if(pSiS->directRenderingEnabled) {
+-       pScreen = screenInfo.screens[scrnIndex];
++       pScreen = xf86ScreenToScrn(pScrn);
+ /* Mark for 3D full-screen bug */
+ /*   DRILock(pScreen, 0); */
+     }
+@@ -10702,9 +10694,9 @@
+ 
+ 
+ static Bool
+-SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
++SISCloseScreen(ScreenPtr pScreen)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
++    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+     SISPtr pSiS = SISPTR(pScrn);
+ #ifdef SISDUALHEAD
+     SISEntPtr pSiSEnt = pSiS->entityPrivate;
+@@ -10872,7 +10864,7 @@
+ 
+     pScreen->CloseScreen = pSiS->CloseScreen;
+ 
+-    return(*pScreen->CloseScreen)(scrnIndex, pScreen);
++    return(*pScreen->CloseScreen)(pScreen);
+ }
+ 
+ 
+@@ -10883,10 +10875,9 @@
+ /* Free up any per-generation data structures */
+ 
+ static void
+-SISFreeScreen(int scrnIndex, int flags)
++SISFreeScreen(ScrnInfoPtr pScrn)
+ {
+ #ifdef SIS_NEED_MAP_IOP
+-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     SISPtr pSiS = SISPTR(pScrn);
+ 
+     if(pSiS) {
+@@ -10900,7 +10891,7 @@
+     }
+ #endif
+ 
+-    SISFreeRec(xf86Screens[scrnIndex]);
++    SISFreeRec(pScrn);
+ }
+ 
+ 
+@@ -11134,7 +11125,7 @@
+    pSiS->VBFlags3 = pSiS->VBFlags_backup3 = newvbflags3;  
+  
+    pSiS->skipswitchcheck = TRUE;
+-   if(!((*pScrn->SwitchMode)(pScrn->scrnIndex,pScrn->currentMode,0)))
++   if(!((*pScrn->SwitchMode)(pScrn,pScrn->currentMode)))
+    {
+           pSiS->skipswitchcheck = FALSE;
+ 	  return FALSE;
+@@ -11143,7 +11134,7 @@
+ 
+    /*xf86DrvMsg(0,X_INFO,"frameX0=%d, frameY0=%d.\n",pScrn->frameX0,pScrn->frameY0);*/
+ 
+-   SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0,0);
++   SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+    return TRUE;
+ 
+@@ -11204,14 +11195,14 @@
+  (*pSiS->SyncAccel)(pScrn); 
+   
+  pSiS->skipswitchcheck = TRUE;
+- if(!((*pScrn->SwitchMode)(pScrn->scrnIndex,pScrn->currentMode,0)))
++ if(!((*pScrn->SwitchMode)(pScrn,pScrn->currentMode)))
+  {
+        pSiS->skipswitchcheck = FALSE;
+        return FALSE;
+  }
+  pSiS->skipswitchcheck = FALSE;
+ 
+- SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0,0);
++ SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+  
+  return TRUE;
+ }
+@@ -11259,7 +11250,7 @@
+    
+                xf86ZoomViewport(pScreen,1);
+ 
+-	       SISAdjustFrame(pScrn->scrnIndex,0,0,0);
++	       SISAdjustFrame(pScrn,0,0);
+ 
+    
+    return TRUE;
+@@ -11268,9 +11259,8 @@
+ 
+ /**************************************************************************/
+ static Bool
+-SISPMEvent(int scrnIndex, pmEvent event, Bool undo)
++SISPMEvent(ScrnInfoPtr pScrn, pmEvent event, Bool undo)
+ {
+-  ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+   SISPtr pSiS = SISPTR(pScrn);
+   unsigned char hotkeyflag = 0;/*check BIOS flag.*/
+   unsigned char checkflag = 0;/*just for test using.*/
+@@ -11287,13 +11277,13 @@
+          {        
+               xf86DrvMsg(0,X_INFO,"PM_EVENT:event=%d,undo=%d.\n",event,undo);		 
+ 		 if (!undo && !pSiS->suspended) {
+-	               pScrn->LeaveVT(scrnIndex, 0);
++	               pScrn->LeaveVT(pScrn);
+ 	               pSiS->suspended = TRUE;
+ 	               sleep(0);
+                    } 
+ 		     else if (undo && pSiS->suspended) {
+ 	            sleep(0);
+-	            pScrn->EnterVT(scrnIndex, 0);
++	            pScrn->EnterVT(pScrn);
+ 	            pSiS->suspended = FALSE;
+                   }
+ 	   }
+@@ -11305,7 +11295,7 @@
+       {
+ 	  	  if (pSiS->suspended) {
+ 	        sleep(0);
+-	        pScrn->EnterVT(scrnIndex, 0);
++	        pScrn->EnterVT(pScrn);
+ 	        pSiS->suspended = FALSE;
+ 	        SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
+                }
+diff -ur xf86-video-sis-0.9.1/src/sis_driver.h xf86-video-sis-0.9.1-bero/src/sis_driver.h
+--- xf86-video-sis-0.9.1/src/sis_driver.h	2012-10-20 00:10:10.296720683 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_driver.h	2012-10-20 00:04:47.586755113 +0200
+@@ -770,14 +770,14 @@
+ static void SISIdentify(int flags);
+ static Bool SISProbe(DriverPtr drv, int flags);
+ static Bool SISPreInit(ScrnInfoPtr pScrn, int flags);
+-static Bool SISScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv);
+-static Bool SISEnterVT(int scrnIndex, int flags);
+-static void SISLeaveVT(int scrnIndex, int flags);
+-static Bool SISCloseScreen(int scrnIndex, ScreenPtr pScreen);
++static Bool SISScreenInit(ScreenPtr pScreen, int argc, char **argv);
++static Bool SISEnterVT(ScrnInfoPtr pScrn);
++static void SISLeaveVT(ScrnInfoPtr pScrn);
++static Bool SISCloseScreen(ScreenPtr pScreen);
+ static Bool SISSaveScreen(ScreenPtr pScreen, int mode);
+-static Bool SISSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
+-static void SISNewAdjustFrame(int scrnIndex, int x, int y, int flags);
+-static Bool SISPMEvent(int scrnIndex, pmEvent event, Bool undo);/*APM-ACPI, adding by Ivans.*/
++static Bool SISSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
++static void SISNewAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
++static Bool SISPMEvent(ScrnInfoPtr pScrn, pmEvent event, Bool undo);/*APM-ACPI, adding by Ivans.*/
+ 
+ #if XSERVER_LIBPCIACCESS
+ static Bool SIS_pci_probe(DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data);
+@@ -791,8 +791,8 @@
+ #ifdef SISDUALHEAD
+ static Bool	SISSaveScreenDH(ScreenPtr pScreen, int mode);
+ #endif
+-static void     SISFreeScreen(int scrnIndex, int flags);
+-static ModeStatus SISValidMode(int scrnIndex, DisplayModePtr mode,
++static void     SISFreeScreen(ScrnInfoPtr pScrn);
++static ModeStatus SISValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode,
+ 				Bool verbose, int flags);
+ #ifdef SIS_HAVE_RR_FUNC
+ #ifdef SIS_HAVE_DRIVER_FUNC
+@@ -811,7 +811,7 @@
+ static Bool	SISMapIOPMem(ScrnInfoPtr pScrn);
+ static Bool	SISUnmapIOPMem(ScrnInfoPtr pScrn);
+ #endif
+-void		SISAdjustFrame(int scrnIndex, int x, int y, int flags);
++void		SISAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
+ UChar		SISSearchCRT1Rate(ScrnInfoPtr pScrn, DisplayModePtr mode);
+ UShort		SiS_CheckModeCRT1(ScrnInfoPtr pScrn, DisplayModePtr mode,
+ 				 unsigned int VBFlags, unsigned int VBFlags3, Bool hcm);
+@@ -858,7 +858,7 @@
+ extern Bool 	SiSVGASaveScreen(ScreenPtr pScreen, int mode);
+ 
+ /* shadow, randr, randr-rotation */
+-extern void 	SISPointerMoved(int index, int x, int y);
++extern void 	SISPointerMoved(ScrnInfoPtr pScrn, int x, int y);
+ extern void 	SISRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+ extern void 	SISRefreshAreaReflect(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+ extern void 	SISRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
+@@ -922,8 +922,8 @@
+ extern Bool		SiSMFBRebuildModelist(ScrnInfoPtr pScrn, ClockRangePtr clockRanges);
+ extern Bool		SiSMFBRevalidateModelist(ScrnInfoPtr pScrn, ClockRangePtr clockRanges);
+ extern void		SiSMFBSetDpi(ScrnInfoPtr pScrn1, ScrnInfoPtr pScrn2, SiSScrn2Rel srel);
+-extern void		SISMFBPointerMoved(int scrnIndex, int x, int y);
+-extern void		SISMFBAdjustFrame(int scrnIndex, int x, int y, int flags);
++extern void		SISMFBPointerMoved(ScrnInfoPtr pScrn, int x, int y);
++extern void		SISMFBAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
+ #ifdef SISXINERAMA
+ extern void		SiSXineramaExtensionInit(ScrnInfoPtr pScrn);
+ extern Bool 		SiSnoPanoramiXExtension;
+diff -ur xf86-video-sis-0.9.1/src/sis.h xf86-video-sis-0.9.1-bero/src/sis.h
+--- xf86-video-sis-0.9.1/src/sis.h	2012-10-20 00:10:10.361719870 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis.h	2012-10-19 23:56:46.635767827 +0200
+@@ -73,6 +73,7 @@
+ #include "xf86Cursor.h"
+ #include "xf86cmap.h"
+ #include "vbe.h"
++#include "xf86fbman.h"
+ 
+ /*I.L. modified*/
+ #include "sispcirename.h" 
+@@ -241,7 +242,7 @@
+ #define SIS_MAX_SUBPICTURES 2
+ 
+ #if !defined(SIS_USE_XAA) && !defined(SIS_USE_EXA)
+-#define SIS_USE_XAA
++#define SIS_USE_EXA
+ #endif
+ 
+ #ifdef SIS_USE_XAA
+@@ -1319,8 +1320,8 @@
+ #ifdef SIS_USE_XAA
+     void		(*RenderCallback)(ScrnInfoPtr);
+     Time		RenderTime;
+-    FBLinearPtr		AccelLinearScratch;
+ #endif
++    FBLinearPtr		AccelLinearScratch;
+ #ifdef SIS_USE_EXA
+     void		(*ExaRenderCallback)(ScrnInfoPtr);
+     Time		ExaRenderTime;
+@@ -1342,7 +1343,7 @@
+     int			SiSDPIVX, SiSDPIVY;
+     int			virtualX, virtualY;
+     int			Rotate, Reflect;
+-    void		(*PointerMoved)(int index, int x, int y);
++    void		(*PointerMoved)(ScrnInfoPtr pScrn, int x, int y);
+ 
+     /* ShadowFB support */
+     Bool		ShadowFB;
+@@ -1420,7 +1421,6 @@
+     Bool		AdjustFramePending;
+     int			AdjustFrameX;
+     int			AdjustFrameY;
+-    int			AdjustFrameFlags;
+ 
+     /* DGA */
+     DGAModePtr		DGAModes;
+diff -ur xf86-video-sis-0.9.1/src/sis_hwmc.c xf86-video-sis-0.9.1-bero/src/sis_hwmc.c
+--- xf86-video-sis-0.9.1/src/sis_hwmc.c	2012-10-20 00:10:10.348720033 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_hwmc.c	2012-10-19 23:38:25.482534137 +0200
+@@ -58,8 +58,10 @@
+ #include "xf86xvmc.h"
+ #include <X11/extensions/Xv.h>
+ #include <X11/extensions/XvMC.h>
++#ifdef SIS_USE_XAA
+ #include "xaa.h"
+ #include "xaalocal.h"
++#endif
+ #include "dixstruct.h"
+ #include "fourcc.h"
+ #include "sis_common.h"
+diff -ur xf86-video-sis-0.9.1/src/sis_mergedfb.c xf86-video-sis-0.9.1-bero/src/sis_mergedfb.c
+--- xf86-video-sis-0.9.1/src/sis_mergedfb.c	2012-10-20 00:10:10.351719996 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_mergedfb.c	2012-10-20 00:07:08.475993754 +0200
+@@ -1706,7 +1706,7 @@
+        /* Need to go the official way to avoid hw access and
+         * to update Xv's overlays
+         */
+-       (pScrn1->AdjustFrame)(scrnIndex, pScrn1->frameX0, pScrn1->frameY0, 0);
++       (pScrn1->AdjustFrame)(pScrn1, pScrn1->frameX0, pScrn1->frameY0);
+     }
+ }
+ 
+diff -ur xf86-video-sis-0.9.1/src/sis_shadow.c xf86-video-sis-0.9.1-bero/src/sis_shadow.c
+--- xf86-video-sis-0.9.1/src/sis_shadow.c	2007-05-30 04:12:02.000000000 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_shadow.c	2012-10-20 00:08:12.018199367 +0200
+@@ -81,11 +81,11 @@
+        }
+ 
+        if(framechanged && pScrn->AdjustFrame)
+-	  pScrn->AdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++	  pScrn->AdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     } else {
+ 
+-       (*pSiS->PointerMoved)(index, x, y);
++       (*pSiS->PointerMoved)(pScrn, x, y);
+ 
+     }
+ }
+diff -ur xf86-video-sis-0.9.1/src/sis_utility.c xf86-video-sis-0.9.1-bero/src/sis_utility.c
+--- xf86-video-sis-0.9.1/src/sis_utility.c	2012-10-20 00:10:10.352719983 +0200
++++ xf86-video-sis-0.9.1-bero/src/sis_utility.c	2012-10-20 00:09:45.884025883 +0200
+@@ -273,7 +273,7 @@
+ 				 unsigned int VBFlags, unsigned int VBFlags3, Bool hcm);
+ extern UShort	SiS_CheckModeCRT2(ScrnInfoPtr pScrn, DisplayModePtr mode,
+ 				 unsigned int VBFlags, unsigned int VBFlags3, Bool hcm);
+-extern void	SISAdjustFrame(int scrnIndex, int x, int y, int flags);
++extern void	SISAdjustFrame(ScrnInfoPtr pScrn, int x, int y);
+ extern float	SiSCalcVRate(DisplayModePtr mode);
+ extern void	SiS_UpdateGammaCRT2(ScrnInfoPtr pScrn);
+ #ifdef SISGAMMARAMP
+@@ -427,7 +427,7 @@
+     (*pSiS->SyncAccel)(pScrn);
+ 
+     pSiS->skipswitchcheck = TRUE;
+-    if(!((*pScrn->SwitchMode)(pScrn->scrnIndex, pScrn->currentMode, 0))) {
++    if(!((*pScrn->SwitchMode)(pScrn, pScrn->currentMode))) {
+        pSiS->skipswitchcheck = FALSE;
+        return FALSE;
+     }
+@@ -436,7 +436,7 @@
+     /* No need to go through pScrn->AdjustFrame; the coords
+      * didn't change
+      */
+-    SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++    SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     return TRUE;
+ }
+@@ -480,7 +480,7 @@
+        /* Sync the accelerators */
+        (*pSiS->SyncAccel)(pScrn);
+        pSiS->skipswitchcheck = TRUE;
+-       if(!((*pScrn->SwitchMode)(pScrn->scrnIndex, pScrn->currentMode, 0))) {
++       if(!((*pScrn->SwitchMode)(pScrn, pScrn->currentMode))) {
+           pSiS->skipswitchcheck = FALSE;
+           return FALSE;
+        }
+@@ -489,7 +489,7 @@
+        /* No need to go through pScrn->AdjustFrame; the coords
+ 	* didn't change
+ 	*/
+-       SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++       SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+     }
+ 
+     return TRUE;
+@@ -624,7 +624,7 @@
+     pSiS->VBFlags3 = pSiS->VBFlags_backup3 = newvbflags3;
+ 
+     pSiS->skipswitchcheck = TRUE;
+-    if(!(pScrn->SwitchMode(pScrn->scrnIndex, pScrn->currentMode, 0))) {
++    if(!(pScrn->SwitchMode(pScrn, pScrn->currentMode))) {
+        pSiS->skipswitchcheck = FALSE;
+        return FALSE;
+     }
+@@ -633,7 +633,7 @@
+     /* No need to go through pScrn->AdjustFrame; the coords
+      * didn't change
+      */
+-    SISAdjustFrame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
++    SISAdjustFrame(pScrn, pScrn->frameX0, pScrn->frameY0);
+ 
+     return TRUE;
+ }
+--- xf86-video-sis-0.9.1/src/sis6326_video.c.bero	2012-10-20 00:13:59.712852587 +0200
++++ xf86-video-sis-0.9.1/src/sis6326_video.c	2012-10-20 00:15:51.035460862 +0200
+@@ -72,7 +72,7 @@ static void 	SIS6326QueryBestSize(ScrnIn
+ 			short, unsigned int *,unsigned int *, pointer);
+ static int 	SIS6326PutImage( ScrnInfoPtr,
+ 			short, short, short, short, short, short, short, short,
+-			int, unsigned char*, short, short, Bool, RegionPtr, pointer);
++			int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
+ static int 	SIS6326QueryImageAttributes(ScrnInfoPtr,
+ 			int, unsigned short *, unsigned short *, int *, int *);
+ static void 	SIS6326VideoTimerCallback(ScrnInfoPtr pScrn, Time now);
+@@ -1231,7 +1231,7 @@ SIS6326PutImage(
+   int id, unsigned char* buf,
+   short width, short height,
+   Bool sync,
+-  RegionPtr clipBoxes, pointer data
++  RegionPtr clipBoxes, pointer data, DrawablePtr pDraw
+ ){
+    SISPtr pSiS = SISPTR(pScrn);
+    SISPortPrivPtr pPriv = (SISPortPrivPtr)data;
+--- xf86-video-sis-0.9.1/src/sis_video.c.bero	2012-10-20 00:16:13.212183614 +0200
++++ xf86-video-sis-0.9.1/src/sis_video.c	2012-10-20 00:20:38.099872064 +0200
+@@ -3948,7 +3948,7 @@ SISPutImage(
+   int id, UChar *buf,
+   short width, short height,
+   Bool sync,
+-  RegionPtr clipBoxes, pointer data
++  RegionPtr clipBoxes, pointer data, DrawablePtr pDraw
+ ){
+    SISPtr pSiS = SISPTR(pScrn);
+    SISPortPrivPtr pPriv = (SISPortPrivPtr)data;
+@@ -4089,8 +4089,11 @@ SISPutImage(
+ static int
+ SISReputImage(
+   ScrnInfoPtr pScrn,
++  short src_x, short src_y,
+   short drw_x, short drw_y,
+-  RegionPtr clipBoxes, pointer data
++  short src_w, short src_h,
++  short drw_w, short drw_h,
++  RegionPtr clipBoxes, pointer data, DrawablePtr pDraw
+ ){
+    SISPtr pSiS = SISPTR(pScrn);
+    SISPortPrivPtr pPriv = (SISPortPrivPtr)data;
+--- xf86-video-sis-0.9.1/src/sis_video.h.bero	2012-10-20 00:16:58.076622733 +0200
++++ xf86-video-sis-0.9.1/src/sis_video.h	2012-10-20 00:20:18.443117807 +0200
+@@ -107,10 +107,13 @@ static void 	SISQueryBestSize(ScrnInfoPt
+ 			short, unsigned int *,unsigned int *, pointer);
+ static int 	SISPutImage(ScrnInfoPtr,
+ 			short, short, short, short, short, short, short, short,
+-			int, UChar *, short, short, Bool, RegionPtr, pointer);
++			int, UChar *, short, short, Bool, RegionPtr, pointer, DrawablePtr);
+ static int	SISReputImage(ScrnInfoPtr pScrn,
++			short src_x, short src_y,
+ 			short drw_x, short drw_y,
+-			RegionPtr clipBoxes, pointer data);
++			short src_w, short src_h,
++			short drw_w, short drw_h,
++			RegionPtr clipBoxes, pointer data, DrawablePtr pDraw);
+ static int 	SISQueryImageAttributes(ScrnInfoPtr,
+ 			int, UShort *, UShort *, int *, int *);
+ static void 	SISVideoTimerCallback(ScrnInfoPtr pScrn, Time now);
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 3270a3d4d..eb3a148e2 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=ghostscript
 pkgname=gnu-ghostscript
 _pkgver=9.05
 pkgver=9.05.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -13,7 +13,6 @@ makedepends=('gtk2' 'gnutls')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
 conflicts=${_pkgname}
-replaces=${_pkgname}
 provides="${_pkgname}=9.06"
 url="https://www.gnu.org/software/${_pkgname}/"
 source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index d63a33ec9..20e9fdb43 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -1,19 +1,24 @@
-# $Id: PKGBUILD 141999 2011-11-03 21:16:38Z ronald $
+# $Id: PKGBUILD 142375 2011-11-08 22:04:23Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 
-pkgname=grub
+pkgname=grub-legacy
+_srcname=grub
 pkgver=0.97
-pkgrel=21.4
+pkgrel=23
 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/grub/"
-groups=('base')
 depends=('ncurses' 'diffutils' 'sed')
+conflicts=('grub' 'grub-common' 'grub-bios' 'grub-efi-i386' 'grub-efi-x86_64')
+replaces=('grub')
+provides=("grub=${pkgver}")
+[ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib')
 optdepends=('xfsprogs: freezing of xfs /boot in install-grub script')
-source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
+source=(ftp://alpha.gnu.org/gnu/grub/${_srcname}-${pkgver}.tar.gz
         menu.lst
         install-grub
         040_all_grub-0.96-nxstack.patch
@@ -23,12 +28,13 @@ source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
         more-raid.patch
         intelmac.patch
         grub-inode-size.patch
-	ext4.patch
-	grub-0.97-ldflags-objcopy-remove-build-id.patch)
+        ext4.patch
+        grub-0.97-ldflags-objcopy-remove-build-id.patch
+        automake-pkglib.patch)
 backup=('boot/grub/menu.lst')
 install=grub.install
 sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
-          'e13bf0f91510fd6bb9451e6eb1b2a6e4a03e8b5f'
+          'de504b22f586a8919c12ea3446cae3300a8365f0'
           '3e23bfee50285c8c7b9ef9ec07964310278b1e09'
           '157b81dbad3576536b08642242accfa1aeb093a9'
           'adbb4685c98797ffb4dc83561ec75698991dddbd'
@@ -38,16 +44,11 @@ sha1sums=('2580626c4579bd99336d3af4482c346c95dac4fb'
           '066d7ab1ae442f88e94c9e4f1867ac6682965d06'
           '0436aa6fa0b6f768289172f983a3f4b69384629e'
           'a36f34e51efed540f1ddafd78e9c9f6d83e4c8d4'
-          '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869')
-
-#set destination architecture here
-#DESTARCH="i686"
-DESTARCH="x86_64"
-
+          '61c4b58d2eaa3c1561d8e9d8fc41341ce8882869'
+          '776ed278eb8ff80e949834f763fad68b8741e7cd')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  fgrep -rlZ pkglib_DATA --include Makefile.am . | xargs -0 sed -i 's/pkglib_DATA/pkgdata_DATA/g'
+  cd ${srcdir}/${_srcname}-${pkgver}
 
   # optimizations break the build -- disable them
   # adding special devices to grub, patches are from fedora
@@ -62,9 +63,11 @@ build() {
   patch -Np1 -i ../ext4.patch
   # binutils fix
   patch -Np1 -i ../grub-0.97-ldflags-objcopy-remove-build-id.patch
+  # "pkglib" is a reserved keyword in automake fix
+  patch -Np1 -i ../automake-pkglib.patch
 
-  sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
-  sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${pkgname}-${pkgver}/configure.ac"
+  sed -e'/^AC_PROG_CC/ a\AM_PROG_CC_C_O\ ' -i "${srcdir}/${_srcname}-${pkgver}/configure.ac"
+  sed -e'/^AC_PROG_CC/ a\AM_PROG_AS\ ' -i "${srcdir}/${_srcname}-${pkgver}/configure.ac"
 
   ## recreate ./configure script with the required changes in LDFLAGS and objcopy
   aclocal
@@ -72,36 +75,25 @@ build() {
   autoreconf
   automake
 
-  #arch64 fixes for static build
-  if [ "$CARCH" = "x86_64" ]; then  ## correcting problems for new wersion of autotools
-
-    echo "this package has to be built on i686, won't compile on x86_64"
-    sleep 5
+  if [ "$CARCH" = "x86_64" ]; then
+    # patch from gentoo for fixing a segfault
+    patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
+    # patch from frugalware to make it boot when more than 2GB ram installed
+    patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
+    CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+                         --mandir=/usr/share/man --infodir=/usr/share/info
   else
-    if [ "$DESTARCH" = "x86_64" ]; then
-      # patch from gentoo for fixing a segfault
-      patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
-      # patch from frugalware to make it boot when more than 2GB ram installed
-      patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
-      CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
-                           --mandir=/usr/share/man --infodir=/usr/share/info
-    else
-      CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
-                  --mandir=/usr/share/man --infodir=/usr/share/info
-    fi
+    CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+                --mandir=/usr/share/man --infodir=/usr/share/info
   fi
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${_srcname}-${pkgver}
 
   CFLAGS= make
-  make DESTDIR=$pkgdir install
-  install -D -m644 ../menu.lst $pkgdir/boot/grub/menu.lst
-  install -D -m755 ../install-grub $pkgdir/sbin/install-grub
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ../menu.lst ${pkgdir}/boot/grub/menu.lst
+  install -D -m755 ../install-grub ${pkgdir}/sbin/install-grub
 
-  if [ "$DESTARCH" = "x86_64" ]; then
-    # fool makepkg into building a x86_64 package
-    export CARCH="x86_64"
-  fi
 }
diff --git a/libre/grub-legacy/automake-pkglib.patch b/libre/grub-legacy/automake-pkglib.patch
new file mode 100644
index 000000000..a3fff27a1
--- /dev/null
+++ b/libre/grub-legacy/automake-pkglib.patch
@@ -0,0 +1,48 @@
+--- a/stage1/Makefile.am
++++ b/stage1/Makefile.am
+@@ -1,7 +1,7 @@
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+-nodist_pkglib_DATA = stage1
++stagedir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++nodist_stage_DATA = stage1
+ 
+-CLEANFILES = $(nodist_pkglib_DATA)
++CLEANFILES = $(nodist_stage_DATA)
+ 
+ # We can't use builtins or standard includes.
+ AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+--- a/stage2/Makefile.am
++++ b/stage2/Makefile.am
+@@ -27,12 +27,12 @@
+ 	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
+ 
+ # Stage 2 and Stage 1.5's.
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++stagedir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+ 
+ EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
+ 
+ if DISKLESS_SUPPORT
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++stage_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+ 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+ 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
+ 	nbgrub pxegrub
+@@ -43,7 +43,7 @@
+ 	reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
+ 	xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
+ else
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++stage_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+ 	ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+ 	reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
+ noinst_DATA = pre_stage2 start start_eltorito
+@@ -112,7 +112,7 @@
+ BUILT_SOURCES = stage2_size.h
+ endif
+ 
+-CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
++CLEANFILES = $(stage_DATA) $(noinst_DATA) $(BUILT_SOURCES)
+ 
+ stage2_size.h: pre_stage2
+ 	-rm -f stage2_size.h
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 33b3e4554..326eae2aa 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170347 2012-11-06 13:29:39Z andrea $
+# $Id: PKGBUILD 170700 2012-11-09 21:01:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -24,10 +24,12 @@ install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch'
         'use-pythondontwritebytecode.patch'
+        'fix-save-path.patch'
         'khtml-fsdg.diff')
 sha1sums=('d5d60c431159b17a753ee7427d9ca129d550e3f8'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '08c20f4aaad076264402a1d84c559d75b37c66d3'
+          '1138e78f15faa7221669ea81e313c595000cc953'
+          'e3d2621bd1451fe7f45a454af970fae108614ddd'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
@@ -36,8 +38,9 @@ build() {
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
 
-       # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
+       # Fixed upstream
        patch -p1 -i "${srcdir}"/use-pythondontwritebytecode.patch
+       patch -p1 -i "${srcdir}"/fix-save-path.patch
        
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
diff --git a/libre/kdelibs-libre/fix-save-path.patch b/libre/kdelibs-libre/fix-save-path.patch
new file mode 100644
index 000000000..1a00221a7
--- /dev/null
+++ b/libre/kdelibs-libre/fix-save-path.patch
@@ -0,0 +1,27 @@
+commit 793e2a69f8aa193b60494b03d51c5fd44373c0e7
+Author: Jonathan Marten <jjm@keelhaul.me.uk>
+Date:   Wed Nov 7 12:45:03 2012 +0000
+
+    Fix regression: specified or remembered save path is not used
+    
+    As requested on review https://git.reviewboard.kde.org/r/106475/
+
+diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp
+index 65deca2..e755aae 100644
+--- a/kfile/kfilewidget.cpp
++++ b/kfile/kfilewidget.cpp
+@@ -2593,8 +2593,12 @@ KUrl KFileWidget::getStartUrl( const KUrl& startDir,
+         }
+         else						// not special "kfiledialog" URL
+         {
+-            if (!startDir.isRelative())	// has directory, maybe with filename
+-            {
++            // We can use startDir as the starting directory if either:
++            // (a) it has a directory part, or
++            // (b) there is a scheme (protocol), and it is not just "file".
++            if (!startDir.directory().isEmpty() ||
++                (!startDir.scheme().isEmpty() && !startDir.isLocalFile()))
++            {						// can use start directory
+                 ret = startDir;				// will be checked by stat later
+                 // If we won't be able to list it (e.g. http), then use default
+                 if ( !KProtocolManager::supportsListing( ret ) ) {
diff --git a/libre/kdelibs-libre/use-pythondontwritebytecode.patch b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
index 9734f44fb..9b5d92042 100644
--- a/libre/kdelibs-libre/use-pythondontwritebytecode.patch
+++ b/libre/kdelibs-libre/use-pythondontwritebytecode.patch
@@ -1,6 +1,18 @@
---- kdelibs-4.9.3/cmake/modules/PythonMacros.cmake~	2012-11-06 10:32:38.564034292 +0000
-+++ kdelibs-4.9.3/cmake/modules/PythonMacros.cmake	2012-11-06 10:35:51.829341102 +0000
-@@ -23,53 +23,55 @@
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Date: Wed, 07 Nov 2012 19:08:01 +0000
+Subject: Respect PYTHONDONTWRITEBYTECODE environmental variable.
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=5a3cedacdb6485f7551090467cffb2cdf150b05a
+---
+Respect PYTHONDONTWRITEBYTECODE environmental variable.
+
+BUG: 276151
+REVIEW: 107228
+---
+
+
+--- a/cmake/modules/PythonMacros.cmake
++++ b/cmake/modules/PythonMacros.cmake
+@@ -23,54 +23,56 @@
    # Install the source file.
    INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESTINATION_DIR})
  
@@ -9,13 +21,23 @@
 -  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
 -  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
 -  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
++  # Byte compile and install the .pyc file.
++  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
++    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
++    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
++    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
++    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+ 
 -  if(WIN32)
 -    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
 -  endif(WIN32)
--
++    if(WIN32)
++        string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
++    endif(WIN32)
+ 
 -  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--
++    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+ 
 -  # Python 3.2 changed the pyc file location
 -  IF(PYTHON_SHORT_VERSION GREATER 3.1)
 -    # To get the right version for suffix
@@ -24,11 +46,21 @@
 -  ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
 -    SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
 -  ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
--
++    # Python 3.2 changed the pyc file location
++    IF(PYTHON_SHORT_VERSION GREATER 3.1)
++        # To get the right version for suffix
++        STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
++        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
++    ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
++        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
++    ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
+ 
 -  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
++    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+ 
 -  SET(_message "Byte-compiling ${_bin_py}")
--
++    SET(_message "Byte-compiling ${_bin_py}")
+ 
 -  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 -  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
 -    ADD_CUSTOM_COMMAND(
@@ -46,38 +78,6 @@
 -      DEPENDS ${_absfilename}
 -    )
 -  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
--
--  IF(PYTHON_SHORT_VERSION GREATER 3.1)
--    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
--  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
--      INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
--  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
-+  # Byte compile and install the .pyc file.       
-+  IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
-+    GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
-+    GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
-+    GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
-+    GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-+
-+    if(WIN32)
-+        string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
-+    endif(WIN32)
-+
-+    SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
-+
-+    # Python 3.2 changed the pyc file location
-+    IF(PYTHON_SHORT_VERSION GREATER 3.1)
-+        # To get the right version for suffix
-+        STRING(REPLACE "." "" _suffix ${PYTHON_SHORT_VERSION})
-+        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${_suffix}.pyc)
-+    ELSE(PYTHON_SHORT_VERSION GREATER 3.1)
-+        SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-+    ENDIF(PYTHON_SHORT_VERSION GREATER 3.1)
-+
-+    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-+
-+    SET(_message "Byte-compiling ${_bin_py}")
-+
 +    GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
 +    IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
 +        ADD_CUSTOM_COMMAND(
@@ -95,7 +95,12 @@
 +        DEPENDS ${_absfilename}
 +        )
 +    ENDIF(_abs_bin_py STREQUAL ${_absfilename})
-+
+ 
+-  IF(PYTHON_SHORT_VERSION GREATER 3.1)
+-    INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
+-  ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
+-      INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR})
+-  ENDIF (PYTHON_SHORT_VERSION GREATER 3.1)
 +    IF(PYTHON_SHORT_VERSION GREATER 3.1)
 +        INSTALL(FILES ${_bin_pyc} DESTINATION ${DESTINATION_DIR}/__pycache__/)
 +    ELSE (PYTHON_SHORT_VERSION GREATER 3.1)
@@ -104,3 +109,5 @@
 +  ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
  
  ENDMACRO(PYTHON_INSTALL)
+ 
+
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 2b7a87dfa..71c772a4e 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 10325 2012-11-06 13:01:47Z andrea $
+# $Id: PKGBUILD 170697 2012-11-09 20:49:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -18,11 +18,12 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
 sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6'
-          '808fa0400dc419d446d4ff8a9b536b5fddcb4727')
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 build() {
-    cd "${srcdir}"
-    patch -p1 -i ./use-libotr3.patch
+    cd ${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/use-libotr3.patch
+    cd ../
 # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
     sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
     rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype"
diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/use-libotr3.patch
index c36d1a00c..1e96c98d6 100644
--- a/libre/kdenetwork-kopete-libre/use-libotr3.patch
+++ b/libre/kdenetwork-kopete-libre/use-libotr3.patch
@@ -1,5 +1,6 @@
---- kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake~	2012-11-06 10:51:56.566038215 +0000
-+++ kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake	2012-11-06 10:53:38.861993686 +0000
+diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
+--- a/kopete/cmake/modules/FindLibOTR.cmake	2012-08-12 18:08:59.000000000 -0600
++++ b/kopete/cmake/modules/FindLibOTR.cmake	2012-11-09 12:14:24.251450904 -0700
 @@ -13,13 +13,13 @@
      SET(LIBOTR_FIND_QUIETLY TRUE)
  ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
@@ -18,3 +19,53 @@
    STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
    STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
    # Check if version is at least 3.2.0
+diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
+--- a/kopete/plugins/otr/authenticationwizard.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/authenticationwizard.h	2012-11-09 12:15:11.181265336 -0700
+@@ -26,7 +26,7 @@
+   */
+ 
+ extern "C"{
+-#include "libotr/proto.h"
++#include "libotr3/proto.h"
+ }
+ 
+ #include "kopetechatsession.h"
+diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
+--- a/kopete/plugins/otr/otrlchatinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlchatinterface.h	2012-11-09 12:16:10.141032744 -0700
+@@ -36,10 +36,10 @@
+ #include "authenticationwizard.h"
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
+ }
+ 
+ 
+diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
+--- a/kopete/plugins/otr/otrlconfinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlconfinterface.h	2012-11-09 12:15:56.961084991 -0700
+@@ -32,11 +32,11 @@
+ #include <kopetechatsession.h>
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
+-#include <libotr/context.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
++#include <libotr3/context.h>
+ }
+ 
+ class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
author	root <root@rshg054.dnsready.net>	2012-11-10 01:23:31 -0800
committer	root <root@rshg054.dnsready.net>	2012-11-10 01:23:31 -0800
commit	6eea0bd1e92ed5aa53cb5f59102529c88e9e1786 (patch)
tree	b069468f4084f5af5ad3ba2ecab7e6b4deb90267
parent	3f7cb62ef558ea147661abe007a4293c0069fc62 (diff)