Merge branch 'master' of gitpar:abslibre-mips64el

21 files changed, 708 insertions, 85 deletions

diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 1f9b26e5c..7c07fcc93 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 147985 2012-01-29 11:40:13Z ronald $
+# $Id: PKGBUILD 151647 2012-02-29 10:28:02Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuplot 
 pkgver=4.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://www.gnuplot.info" 
@@ -13,12 +13,17 @@ license=('custom')
 depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') 
 makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
 install=gnuplot.install 
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+	"lua_tikz.patch")
+sha1sums=('d4f143eade1f8d8b27be44cbda431d37a71c6a31'
+          'd84518c7e46fc0912554c28ba1fc8cdb70d4ee30')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
+  # upstram patch to fix lua/tikz terminal
+  patch -Np0 -i ${srcdir}/lua_tikz.patch  
+
   # fix default source location; use the GDFONTPATH variable to modify at runtime 
   sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
 
diff --git a/extra/gnuplot/lua_tikz.patch b/extra/gnuplot/lua_tikz.patch
new file mode 100644
index 000000000..f9a939d47
--- /dev/null
+++ b/extra/gnuplot/lua_tikz.patch
@@ -0,0 +1,10 @@
+--- term/lua/gnuplot-tikz-444.lua	Sun Nov 13 00:57:15 2011

++++ term/lua/gnuplot-tikz.lua	Fri Nov 25 01:11:38 2011

+@@ -251,6 +251,7 @@

+   gp.write(string.format("\\begin{tikzpicture}[gnuplot%s]\n",global_opt))

+   gp.write(string.format("%%%% generated with GNUPLOT %sp%s (%s; terminal rev. %s, script rev. %s)\n%%%% %s\n",

+       term.gp_version, term.gp_patchlevel,

++      _VERSION,

+       string.sub(term.lua_term_revision,7,-3),

+       pgf.REVISION,os.date()))

+   if font ~= "" then
\ No newline at end of file
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 481c167b4..12d573ff3 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 147724 2012-01-27 15:42:58Z stephane $
+# $Id: PKGBUILD 151699 2012-02-29 23:23:35Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mpi.org/projects/hwloc/"
 license=('BSD')
-depends=('sh' 'pciutils')
+depends=('sh' 'pciutils' 'cairo' 'libxml2')
 makedepends=('pkg-config')
-optdepends=('cairo: Graphical output' 'libxml2: XML export')
 options=('!libtool' '!docs')
 source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('04326ebbf5a084164d72269f05e37ae23996c023')
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index a5988a0d5..7a897ad5a 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146925 2012-01-19 10:00:36Z thomas $
+# $Id: PKGBUILD 151643 2012-02-29 07:23:23Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=10
+pkgrel=11
 epoch=1
 _extramodules=extramodules-3.2-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index ddba16c90..366b4d4ad 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145773 2011-12-31 06:32:37Z schiv $
+# $Id: PKGBUILD 151657 2012-02-29 20:04:42Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
-pkgver=2.0.2
+pkgver=2.0.3
 pkgrel=1
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,9 +18,9 @@ source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
 backup=('etc/lyx/lyxrc.dist')
 install=lyx.install
 options=('emptydirs')
-md5sums=('f6421fdf118ace93d259220e6a3c4431'
-         '1f65a736f015a5350f8efb41b2f13abd'
-         'b70fdeab95ba4a6c3ff72410dfa61823')
+sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
+          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
+          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index ed521586e..0d171589d 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148480 2012-02-02 09:45:02Z giovanni $
+# $Id: PKGBUILD 151621 2012-02-28 20:53:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mercurial.selenic.com/"
@@ -13,12 +13,15 @@ depends=('python2')
 optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
-        'mercurial.profile')
+        'mercurial.profile'
+        'mercurial-2.1-return-code.patch')
 md5sums=('d2ca44f8d0129ab50639143af99d9363'
-         '43e1d36564d4c7fbe9a091d3ea370a44')
+         '43e1d36564d4c7fbe9a091d3ea370a44'
+         '025e2ec8acc18a9b2a1b4f51f7bddbe3')
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/mercurial-2.1-return-code.patch"
   python2 setup.py install --root="${pkgdir}/" --optimize=1
 
   sed -i -e 's#env python#env python2#' \
diff --git a/extra/mercurial/mercurial-2.1-return-code.patch b/extra/mercurial/mercurial-2.1-return-code.patch
new file mode 100644
index 000000000..8139badfd
--- /dev/null
+++ b/extra/mercurial/mercurial-2.1-return-code.patch
@@ -0,0 +1,377 @@
+
+# HG changeset patch
+# User Matt Mackall <mpm@selenic.com>
+# Date 1328911770 21600
+# Node ID a3dcc59054cac3a78d0d5e5402680b17a396d59e
+# Parent  d75aa756149bfd54b1f7f84b86072b3c1a50d683
+pull: backout change to return code
+
+This bit a number of people.
+
+diff --git a/mercurial/commands.py b/mercurial/commands.py
+--- a/mercurial/commands.py
++++ b/mercurial/commands.py
+@@ -4261,7 +4261,7 @@
+ 
+ def postincoming(ui, repo, modheads, optupdate, checkout):
+     if modheads == 0:
+-        return 1
++        return
+     if optupdate:
+         movemarkfrom = repo['.'].node()
+         try:
+@@ -4312,8 +4312,7 @@
+     If SOURCE is omitted, the 'default' path will be used.
+     See :hg:`help urls` for more information.
+ 
+-    Returns 0 on success, 1 if no changes found or an update had
+-    unresolved files.
++    Returns 0 on success, 1 if an update had unresolved files.
+     """
+     source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
+     other = hg.peer(repo, opts, source)
+diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
+--- a/tests/test-bookmarks-pushpull.t
++++ b/tests/test-bookmarks-pushpull.t
+@@ -44,7 +44,6 @@
+   pulling from ../a
+   no changes found
+   importing bookmark X
+-  [1]
+   $ hg bookmark
+      X                         0:4e3505fd9583
+      Y                         0:4e3505fd9583
+@@ -185,7 +184,6 @@
+   no changes found
+   divergent bookmark X stored as X@1
+   importing bookmark Z
+-  [1]
+   $ hg clone http://localhost:$HGPORT/ cloned-bookmarks
+   requesting all changes
+   adding changesets
+diff --git a/tests/test-bundle.t b/tests/test-bundle.t
+--- a/tests/test-bundle.t
++++ b/tests/test-bundle.t
+@@ -85,7 +85,6 @@
+   pulling from ../full.hg
+   searching for changes
+   no changes found
+-  [1]
+ 
+ Pull full.hg into empty (using --cwd)
+ 
+@@ -120,7 +119,6 @@
+   pulling from full.hg
+   searching for changes
+   no changes found
+-  [1]
+ 
+ Pull full.hg into empty (using -R)
+ 
+@@ -128,7 +126,6 @@
+   pulling from full.hg
+   searching for changes
+   no changes found
+-  [1]
+ 
+ Rollback empty
+ 
+diff --git a/tests/test-convert.t b/tests/test-convert.t
+--- a/tests/test-convert.t
++++ b/tests/test-convert.t
+@@ -293,7 +293,6 @@
+   pulling from ../a
+   searching for changes
+   no changes found
+-  [1]
+   $ touch bogusfile
+ 
+ should fail
+diff --git a/tests/test-hook.t b/tests/test-hook.t
+--- a/tests/test-hook.t
++++ b/tests/test-hook.t
+@@ -196,7 +196,6 @@
+   listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} 
+   listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} 
+   importing bookmark bar
+-  [1]
+   $ cd ../a
+ 
+ test that prepushkey can prevent incoming keys
+diff --git a/tests/test-https.t b/tests/test-https.t
+--- a/tests/test-https.t
++++ b/tests/test-https.t
+@@ -160,7 +160,6 @@
+   pulling from https://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ mv copy-pull/.hg/hgrc.bu copy-pull/.hg/hgrc
+ 
+ cacert configured globally, also testing expansion of environment
+@@ -172,13 +171,11 @@
+   pulling from https://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ P=`pwd` hg -R copy-pull pull --insecure
+   warning: localhost certificate with fingerprint 91:4f:1a:ff:87:24:9c:09:b6:85:9b:88:b1:90:6d:30:75:64:91:ca not verified (check hostfingerprints or web.cacerts config setting)
+   pulling from https://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+ 
+ cacert mismatch
+ 
+@@ -191,7 +188,6 @@
+   pulling from https://127.0.0.1:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ hg -R copy-pull pull --config web.cacerts=pub-other.pem
+   abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob)
+   [255]
+@@ -200,7 +196,6 @@
+   pulling from https://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+ 
+ Test server cert which isn't valid yet
+ 
+@@ -260,7 +255,6 @@
+   pulling from https://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+ 
+ Test https with cacert and fingerprint through proxy
+ 
+@@ -268,12 +262,10 @@
+   pulling from https://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull https://127.0.0.1:$HGPORT/
+   pulling from https://127.0.0.1:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+ 
+ Test https with cert problems through proxy
+ 
+diff --git a/tests/test-mq-qimport-fail-cleanup.t b/tests/test-mq-qimport-fail-cleanup.t
+--- a/tests/test-mq-qimport-fail-cleanup.t
++++ b/tests/test-mq-qimport-fail-cleanup.t
+@@ -34,7 +34,6 @@
+   b.patch
+ 
+   $ hg pull -q -r 0 . # update phase
+-  [1]
+   $ hg qimport -r 0
+   abort: revision 0 is not mutable
+   (see "hg help phases" for details)
+diff --git a/tests/test-pending.t b/tests/test-pending.t
+--- a/tests/test-pending.t
++++ b/tests/test-pending.t
+@@ -102,7 +102,6 @@
+   rollback completed
+   abort: pretxnchangegroup hook failed
+   pull 0000000000000000000000000000000000000000
+-  [1]
+ 
+ test external hook
+ 
+@@ -118,4 +117,3 @@
+   rollback completed
+   abort: pretxnchangegroup hook exited with status 1
+   pull 0000000000000000000000000000000000000000
+-  [1]
+diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
+--- a/tests/test-phases-exchange.t
++++ b/tests/test-phases-exchange.t
+@@ -136,7 +136,6 @@
+   pulling from ../alpha
+   searching for changes
+   no changes found
+-  [1]
+   $ hgph
+   o  4 public a-D - b555f63b6063
+   |
+@@ -344,7 +343,6 @@
+   pulling from ../alpha
+   searching for changes
+   no changes found
+-  [1]
+   $ hgph
+   @  6 public n-B - 145e75495359
+   |
+@@ -777,7 +775,6 @@
+   pulling from ../mu
+   searching for changes
+   no changes found
+-  [1]
+   $ hgph
+   @  11 draft A-secret - 435b5d83910c
+   |
+@@ -930,7 +927,6 @@
+   pulling from http://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ hg phase f54f1bb90ff3
+   2: draft
+ 
+diff --git a/tests/test-pull-r.t b/tests/test-pull-r.t
+--- a/tests/test-pull-r.t
++++ b/tests/test-pull-r.t
+@@ -100,5 +100,4 @@
+ This used to abort: received changelog group is empty:
+ 
+   $ hg pull -qr 1 ../repo
+-  [1]
+ 
+diff --git a/tests/test-pull.t b/tests/test-pull.t
+--- a/tests/test-pull.t
++++ b/tests/test-pull.t
+@@ -48,7 +48,6 @@
+   pulling from http://foo@localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+ 
+   $ hg rollback --dry-run --verbose
+   repository tip rolled back to revision -1 (undo pull: http://foo:***@localhost:$HGPORT/)
+@@ -78,7 +77,6 @@
+   [255]
+ 
+   $ hg pull -q file:../test
+-  [1]
+ 
+ It's tricky to make file:// URLs working on every platform with
+ regular shell commands.
+@@ -90,4 +88,3 @@
+ 
+   $ URL=`python -c "import os; print 'file://localhost' + ('/' + os.getcwd().replace(os.sep, '/')).replace('//', '/') + '/../test'"`
+   $ hg pull -q "$URL"
+-  [1]
+diff --git a/tests/test-ssh.t b/tests/test-ssh.t
+--- a/tests/test-ssh.t
++++ b/tests/test-ssh.t
+@@ -80,7 +80,6 @@
+   pulling from ssh://user@dummy/remote
+   searching for changes
+   no changes found
+-  [1]
+ 
+ local change
+ 
+@@ -199,7 +198,6 @@
+   no changes found
+   updating bookmark foo
+   importing bookmark foo
+-  [1]
+   $ hg book -d foo
+   $ hg push -B foo
+   pushing to ssh://user@dummy/remote
+diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
+--- a/tests/test-subrepo.t
++++ b/tests/test-subrepo.t
+@@ -580,7 +580,6 @@
+   cloning subrepo s from $TESTTMP/sub/repo/s (glob)
+   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+   $ hg -q -R repo2 pull -u
+-  [1]
+   $ echo 1 > repo2/s/a
+   $ hg -R repo2/s ci -m2
+   $ hg -q -R repo2/s push
+@@ -639,7 +638,6 @@
+   pulling from issue1852a
+   searching for changes
+   no changes found
+-  [1]
+ 
+ Try the same, but with pull -u
+ 
+diff --git a/tests/test-treediscovery-legacy.t b/tests/test-treediscovery-legacy.t
+--- a/tests/test-treediscovery-legacy.t
++++ b/tests/test-treediscovery-legacy.t
+@@ -48,7 +48,6 @@
+   $ hg pull -R empty1 $remote
+   pulling from http://localhost:$HGPORT/
+   no changes found
+-  [1]
+   $ hg push -R empty1 $remote
+   pushing to http://localhost:$HGPORT/
+   no changes found
+@@ -108,7 +107,6 @@
+   pulling from http://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ hg push $remote
+   pushing to http://localhost:$HGPORT/
+   searching for changes
+@@ -233,7 +231,6 @@
+   pulling from http://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ hg push $remote
+   pushing to http://localhost:$HGPORT/
+   searching for changes
+@@ -278,7 +275,6 @@
+   pulling from http://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ hg push $remote
+   pushing to http://localhost:$HGPORT/
+   searching for changes
+diff --git a/tests/test-treediscovery.t b/tests/test-treediscovery.t
+--- a/tests/test-treediscovery.t
++++ b/tests/test-treediscovery.t
+@@ -42,7 +42,6 @@
+   $ hg pull -R empty1 $remote
+   pulling from http://localhost:$HGPORT/
+   no changes found
+-  [1]
+   $ hg push -R empty1 $remote
+   pushing to http://localhost:$HGPORT/
+   no changes found
+@@ -102,7 +101,6 @@
+   pulling from http://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ hg push $remote
+   pushing to http://localhost:$HGPORT/
+   searching for changes
+@@ -221,7 +219,6 @@
+   pulling from http://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ hg push $remote
+   pushing to http://localhost:$HGPORT/
+   searching for changes
+@@ -266,7 +263,6 @@
+   pulling from http://localhost:$HGPORT/
+   searching for changes
+   no changes found
+-  [1]
+   $ hg push $remote
+   pushing to http://localhost:$HGPORT/
+   searching for changes
+diff --git a/tests/test-url-rev.t b/tests/test-url-rev.t
+--- a/tests/test-url-rev.t
++++ b/tests/test-url-rev.t
+@@ -141,7 +141,6 @@
+ No new revs, no update:
+ 
+   $ hg pull -qu
+-  [1]
+ 
+   $ hg parents -q
+   0:1f0dee641bb7
+
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index cf6d15f75..1edfbdc3d 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 150713 2012-02-21 01:06:35Z bisson $
+# $Id: PKGBUILD 151695 2012-02-29 21:30:41Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=3
+pkgrel=5
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
@@ -22,8 +22,8 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
 sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
           '4e324e625c1f080b5c028be5092aa71adbf9bd99'
           '01394b8a952f5edc85d19df8335eeac3980320f4'
-          'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e'
-          '6cfcb7bbd34499b30e31dffca2f3e1a036010271'
+          'eb1f63814b9adbd3d518e880fa3b38c375f0fe91'
+          '4537d1f58b299d463db5048129cb264511474b0b'
           '4f76f7f9ffc8315ff9924f793f272d4f6939b816')
 
 install=install
@@ -34,7 +34,7 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--enable-linux-caps \
+		--enable-linuxcaps \
 
 	make
 }
@@ -45,7 +45,7 @@ package() {
 	make DESTDIR="${pkgdir}" install
 
 	rmdir "${pkgdir}"/usr/{lib,sbin}
-	install -d "${pkgdir}"/var/lib/ntp
+	install -d -o 87 "${pkgdir}"/var/lib/ntp
 	install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd
 	install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate
 	install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
diff --git a/extra/ntp/install b/extra/ntp/install
index 926b4126e..7581ec12f 100644
--- a/extra/ntp/install
+++ b/extra/ntp/install
@@ -1,3 +1,9 @@
+post_install() {
+	getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null
+	getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null
+	true
+}
+
 post_upgrade() {
 	if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
 		cat <<EOF
@@ -16,4 +22,13 @@ EOF
 
 EOF
 	fi
+	if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then
+		post_install
+	fi
+}
+
+post_remove() {
+	getent passwd ntp &>/dev/null && userdel ntp >/dev/null
+	getent group ntp &>/dev/null && groupdel ntp >/dev/null
+	true
 }
diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf
index 49b2f2bb7..a27b22820 100644
--- a/extra/ntp/ntp.conf
+++ b/extra/ntp/ntp.conf
@@ -5,13 +5,13 @@
 # - http://support.ntp.org/bin/view/Support/GettingStarted
 # - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
 
-# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/
+# Associate to public NTP pool servers; see http://www.pool.ntp.org/
 server 0.pool.ntp.org
 server 1.pool.ntp.org
 server 2.pool.ntp.org
 
 # Only allow read-only access from localhost
-restrict default nomodify nopeer
+restrict default noquery nopeer
 restrict 127.0.0.1
 restrict ::1
 
diff --git a/extra/ntp/ntpd.conf b/extra/ntp/ntpd.conf
index e728db579..047961fde 100644
--- a/extra/ntp/ntpd.conf
+++ b/extra/ntp/ntpd.conf
@@ -1,5 +1,5 @@
 # client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g"
+NTP_CLIENT_OPTION="-g -u ntp"
 
 # arguments passed to ntpd when started
-NTPD_ARGS="-g"
+NTPD_ARGS="-g -u ntp"
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index aeaa6d084..229843e81 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,43 +1,33 @@
-# $Id: PKGBUILD 150800 2012-02-22 17:25:13Z stephane $
+# $Id: PKGBUILD 151701 2012-03-01 00:42:34Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=openmpi
 pkgver=1.5.4
-pkgrel=4
+pkgrel=5
 pkgdesc="High performance message passing library (MPI)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mpi.org"
 license=('custom')
-depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc')
-[ "$CARCH" = "mips64el" ] && \
-depends=('gcc-fortran' 'openssh' 'libtool' 'hwloc')
+depends=('gcc' 'gcc-fortran' 'openssh' 'libtool' 'hwloc')
+[ "$CARCH" = "mips64el" ] || depends+=('valgrind')
 makedepends=('inetutils')
 options=(!libtool)
-source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c')
+source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2
+        openmpi-1.5.4-fix-fakeroot-execution.patch)
+sha1sums=('81f7736a83b2134ba20c2e5c380b4d267cfd9d9c'
+          'ec46abb6f9e01daca910e4079b9abc036db9ed20')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
 
-# Disable valgrind
    if [ "$CARCH" = "mips64el" ]; then
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc/${pkgname} \
-               --mandir=/usr/share/man \
-               --enable-mpi-f90 \
-               --libdir=/usr/lib/${pkgname} \
-               --with-threads=posix \
-               --enable-mpi-threads \
-               --enable-smp-locks \
-               --without-valgrind \
-               --enable-memchecker \
-               --enable-debug \
-               --enable-pretty-print-stacktrace \
-               --without-slurm \
-               --with-hwloc=external \
-               --with-libltdl=/usr \
-               FC=/usr/bin/gfortran \
-               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
+     valgrind="--without-valgrind"
    else
+     valgrind="--with-valgrind"
+   fi
+
+   # Fix fakeroot problem (FS#28644)
+   patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch
+
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
                --mandir=/usr/share/man \
@@ -45,7 +35,7 @@ build() {
                --libdir=/usr/lib/${pkgname} \
                --with-threads=posix \
                --enable-smp-locks \
-               --with-valgrind \
+               $valgrind \
                --enable-memchecker \
                --enable-debug \
                --enable-pretty-print-stacktrace \
@@ -54,7 +44,6 @@ build() {
                --with-libltdl=/usr \
                FC=/usr/bin/gfortran \
                LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-   fi
 
    make
 }
@@ -73,7 +62,7 @@ package() {
    mv "${pkgdir}"/usr/bin/otfinfo{,mpi}
 
    # Openmpi's otfdump conflicts with the one from libotf
-   mv "${pkgdir}"/usr/bin/otfdump{,ompi} 
+   mv "${pkgdir}"/usr/bin/otfdump{,ompi}
 
    # Remove dangling symlink
    rm "${pkgdir}"/usr/share/man/man1/orteCC.1
diff --git a/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch b/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch
new file mode 100644
index 000000000..dc9dcfeae
--- /dev/null
+++ b/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch
@@ -0,0 +1,43 @@
+Description: If running under Debian fakeroot then its important
+ that this hook is disabled; a new stat check was introduced in
+ 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT.
+Author: James Page <james.page@ubuntu.com>
+Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489
+
+Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c
+===================================================================
+--- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c    2012-02-15 12:59:39.986314651 +0000
++++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000
+@@ -738,15 +738,6 @@
+     check_result_t r1, r2, lp, lpp;
+     bool want_rcache = false, found_driver = false;
+ 
+-    /* First, check if ummunotify is present on the system. If it is,
+-       then we don't need to do the following ptmalloc2 hacks.
+-       open/mmap on the device may fail during init, but if /dev/ummunotify
+-       exists, we assume that the user/administrator *wants* to use
+-       ummunotify. */
+-    if (stat("/dev/ummunotify", &st) == 0) {
+-        return;
+-    }
+-
+     /* Yes, checking for an MPI MCA parameter here is an abstraction
+        violation.  Cope.  Yes, even checking for *any* MCA parameter
+        here (without going through the MCA param API) is an
+@@ -769,6 +760,15 @@
+         return;
+     }
+ 
++    /* Next, check if ummunotify is present on the system. If it is,
++       then we don't need to do the following ptmalloc2 hacks.
++       open/mmap on the device may fail during init, but if /dev/ummunotify
++       exists, we assume that the user/administrator *wants* to use
++       ummunotify. */
++    if (stat("/dev/ummunotify", &st) == 0) {
++        return;
++    }
++
+     /* Look for sentinel files (directories) to see if various network
+        drivers are loaded (yes, I know, further abstraction
+        violations...).
+
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index 68fb9962e..1491eaf99 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 148904 2012-02-05 11:55:04Z ibiru $
+# $Id: PKGBUILD 151653 2012-02-29 18:44:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.8.0
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -17,34 +17,36 @@ options=('!libtool')
 _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
 source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop' 'declarative-fix-sigbus.patch'
-        'fix-qurl.patch')
+        'qtconfig.desktop'
+        'fix-qgraphicsscene-regression.patch'
+        'improved-filter-event.patch'
+        'qurl-backward-compatibility.patch'
+	'declarative-fix-sigbus.patch')
 md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
          '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'aac963d05a9d5733e2bfce9e26607f51'
-         '7bc255a36733d0fbc80c1902ade4beca')
+         'c2e91fc028250a590e76effe234468e2'
+         '444ebeb716d7c7379835efb8aa88e6c8'
+         '7bc255a36733d0fbc80c1902ade4beca'
+         'aac963d05a9d5733e2bfce9e26607f51')
 
 build() {
   cd "${srcdir}"/${_pkgfqn}
 
   # MIPS N32-specific fix, shouldn't affect correctness on other platforms.
   patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
-  # (FS#27757)
-  patch -p1 -i "${srcdir}"/fix-qurl.patch
+  # (FS#28707)
+  patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch
+  # (FS#27757) (KDEBUG#275469)
+  patch -p1 -i "${srcdir}"/improved-filter-event.patch
+  patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch
 
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-  if [ "${CARCH}" = "mips64el" ] ; then
-      export CXXFLAGS="${CXXFLAGS} -fpermissive"
-      # Raster renders incorrectly.
-      graphicssystem=""
-  else
-      graphicssystem="-graphicssystem raster"
-  fi
+  [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive"
 
   sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
   sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
@@ -65,7 +67,7 @@ build() {
     -no-phonon \
     -no-phonon-backend \
     -no-webkit \
-    $graphicssystem \
+    -graphicssystem raster \
     -openssl-linked \
     -nomake demos \
     -nomake examples \
diff --git a/extra/qt/fix-qgraphicsscene-regression.patch b/extra/qt/fix-qgraphicsscene-regression.patch
new file mode 100644
index 000000000..0c0a28a61
--- /dev/null
+++ b/extra/qt/fix-qgraphicsscene-regression.patch
@@ -0,0 +1,55 @@
+From 15c14584199dc43e4a309fc331f3144009008128 Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Fri, 24 Feb 2012 00:42:34 +1100
+Subject: [PATCH] Revert "Don't rely on mapFromGlobal in
+ QGraphicsScenePrivate::itemsAtPosition."
+
+This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e.
+The commit caused a regression whereby tooltips may be shown even if the
+mouse is not over the item if it has the Qt::ItemIgnoresTransformations
+flag and the QGraphicsView had been scaled.
+
+Task-number: QTBUG-17517
+Task-number: QTBUG-22663
+Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2
+Reviewed-by: Andy Shaw <andy.shaw@digia.com>
+Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
+---
+ src/gui/graphicsview/qgraphicsscene.cpp |   10 +++++++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
+index 14c0f3c..d1cdd4f 100644
+--- a/src/gui/graphicsview/qgraphicsscene.cpp
++++ b/src/gui/graphicsview/qgraphicsscene.cpp
+@@ -1084,7 +1084,7 @@ void QGraphicsScenePrivate::enableMouseTrackingOnViews()
+ /*!
+     Returns all items for the screen position in \a event.
+ */
+-QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*screenPos*/,
++QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &screenPos,
+                                                               const QPointF &scenePos,
+                                                               QWidget *widget) const
+ {
+@@ -1093,12 +1093,16 @@ QList<QGraphicsItem *> QGraphicsScenePrivate::itemsAtPosition(const QPoint &/*sc
+     if (!view)
+         return q->items(scenePos, Qt::IntersectsItemShape, Qt::DescendingOrder, QTransform());
+ 
+-    const QRectF pointRect(scenePos, QSizeF(1, 1));
++    const QRectF pointRect(QPointF(widget->mapFromGlobal(screenPos)), QSizeF(1, 1));
+     if (!view->isTransformed())
+         return q->items(pointRect, Qt::IntersectsItemShape, Qt::DescendingOrder);
+ 
+     const QTransform viewTransform = view->viewportTransform();
+-    return q->items(pointRect, Qt::IntersectsItemShape,
++    if (viewTransform.type() <= QTransform::TxScale) {
++        return q->items(viewTransform.inverted().mapRect(pointRect), Qt::IntersectsItemShape,
++                        Qt::DescendingOrder, viewTransform);
++    }
++    return q->items(viewTransform.inverted().map(pointRect), Qt::IntersectsItemShape,
+                     Qt::DescendingOrder, viewTransform);
+ }
+ 
+-- 
+1.7.6
+
diff --git a/extra/qt/improved-filter-event.patch b/extra/qt/improved-filter-event.patch
new file mode 100644
index 000000000..b03cdbe94
--- /dev/null
+++ b/extra/qt/improved-filter-event.patch
@@ -0,0 +1,98 @@
+--- qt-opensource-4.8.0.old/src/gui/kernel/qapplication_x11.cpp	2011-12-16 03:22:33.918428374 -0500
++++ qt-opensource-4.8.0.new/src/gui/kernel/qapplication_x11.cpp	2012-01-07 18:18:40.258246384 -0500
+@@ -4244,7 +4205,12 @@ bool QETWidget::translateMouseEvent(cons
+                     && (nextEvent.xclient.message_type == ATOM(_QT_SCROLL_DONE) ||
+                     (nextEvent.xclient.message_type == ATOM(WM_PROTOCOLS) &&
+                      (Atom)nextEvent.xclient.data.l[0] == ATOM(_NET_WM_SYNC_REQUEST))))) {
+-                qApp->x11ProcessEvent(&nextEvent);
++                // As we may run through a significant number of a large class of non-MotionNotify
++                // events here, without returning to the event loop, first pass nextEvent to
++                // QAbstractEventDispatcher::filterEvent() to allow applications which override
++                // QAbstractEventDispatcher::filterEvent() to handle the event first.
++                if (!QAbstractEventDispatcher::instance()->filterEvent(&nextEvent))
++                    qApp->x11ProcessEvent(&nextEvent);
+                 continue;
+             } else if (nextEvent.type != MotionNotify ||
+                        nextEvent.xmotion.window != event->xmotion.window ||
+--- qt-opensource-4.8.0.old/src/gui/kernel/qclipboard_x11.cpp	2011-12-08 00:06:02.000000000 -0500
++++ qt-opensource-4.8.0.new/src/gui/kernel/qclipboard_x11.cpp	2012-01-07 18:30:35.298287639 -0500
+@@ -573,7 +573,11 @@ bool QX11Data::clipboardWaitForEvent(Win
+ 
+             // process other clipboard events, since someone is probably requesting data from us
+             XEvent e;
+-            if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0))
++            // Some applications may override QAbstractEventDispatcher::filterEvent(), so
++            // pass event to QAbstractEventDispatcher::filterEvent() before processing in
++            // x11ProcessEvent().
++            if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0) && 
++                !QAbstractEventDispatcher::instance()->filterEvent(&e))
+                 qApp->x11ProcessEvent(&e);
+ 
+             now.start();
+--- qt-opensource-4.8.0.old/src/gui/kernel/qdnd_x11.cpp	2011-12-08 00:06:02.000000000 -0500
++++ qt-opensource-4.8.0.new/src/gui/kernel/qdnd_x11.cpp	2012-01-07 18:28:13.841279478 -0500
+@@ -42,6 +42,7 @@
+ #include "qplatformdefs.h"
+ 
+ #include "qapplication.h"
++#include "qabstracteventdispatcher.h"
+ 
+ #ifndef QT_NO_DRAGANDDROP
+ 
+@@ -1941,7 +1942,11 @@ Qt::DropAction QDragManager::drag(QDrag
+         timer.start();
+         do {
+             XEvent event;
+-            if (XCheckTypedEvent(X11->display, ClientMessage, &event))
++            // Some applications may override QAbstractEventDispatcher::filterEvent(), so
++            // pass event to QAbstractEventDispatcher::filterEvent() before processing in
++            // x11ProcessEvent().
++            if (XCheckTypedEvent(X11->display, ClientMessage, &event) &&
++                !QAbstractEventDispatcher::instance()->filterEvent(&event))
+                 qApp->x11ProcessEvent(&event);
+ 
+             // sleep 50 ms, so we don't use up CPU cycles all the time.
+--- qt-opensource-4.8.0.old/src/gui/kernel/qwidget_x11.cpp	2011-12-08 00:06:02.000000000 -0500
++++ qt-opensource-4.8.0.new/src/gui/kernel/qwidget_x11.cpp	2012-01-07 18:29:26.286283657 -0500
+@@ -44,6 +44,7 @@
+ #include "qdesktopwidget.h"
+ #include "qapplication.h"
+ #include "qapplication_p.h"
++#include "qabstracteventdispatcher.h"
+ #include "qnamespace.h"
+ #include "qpainter.h"
+ #include "qbitmap.h"
+@@ -376,17 +377,22 @@ void qt_x11_wait_for_window_manager(QWid
+     do {
+         if (XEventsQueued(X11->display, QueuedAlready)) {
+             XNextEvent(X11->display, &ev);
+-            qApp->x11ProcessEvent(&ev);
+-
+-            switch (state) {
+-            case Initial:
+-                if (ev.type == MapNotify && ev.xany.window == winid)
+-                    state = Mapped;
+-                break;
+-            case Mapped:
+-                if (ev.type == Expose && ev.xany.window == winid)
+-                    return;
+-                break;
++            // Some applications may override QAbstractEventDispatcher::filterEvent(), so
++            // pass event to QAbstractEventDispatcher::filterEvent() before processing in
++            // x11ProcessEvent().
++            if (!QAbstractEventDispatcher::instance()->filterEvent(&ev)) {
++                qApp->x11ProcessEvent(&ev);
++
++                switch (state) {
++                case Initial:
++                    if (ev.type == MapNotify && ev.xany.window == winid)
++                        state = Mapped;
++                    break;
++                case Mapped:
++                    if (ev.type == Expose && ev.xany.window == winid)
++                        return;
++                    break;
++                }
+             }
+         } else {
+             if (!XEventsQueued(X11->display, QueuedAfterFlush))
diff --git a/extra/qt/qurl-backward-compatibility.patch b/extra/qt/qurl-backward-compatibility.patch
new file mode 100644
index 000000000..1c666dba4
--- /dev/null
+++ b/extra/qt/qurl-backward-compatibility.patch
@@ -0,0 +1,13 @@
+diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
+--- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile	2011-10-03 22:44:32.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp	2011-10-27 12:58:35.706815049 -0500
+@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
+ QString QUrl::toLocalFile() const
+ {
+     // the call to isLocalFile() also ensures that we're parsed
+-    if (!isLocalFile())
++    // Treat URLs with no scheme as local for backward compatibility
++    if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
+         return QString();
+ 
+     QString tmp;
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 6f9d0c767..652baf9d2 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -21,7 +21,7 @@ options=('!emptydirs' '!makeflags')
 install='ruby.install'
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
         'gemrc')
-md5sums=('341b8fc42aa18bd668314199f219db14'
+md5sums=('702529a7f8417ed79f628b77d8061aa5'
          '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
@@ -54,6 +54,3 @@ package() {
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
   install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
 }
-md5sums=('096758c3e853b839dc980b183227b182')
-md5sums=('65401fb3194cdccd6c1175ab29b8fdb8')
-sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
diff --git a/extra/sdl_ttf/PKGBUILD b/extra/sdl_ttf/PKGBUILD
index 5e325a316..7b9d66097 100644
--- a/extra/sdl_ttf/PKGBUILD
+++ b/extra/sdl_ttf/PKGBUILD
@@ -1,22 +1,28 @@
-# $Id: PKGBUILD 146690 2012-01-16 11:37:07Z heftig $
+# $Id: PKGBUILD 151697 2012-02-29 21:54:21Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_ttf
 pkgver=2.0.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.libsdl.org/projects/SDL_ttf/"
 depends=('sdl>=1.2.12' 'freetype2')
 options=('!libtool')
-source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz)
-md5sums=('61e29bd9da8d245bc2471d1b2ce591aa')
+source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz
+        bug1433.patch)
+md5sums=('61e29bd9da8d245bc2471d1b2ce591aa'
+         'f847697e18eec539aaf3ffb96996abbf')
 
 build() {
   cd "$srcdir/SDL_ttf-$pkgver"
+  
+  # Fix FS#28674
+  patch -Ni "$srcdir/bug1433.patch"
+ 
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/sdl_ttf/bug1433.patch b/extra/sdl_ttf/bug1433.patch
new file mode 100644
index 000000000..b402fb3e9
--- /dev/null
+++ b/extra/sdl_ttf/bug1433.patch
@@ -0,0 +1,11 @@
+--- SDL_ttf.c.orig	2012-02-12 16:36:41.859977617 +0100

++++ SDL_ttf.c	2012-02-12 16:36:53.696580159 +0100

+@@ -1747,7 +1747,7 @@

+ 	/* Copy the character from the pixmap */

+ 	src = glyph->pixmap.buffer;

+ 	dst = (Uint8*) textbuf->pixels;

+-	for ( row = 0; row < glyph->bitmap.rows; ++row ) {

++	for ( row = 0; row < glyph->pixmap.rows; ++row ) {

+ 		memcpy( dst, src, glyph->pixmap.width );

+ 		src += glyph->pixmap.pitch;

+ 		dst += textbuf->pitch;
\ No newline at end of file
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 3573da9ec..cfc17bbf9 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 151381 2012-02-25 21:27:16Z andrea $
+# $Id: PKGBUILD 151614 2012-02-28 09:40:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
          'system-config-printer-gnome')
 pkgver=1.3.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -33,7 +33,7 @@ build() {
 
 package_system-config-printer-common() {
   pkgdesc='Pygtk CUPS Configuration'
-  depends=('udev' 'pycups' 'dbus-python' 'pysmbc')
+  depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl')
   optdepends=('system-config-printer-gnome: for the GTK frontend'
 	'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings')
   replaces=('system-config-printer')
@@ -78,7 +78,7 @@ package_system-config-printer-common() {
 
 package_system-config-printer-gnome() {
   pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend'
-  depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify' 'python-pycurl')
+  depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify')
   optdependence=('gnome-keyring: password management')
 
   cd "${srcdir}"/${pkgbase}-${pkgver}