Fri Oct 25 02:07:10 PDT 2013

30 files changed, 304 insertions, 174 deletions

diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index 0a4384534..8c0eed41e 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191744 2013-07-30 07:00:10Z eric $
+# $Id: PKGBUILD 197210 2013-10-24 03:42:33Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=a2ps
 pkgver=4.14
-pkgrel=4
+pkgrel=5
 pkgdesc="An Any to PostScript filter"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/a2ps/"
@@ -11,7 +11,6 @@ license=('GPL3')
 depends=('ghostscript' 'psutils' 'imagemagick')
 makedepends=('gperf')
 backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg')
-options=('!libtool')
 install=a2ps.install
 source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig}
         a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch 
@@ -45,7 +44,7 @@ build() {
   libtoolize --force --copy
   autoreconf --force --install -I m4 
   ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
-    --includedir=/usr/include --enable-nls
+    --includedir=/usr/include --enable-shared --enable-nls
   make
 }
 
diff --git a/extra/aalib/PKGBUILD b/extra/aalib/PKGBUILD
index ae5a98b54..df326f65a 100644
--- a/extra/aalib/PKGBUILD
+++ b/extra/aalib/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 149374 2012-02-07 09:56:45Z eric $
+# $Id: PKGBUILD 197212 2013-10-24 03:56:40Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=aalib
 pkgver=1.4rc5
-pkgrel=9
+pkgrel=10
 pkgdesc="A portable ASCII art graphic library"
 arch=('i686' 'x86_64')
 url="http://aa-project.sourceforge.net/aalib/"
 license=('LGPL')
 depends=('gpm' 'libx11')
 makedepends=('libxt')
-options=('!libtool')
 install=aalib.install
 source=(http://downloads.sourceforge.net/sourceforge/aa-project/${pkgname}-${pkgver}.tar.gz
 	aclocal-fixes.patch)
 sha1sums=('a23269e950a249d2ef93625837cace45ddbce03b'
           '98d8c5a13672a8107945d694ff4520e0bc87d3e9')
 
-build() {
-  cd "${srcdir}/${pkgname}-1.4.0"
+prepare() {
+  cd ${pkgname}-1.4.0
   patch -p0 -i "${srcdir}/aclocal-fixes.patch"
+}
+
+build() {
+  cd ${pkgname}-1.4.0
   ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-1.4.0"
+  cd ${pkgname}-1.4.0
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 680390c96..444a3763c 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193962 2013-09-08 19:31:47Z eric $
+# $Id: PKGBUILD 197206 2013-10-23 23:57:14Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
-pkgver=2.0.4
+pkgver=2.0.5
 pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake')
 options=('!makeflags')
 install=audacity.install
 source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.xz)
-sha1sums=('4c1a42137cef598e3d83829ca7c22dba62d215be')
+sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33')
 
 build() {
   cd ${pkgname}-src-${pkgver}
diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD
index fa2bd62bc..6ef726a4d 100644
--- a/extra/cln/PKGBUILD
+++ b/extra/cln/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 191235 2013-07-22 00:17:17Z eric $
+# $Id: PKGBUILD 197218 2013-10-24 05:09:05Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=cln
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Class library for numbers"
 arch=('i686' 'x86_64')
 url="http://www.ginac.de/CLN/"
 license=('GPL')
 depends=('gmp')
 makedepends=('texlive-core')
-options=('!libtool')
 install=cln.install
 source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('11c56780eb83ed54f2ad1ecef7f0dc0f609c426d')
diff --git a/extra/epplet-base/PKGBUILD b/extra/epplet-base/PKGBUILD
index a0a6d48f1..4379b3344 100644
--- a/extra/epplet-base/PKGBUILD
+++ b/extra/epplet-base/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 167952 2012-10-04 04:50:04Z eric $
+# $Id: PKGBUILD 197233 2013-10-24 13:10:07Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=epplet-base
 pkgver=0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Addon plugins for the enlightenment windowmanager"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
 license=('GPL')
 depends=('imlib2' 'libcdaudio' 'libgl')
 makedepends=('mesa')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/enlightenment/epplets-${pkgver}.tar.gz)
 sha1sums=('ddecad7c22771bc50565f76c36ae334f952388aa')
 
 build() {
-  cd "${srcdir}/epplets-${pkgver}"
+  cd epplets-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/epplets-${pkgver}"
+  cd epplets-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/faad2/LICENSE b/extra/faad2/LICENSE
deleted file mode 100644
index a16abf6e3..000000000
--- a/extra/faad2/LICENSE
+++ /dev/null
@@ -1,42 +0,0 @@
-__________
-COPYRIGHTS
-
-For FAAD2 the following license applies:
-
-******************************************************************************
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-******************************************************************************
-
-
-Please note that the use of this software may require the payment of
-patent royalties. You need to consider this issue before you start
-building derivative works. We are not warranting or indemnifying you in
-any way for patent royalities! YOU ARE SOLELY RESPONSIBLE FOR YOUR OWN
-ACTIONS!
-
-
-______
diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD
index 46a388a16..3804ed5a8 100644
--- a/extra/faad2/PKGBUILD
+++ b/extra/faad2/PKGBUILD
@@ -1,29 +1,39 @@
-# $Id: PKGBUILD 149405 2012-02-07 15:27:21Z eric $
+# $Id: PKGBUILD 197236 2013-10-24 15:27:20Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=faad2
 pkgver=2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="ISO AAC audio decoder"
 arch=('i686' 'x86_64')
 url="http://www.audiocoding.com/"
-license=('custom:GPL')
+license=('GPL')
 depends=('glibc')
-options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2
+        faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
+	faad2-2.7-libmp4ff-shared-lib.patch
+	faad2-2.7-man1_MANS.patch)
 sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5'
-          '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd')
+          '1cf28cfd32dbae6cc484b149fd6adfea33506544'
+          '247658aa795cd6d44a153fae8c5cb62e427f3ecf'
+          '4b548a08f7611a5f4f395c7c1d4cef5e37368af2')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/faad2-2.7-libmp4ff-shared-lib.patch"
+  patch -p0 -i "${srcdir}/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch"
+  patch -p1 -i "${srcdir}/faad2-2.7-man1_MANS.patch"
+  autoreconf --force --install
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make CFLAGS="${CFLAGS} -fPIC"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" manmdir=/usr/share/man/man1 install
-  mv "${pkgdir}/usr/share/man/man1/faad.man" "${pkgdir}/usr/share/man/man1/faad.1"
-  install -D -m644 common/mp4ff/mp4ff_int_types.h "${pkgdir}/usr/include/mp4ff_int_types.h"
-  install -D -m644 "${srcdir}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch b/extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
new file mode 100644
index 000000000..5d39cad95
--- /dev/null
+++ b/extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
@@ -0,0 +1,13 @@
+Install mp4ff_int_types.h for mythmusic.
+
+http://bugs.gentoo.org/275008
+
+--- common/mp4ff/Makefile.am
++++ common/mp4ff/Makefile.am
+@@ -1,5 +1,5 @@
+ lib_LTLIBRARIES = libmp4ff.la
+-include_HEADERS = mp4ff.h mp4ffint.h
++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
+ 
+ AM_CFLAGS = -DUSE_TAGGING=1
+ 
diff --git a/extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch b/extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch
new file mode 100644
index 000000000..56a131192
--- /dev/null
+++ b/extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch
@@ -0,0 +1,29 @@
+Ripped from Debian
+
+Patch to create a shared lib for libmp4ff.
+
+--- a/common/mp4ff/Makefile.am
++++ b/common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-lib_LIBRARIES = libmp4ff.a
++lib_LTLIBRARIES = libmp4ff.la
+ include_HEADERS = mp4ff.h mp4ffint.h
+ 
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++AM_CFLAGS = -DUSE_TAGGING=1
+ 
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++libmp4ff_la_LDFLAGS = -version-info 0:0:0
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
+--- a/frontend/Makefile.am
++++ b/frontend/Makefile.am
+@@ -5,7 +5,7 @@
+ 	   -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+-	     $(top_builddir)/common/mp4ff/libmp4ff.a
++	     $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ faad_SOURCES = main.c \
+ 	       audio.c audio.h \
diff --git a/extra/faad2/faad2-2.7-man1_MANS.patch b/extra/faad2/faad2-2.7-man1_MANS.patch
new file mode 100644
index 000000000..9c1ddb01b
--- /dev/null
+++ b/extra/faad2/faad2-2.7-man1_MANS.patch
@@ -0,0 +1,10 @@
+diff -ur faad2-2.7.orig/frontend/Makefile.am faad2-2.7/frontend/Makefile.am
+--- faad2-2.7.orig/frontend/Makefile.am	2009-02-06 18:03:37.000000000 +0200
++++ faad2-2.7/frontend/Makefile.am	2009-07-20 20:27:29.000000000 +0300
+@@ -1,5 +1,5 @@
+ bin_PROGRAMS = faad
+-man_MANS = faad.man
++man1_MANS = faad.man
+ 
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
+ 	   -I$(top_srcdir)/common/mp4ff
diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD
index 57be2dc1f..d4f9b62fb 100644
--- a/extra/glib/PKGBUILD
+++ b/extra/glib/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 191242 2013-07-22 06:31:51Z eric $
+# $Id: PKGBUILD 197238 2013-10-24 16:18:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glib
 pkgver=1.2.10
-pkgrel=10
+pkgrel=11
 pkgdesc="Common C routines used by Gtk+ and other libs"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('LGPL')
 depends=('glibc' 'sh')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=glib.install
 source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz
 	gcc340.patch aclocal-fixes.patch glib1-autotools.patch)
diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD
index b9b9a3647..1310530e8 100644
--- a/extra/gnet/PKGBUILD
+++ b/extra/gnet/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 191233 2013-07-21 23:25:28Z eric $
+# $Id: PKGBUILD 197240 2013-10-24 16:49:18Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gnet
 pkgver=2.0.8
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple network library"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GNetLibrary"
 license=('LGPL')
 depends=('glib2')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/gnet/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387')
 
diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD
index 94526a7a5..2c9c54ebd 100644
--- a/extra/gsasl/PKGBUILD
+++ b/extra/gsasl/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 170167 2012-11-04 02:30:50Z eric $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Orivej Desh <smpuj@bk.ru>
-# Maintainer: Orivej Desh <smpuj@bk.ru>
+# $Id: PKGBUILD 197247 2013-10-24 18:39:54Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gsasl
 pkgver=1.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
-arch=("i686" "x86_64")
+arch=('i686' 'x86_64')
 url="http://josefsson.org/gsasl/"
-license=("GPL")
+license=('GPL')
 depends=('gnutls' 'libidn' 'krb5' 'libgcrypt')
-source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz")
-md5sums=('982fe54a20016aa46a871c084c990c36')
+install=gsasl.install
+source=(ftp://ftp.gnu.org/gnu/gsasl/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('343fd97ae924dc406986c02fb9b889f4114239ae')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --with-gssapi-impl=mit
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la"
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gsasl/gsasl.install b/extra/gsasl/gsasl.install
new file mode 100644
index 000000000..b9b69f97e
--- /dev/null
+++ b/extra/gsasl/gsasl.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file=gsasl.info
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD
index c218906e7..24b355d64 100644
--- a/extra/gtk/PKGBUILD
+++ b/extra/gtk/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 191240 2013-07-22 03:45:27Z eric $
+# $Id: PKGBUILD 197249 2013-10-24 18:51:37Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=12
+pkgrel=13
 pkgdesc="GTK+ is a multi-platform toolkit (v1)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('LGPL')
 depends=('libxi' 'glib' 'sh')
 makedepends=('libxt')
-options=('!libtool')
 install=gtk.install
 source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz
         aclocal-fixes.patch)
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 47ca9dd9c..08ec66be4 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196817 2013-10-20 04:38:14Z eric $
+# $Id: PKGBUILD 197208 2013-10-24 01:16:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.7.1
+pkgver=6.8.7.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
         perlmagick.rpath.patch)
-sha1sums=('c8aabca18e0ca108b403dd154c858cb17ff304ee'
+sha1sums=('7dd54b769df1a8a173b76612bed131cd814e0e21'
           'SKIP'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
@@ -27,7 +27,7 @@ prepare() {
 
 build() {
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
     --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
     --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
     --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
diff --git a/extra/jasper/PKGBUILD b/extra/jasper/PKGBUILD
index 83df195b9..50f4f606f 100644
--- a/extra/jasper/PKGBUILD
+++ b/extra/jasper/PKGBUILD
@@ -1,36 +1,39 @@
-# $Id: PKGBUILD 168605 2012-10-13 11:47:31Z andyrtr $
+# $Id: PKGBUILD 197251 2013-10-24 19:18:50Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=jasper
 pkgver=1.900.1
-pkgrel=8
+pkgrel=9
 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
 arch=('i686' 'x86_64')
 url="http://www.ece.uvic.ca/~mdadams/jasper/"
 license=('custom:JasPer2.0')
 depends=('libjpeg' 'freeglut' 'libxmu' 'glu')
-options=('!libtool')
-source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch
+source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip
         patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch
-        jasper-1.900.1-CVE-2008-3522.patch)
+        jpc_dec.c.patch jasper-1.900.1-CVE-2008-3522.patch)
 sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191'
-          'c1a0176a15210c0af14d85e55ce566921957d780'
           'f298566fef08c8a589d072582112cd51c72c3983'
           '2483dba925670bf29f531d85d73c4e5ada513b01'
+          'c1a0176a15210c0af14d85e55ce566921957d780'
           '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/jpc_dec.c.patch"
   patch -p1 -i "${srcdir}/patch-libjasper-stepsizes-overflow.diff"
   patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch"
   patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index cc23a4cf6..2c7f732e4 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197007 2013-10-21 12:38:24Z tpowa $
+# $Id: PKGBUILD 197222 2013-10-24 08:15:10Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.16.0
-pkgrel=4
+pkgrel=5
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -13,7 +13,7 @@ makedepends=('ocaml')
 optdepends=('ocaml: for using the tools')
 DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u')
 source=(https://forge.ocamlcore.org/frs/download.php/979/lablgtk-${pkgver}.tar.gz)
-options=(!makeflags)
+options=(!makeflags staticlibs)
 
 build() {
   cd "${srcdir}/lablgtk-${pkgver}"
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index f23a19e33..187a1dab6 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -1,16 +1,14 @@
-# $Id: PKGBUILD 189259 2013-07-01 18:54:09Z eric $
+# $Id: PKGBUILD 197253 2013-10-24 19:34:40Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=lcms2
 pkgver=2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Small-footprint color management engine, version 2"
 arch=('i686' 'x86_64')
+url="http://www.littlecms.com"
 license=('MIT')
 depends=('libtiff')
-url="http://www.littlecms.com"
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('bab3470471fc7756c5fbe71be9a3c7d677d2ee7b')
 
diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD
index 30339145a..a896c159a 100644
--- a/extra/libmad/PKGBUILD
+++ b/extra/libmad/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 149402 2012-02-07 14:56:23Z eric $
+# $Id: PKGBUILD 197260 2013-10-24 19:49:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libmad
 pkgver=0.15.1b
-pkgrel=6
+pkgrel=7
 pkgdesc="A high-quality MPEG audio decoder"
 arch=('i686' 'x86_64')
 url="http://www.underbit.com/products/mad/"
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/mad/${pkgname}-${pkgver}.tar.gz{,.sign}
         libmad.patch amd64-64bit.diff frame_length.diff optimize.diff)
 sha1sums=('cac19cd00e1a907f3150cc040ccc077783496d76'
@@ -19,12 +18,16 @@ sha1sums=('cac19cd00e1a907f3150cc040ccc077783496d76'
           'b9c61ecacc6a6d47425d66f33327e0634cd8a33c'
           '3d5b958244ef0395ccdcb00344f2cf301ca07e34')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/libmad.patch"
   patch -p1 -i "${srcdir}/amd64-64bit.diff"
   patch -p1 -i "${srcdir}/frame_length.diff"
   patch -p1 -i "${srcdir}/optimize.diff"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   CFLAGS="$CFLAGS -ftree-vectorize -ftree-vectorizer-verbose=1"
   autoconf
   ./configure --prefix=/usr
@@ -32,6 +35,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD
index 87f3b2438..7f3bfdd1b 100644
--- a/extra/libmng/PKGBUILD
+++ b/extra/libmng/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 193685 2013-08-28 00:06:03Z eric $
+# $Id: PKGBUILD 197262 2013-10-24 20:00:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libmng
 pkgver=2.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
 arch=('i686' 'x86_64')
 url="http://www.libmng.com/"
 license=('custom')
 depends=('lcms2')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.asc}
         libmng-stdio.patch)
 sha1sums=('7dd35369ff5916e1823cbacef984ab1b87714b69'
diff --git a/extra/libqalculate/PKGBUILD b/extra/libqalculate/PKGBUILD
index 9e228f345..a888f1923 100644
--- a/extra/libqalculate/PKGBUILD
+++ b/extra/libqalculate/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 149451 2012-02-08 01:06:52Z eric $
+# $Id: PKGBUILD 197265 2013-10-24 20:11:40Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libqalculate
 pkgver=0.9.7
-pkgrel=3
+pkgrel=4
 pkgdesc="Multi-purpose desktop calculator"
 arch=('i686' 'x86_64')
 url="http://qalculate.sourceforge.net/"
 license=('GPL')
 depends=('libxml2' 'cln' 'glib2')
 makedepends=('perl-xml-parser')
-optdepends=('gnuplot: for plotting support' 'wget: for retrieval of exchange rates (not needed if you use one of the GUI)' 'gnome-vfs: for retrieval of exchange rates (not needed if you use one of the GUI)')
-options=('!libtool' '!makeflags')
+optdepends=('gnuplot: for plotting support' 
+            'wget: for retrieval of exchange rates (not needed if you use one of the GUI)'
+            'gnome-vfs: for retrieval of exchange rates (not needed if you use one of the GUI)')
+options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('c15f7f3a97995decf62cc964956fc1e374ecd78c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libsamplerate/PKGBUILD b/extra/libsamplerate/PKGBUILD
index 036b59fa0..3e09896a9 100644
--- a/extra/libsamplerate/PKGBUILD
+++ b/extra/libsamplerate/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 192312 2013-08-10 02:16:26Z eric $
+# $Id: PKGBUILD 197267 2013-10-24 20:17:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libsamplerate
 pkgver=0.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
 arch=('i686' 'x86_64')
 url="http://www.mega-nerd.com/SRC/index.html"
 license=('GPL')
 depends=('libsndfile')
-options=('!libtool')
 source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz{,.asc})
 sha1sums=('e5fe82c4786be2fa33ca6bd4897db4868347fe70'
           'SKIP')
diff --git a/extra/libsndfile/PKGBUILD b/extra/libsndfile/PKGBUILD
index cff3c6442..d72103a98 100644
--- a/extra/libsndfile/PKGBUILD
+++ b/extra/libsndfile/PKGBUILD
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD 149407 2012-02-07 15:40:58Z eric $
+# $Id: PKGBUILD 197269 2013-10-24 20:25:13Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libsndfile
 pkgver=1.0.25
-pkgrel=2
+pkgrel=3
 pkgdesc="A C library for reading and writing files containing sampled sound"
 arch=('i686' 'x86_64')
 url="http://www.mega-nerd.com/libsndfile"
 license=('LGPL')
 depends=('alsa-lib' 'flac' 'libvorbis')
 checkdepends=('python2')
-options=('!libtool')
 source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz{,.asc})
 sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e'
           'a93d26016730cb9fa214c753d079ee77dca1f326')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' src/binheader_writef_check.py \
     src/create_symbols_file.py programs/test-sndfile-metadata-set.py
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-sqlite
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD
index 08f0a1dac..8f2697ba2 100644
--- a/extra/libstroke/PKGBUILD
+++ b/extra/libstroke/PKGBUILD
@@ -1,44 +1,40 @@
-# $Id: PKGBUILD 137618 2011-09-10 07:13:27Z eric $
+# $Id: PKGBUILD 197273 2013-10-24 21:52:00Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libstroke
 pkgver=0.5.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A stroke (mouse gesture) translation library"
 arch=('i686' 'x86_64')
 url="http://etla.net/libstroke/"
 license=('GPL2')
 depends=('glibc')
-makedepends=('libx11' 'gtk')
-options=('!libtool')
-source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz \
-        libgstroke-Makefile.am.patch libstroke-Makefile.am.patch \
-        libstroke-0.5.1-m4_syntax.patch)
-md5sums=('51b9a4e309ac15cfcab96191eed03cb2'
-         '60bbaf355355c3c66c8015b0f7feca85'
-         '96413a77e1d39d1a3223e8eb6be8ef01'
-         '93c47eef46a0cc4011a246485c5a6620')
+makedepends=('libx11')
+source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz
+        libgstroke-Makefile.am.patch libstroke-Makefile.am.patch
+        libstroke-0.5.1-m4_syntax.patch libstroke-0.5.1-no_gtk1.patch)
 sha1sums=('48bd2b98faa8681ccd97eda7a09442845dbf1b7b'
           'a0c3bd9e894650475ba3049b0ef3d7f9580c203d'
           'ee5a3635c31dba00b070a942c512cc0d53056188'
-          'c9240937776b0572e3927e1c56d78309413c5209')
+          'c9240937776b0572e3927e1c56d78309413c5209'
+          'c79acd9712fa5c6b9a9ac21621c6858ec10d84dd')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../libgstroke-Makefile.am.patch
-  patch -p1 < ../libstroke-Makefile.am.patch
-  patch -p1 < ../libstroke-0.5.1-m4_syntax.patch
-
-  libtoolize --force --copy
-  aclocal
-  autoconf
-  automake --add-missing --force --copy
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/libgstroke-Makefile.am.patch"
+  patch -p1 -i "${srcdir}/libstroke-Makefile.am.patch"
+  patch -p1 -i "${srcdir}/libstroke-0.5.1-m4_syntax.patch"
+  patch -p1 -i "${srcdir}/libstroke-0.5.1-no_gtk1.patch"
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
+  autoreconf --force --install
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libstroke/libstroke-0.5.1-no_gtk1.patch b/extra/libstroke/libstroke-0.5.1-no_gtk1.patch
new file mode 100644
index 000000000..a099fb991
--- /dev/null
+++ b/extra/libstroke/libstroke-0.5.1-no_gtk1.patch
@@ -0,0 +1,33 @@
+--- libstroke-0.5.1/configure.in	2001-08-07 07:08:05.000000000 +0100
++++ libstroke-0.5.1b/configure.in	2006-11-28 01:49:26.000000000 +0000
+@@ -81,16 +81,9 @@
+ [  --with-mouse-footprints  Draw mouse footprints in X],
+ [AC_DEFINE(STROKE_MOUSE_FOOTPRINTS)])
+ 
+-dnl check for GTK
+-dnl we won't build libgstroke if it's not found
+-AC_MSG_CHECKING(gtk+ library)
+-AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes
+-  AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]),
+-  AC_MSG_WARN(
+-***** NOTE: The GNOME stroke support won't be built
+-)
+-  HAVE_LIBGTK=no,
+-)
++GTK_CFLAGS=""
++AC_SUBST(GTK_CFLAGS)
++HAVE_LIBGTK=no
+ AM_CONDITIONAL(HAVE_LIBGTK,        test "x$HAVE_LIBGTK" = "xyes")
+ 
+ 
+--- libstroke-0.5.1/Makefile.am	2001-08-07 07:03:12.000000000 +0100
++++ libstroke-0.5.1b/Makefile.am	2006-11-28 02:00:55.000000000 +0000
+@@ -10,7 +10,7 @@
+ EXTRA_DIST = COPYRIGHT CREDITS README.javastroke README.libgstroke
+ 
+ m4datadir=$(datadir)/aclocal
+-m4data_DATA=libstroke.m4 libgstroke.m4
++m4data_DATA=libstroke.m4
+ 
+ MOSTLYCLEANFILES = core *~
+ CLEANFILES = core *~
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index 2a76d717c..8ebf8fdcd 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193540 2013-08-22 21:13:54Z eric $
+# $Id: PKGBUILD 197204 2013-10-23 23:19:13Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libtiff
 pkgver=4.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Library for manipulation of TIFF images"
 arch=('i686' 'x86_64')
 url="http://www.remotesensing.org/libtiff/"
@@ -20,7 +20,8 @@ source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz
 	tiff-4.0.3-libjpeg-turbo.patch
 	tiff-4.0.3-tiff2pdf-colors.patch
 	tiff-4.0.3-CVE-2013-4231.patch
-	tiff-4.0.3-CVE-2013-4232.patch)
+	tiff-4.0.3-CVE-2013-4232.patch
+	libtiff-CVE-2013-4244.patch)
 sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0'
           '41be661638282dae0d07bd2788414cb6650f8981'
           '6cb3d480908132335c05c769b5a51f951413725d'
@@ -29,7 +30,8 @@ sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0'
           '02d57835df50d3f84587571ec52b36f5af838de2'
           '23443ad0bc130d70860b6cc6d19b69584ae7a6cc'
           '969f588e9da5991e7f17dddf69ae59424b05fa16'
-          '2a23c55d081bed74ac8dd99541a93d312cc72b64')
+          '2a23c55d081bed74ac8dd99541a93d312cc72b64'
+          '01c6792ba2470493da4d990edae8de6c13bd4670')
 
 prepare() {
   cd tiff-${pkgver}
@@ -39,9 +41,11 @@ prepare() {
   patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch"
   patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch"
   patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch"
+  patch -p1 -i "${srcdir}/libtiff-CVE-2013-4244.patch"
   cd tools
   patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4231.patch"
   patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4232.patch"
+
 }
 
 build() {
diff --git a/extra/libtiff/libtiff-CVE-2013-4244.patch b/extra/libtiff/libtiff-CVE-2013-4244.patch
new file mode 100644
index 000000000..792e07698
--- /dev/null
+++ b/extra/libtiff/libtiff-CVE-2013-4244.patch
@@ -0,0 +1,15 @@
+diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c
+index 375b152..2731273 100644
+--- a/tools/gif2tiff.c
++++ b/tools/gif2tiff.c
+@@ -402,6 +402,10 @@ process(register int code, unsigned char** fill)
+     }
+ 
+     if (oldcode == -1) {
++        if (code >= clear) {
++            fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear);
++            return 0;
++        }
+ 	*(*fill)++ = suffix[code];
+ 	firstchar = oldcode = code;
+ 	return 1;
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index f46993815..807b5477e 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197140 2013-10-22 17:14:15Z andrea $
+# $Id: PKGBUILD 197232 2013-10-24 13:09:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt4
 pkgver=4.8.5
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -32,7 +32,7 @@ source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pk
         'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
         'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
         'improve-cups-support.patch'
-        'qtbug-31579.patch' 'qtbug-32534.patch')
+        'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch')
 md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
          'a16638f4781e56e7887ff8212a322ecc'
          '8a28b3f52dbeb685d4b69440b520a3e1'
@@ -41,7 +41,8 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
          'b859c5673e5098c39f72b2252947049e'
          'c439c7731c25387352d8453ca7574971'
          '6ed8d26a8e4a9bba1f6c08fb99cc8357'
-         'bb0e0fa6ba953fa590d81ac612374e11')
+         'bb0e0fa6ba953fa590d81ac612374e11'
+         'db343dcae522bc90d802ad1e83b7f5dd')
 
 prepare() {
   cd ${_pkgfqn}
@@ -53,6 +54,8 @@ prepare() {
   patch -p1 -i "${srcdir}"/qtbug-31579.patch
   # (FS#36394) (QTBUG#32534)
   patch -p1 -i "${srcdir}"/qtbug-32534.patch
+  # (FS#36947) (QTBUG#32908)
+  patch -p1 -i "${srcdir}"/qtbug-32908.patch
 
   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
diff --git a/extra/qt4/qtbug-32908.patch b/extra/qt4/qtbug-32908.patch
new file mode 100644
index 000000000..f11fa4075
--- /dev/null
+++ b/extra/qt4/qtbug-32908.patch
@@ -0,0 +1,40 @@
+From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@digia.com>
+Date: Sat, 31 Aug 2013 21:22:47 +0200
+Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb layout."
+
+The change which attempted to fix QTBUG-15319 broke keyboard
+shortcuts for non latin keyboard layouts.
+
+This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
+regression.
+
+Task-number: QTBUG-32908
+
+Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
+Reviewed-by: David Faure <david.faure@kdab.com>
+---
+ src/gui/kernel/qkeymapper_x11.cpp |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
+index 005ff3f..7daa41d 100644
+--- a/src/gui/kernel/qkeymapper_x11.cpp
++++ b/src/gui/kernel/qkeymapper_x11.cpp
+@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event)
+ 
+     // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must
+     // always use them when determining the baseKeySym)
+-    // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to
+-    //       XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers.
+-    //       See https://bugreports.qt-project.org/browse/QTBUG-15319 .
+     KeySym baseKeySym;
+     uint consumedModifiers;
+-    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)),
++    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)),
+                          &consumedModifiers, &baseKeySym))
+         return QList<int>();
+ 
+-- 
+1.7.1
+