Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/lxappearance/PKGBUILD
	community/menu-cache/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/llvm/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/wireshark/PKGBUILD
	multilib/lib32-llvm/PKGBUILD
	testing/mdadm/PKGBUILD
	testing/udev/PKGBUILD

20 files changed, 596 insertions, 134 deletions

diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD
index 24a1e1c99..cd19fe056 100644
--- a/extra/capi4hylafax/PKGBUILD
+++ b/extra/capi4hylafax/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 157241 2012-04-26 13:40:50Z tpowa $
+# $Id: PKGBUILD 159422 2012-05-24 06:11:44Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=capi4hylafax
 pkgver=010300
-pkgrel=7
+pkgrel=8
 pkgdesc="capi plugin for hylafax to enable isdn faxing"
 arch=(i686 x86_64 'mips64el')
 url="ftp://ftp.avm.de/tools"
@@ -60,5 +60,5 @@ EOF
 md5sums=('d37dc652ac80d1525ef8693be55ee67f'
          '653b60695d21c128f020a86274ca9192'
          '1fe40c58289fa3ba625ce6fe2fdb3d07'
-         'a12164b2694490bfedb0cc861692e240'
+         'e2c085a00189ded0a659642c689a1be2'
          '7c41d4fa5c5ef7b1372813341fd0d02b')
diff --git a/extra/capi4hylafax/c2faxrecv.service b/extra/capi4hylafax/c2faxrecv.service
index 5e73e29e7..845d41504 100644
--- a/extra/capi4hylafax/c2faxrecv.service
+++ b/extra/capi4hylafax/c2faxrecv.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=CAPI to fax receive
 Requires=faxq.service
-After=faxq.service
+After=faxq.service mISDNcapid.service
 
 [Service]
 ExecStart=/usr/bin/c2faxrecv
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD
index 35e512182..e980aceb1 100644
--- a/extra/kdemultimedia/PKGBUILD
+++ b/extra/kdemultimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158483 2012-05-03 22:34:18Z andrea $
+# $Id: PKGBUILD 159443 2012-05-24 12:12:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,13 +11,13 @@ pkgname=('kdemultimedia-dragonplayer'
          'kdemultimedia-kscd'
          'kdemultimedia-mplayerthumbs')
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
-makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer'
-             'pulseaudio' 'libmusicbrainz3')
+makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse'
+             'libmusicbrainz3' 'taglib' 'libcanberra')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'mplayerthumbs.config')
 sha1sums=('8f2b9181d5ccab5a9efd62f2778cf6c2b88abb3e'
@@ -29,8 +29,8 @@ build() {
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX=/usr \
+        -DWITH_TunePimp=OFF
 	make
 }
 
@@ -55,7 +55,7 @@ package_kdemultimedia-ffmpegthumbs() {
 
 package_kdemultimedia-juk() {
 	pkgdesc='Music Player'
-	depends=('kdebase-runtime' 'tunepimp')
+    depends=('kdebase-runtime' 'taglib')
 	url="http://kde.org/applications/multimedia/juk"
 	install='kdemultimedia.install'
 	cd $srcdir/build/juk
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 9e73b73fa..96b257a88 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157403 2012-04-28 09:26:49Z allan $
+# $Id: PKGBUILD 159472 2012-05-24 20:02:15Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -10,40 +10,42 @@
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=3.0
-pkgrel=4
+pkgver=3.1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=('libffi' 'python2' 'ocaml')
-source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tar.gz
-        http://llvm.org/releases/$pkgver/clang-$pkgver.tar.gz
-        clang-plugin-loader-registry.patch
+source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
+        http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz
+        http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-$pkgver.src.tar.xz
+        llvm-Config-config.h
+        llvm-Config-llvm-config.h
         cindexer-clang-path.patch
         clang-pure64.patch
         enable-lto.patch
-        fix-gold-lto-linking.patch)
-sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477'
-            'b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d'
-            'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c'
+        clang-3.1-fix-libprofile_rt.a-location.patch)
+sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
+            'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786'
+            '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558'
+            '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
+            '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
             '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
             '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
-            'cf8922a932e1859f3783bef2af8ac1e90ce96f8eec79928392327b71b3d7cb89'
-            '24d275cdf170f53844bc7174b065fb51b6ddbb9642ced34702cde1f0f74d9192')
+            'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7'
+            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver.src"
 
-  # Build without -ftree-pre as a workaround for clang segfaulting on x86_64
-  # https://bugzilla.redhat.com/show_bug.cgi?id=791365
-  CFLAGS+=' -fno-tree-pre'
-  CXXFLAGS+=' -fno-tree-pre'
-
   # At the present, clang must reside inside the LLVM source code tree to build
   # See http://llvm.org/bugs/show_bug.cgi?id=4840
   rm -rf tools/clang
   cp -r "$srcdir/clang-$pkgver.src" tools/clang
 
+  rm -rf projects/compiler-rt
+  cp -r "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
+
   # Fix symbolic links from OCaml bindings to LLVM libraries
   sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
 
@@ -52,14 +54,15 @@ build() {
          -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \
          -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
     Makefile.config.in
+  sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib/llvm:' \
+    tools/llvm-config/llvm-config.cpp
+  sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib/llvm":' \
+    autoconf/configure.ac \
+    configure
 
   # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
   sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
 
-  # Get the correct list of symbols to export
-  # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html
-  patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch"
-
   # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
   patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
 
@@ -72,8 +75,9 @@ build() {
   # Use gold instead of default linker, and always use the plugin
   patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
 
-  # Fix libLTO.so location in gold plugin
-  patch -Np1 -i "$srcdir/fix-gold-lto-linking.patch"
+  # Fix FS#29984: [clang] -coverage is broken
+  patch -d tools/clang -Np1 -i \
+    "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch"
 
   # Apply strip option to configure
   _optimized_switch="enable"
@@ -82,6 +86,11 @@ build() {
   # Include location of libffi headers in CPPFLAGS
   export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
 
+  # Use Python 2
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+  export PATH="$srcdir/python2-path:$PATH"
+
   # Force the use of GCC instead of clang
   CC=gcc CXX=g++ \
   ./configure \
@@ -110,10 +119,6 @@ package_llvm() {
   # then we bring it back in for the clang package
   mv tools/clang "$srcdir"
 
-  # Copy missing file into the expected location
-  [[ $(check_option strip) == y ]] && _build_type=Release || _build_type=Debug
-  cp bindings/ocaml/llvm/META.llvm bindings/ocaml/llvm/$_build_type/
-
   # -j1 is due to race conditions during the installation of the OCaml bindings
   make -j1 DESTDIR="$pkgdir" install
   mv "$srcdir/clang" tools
@@ -128,9 +133,6 @@ package_llvm() {
   # Fix permissions of static libs
   chmod -x "$pkgdir"/usr/lib/llvm/*.a
 
-  # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
-  sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config"
-
   # Get rid of example Hello transformation
   rm "$pkgdir"/usr/lib/llvm/*LLVMHello.*
 
@@ -143,6 +145,16 @@ package_llvm() {
   install -d "$pkgdir/usr/lib/bfd-plugins"
   ln -s ../llvm/LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so"
 
+  if [[ $CARCH == x86_64 ]]; then
+    # Needed for multilib (https://bugs.archlinux.org/task/29951)
+    # Header stubs are taken from Fedora
+    for _header in config llvm-config; do
+      mv "$pkgdir/usr/include/llvm/Config/$_header"{,-64}.h
+      cp "$srcdir/llvm-Config-$_header.h" \
+        "$pkgdir/usr/include/llvm/Config/$_header.h"
+    done
+  fi
+
   install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
@@ -198,7 +210,9 @@ package_clang-analyzer() {
   done
 
   # Use Python 2
-  sed -i 's/env python$/&2/' \
+  sed -i \
+    -e 's|env python$|&2|' \
+    -e 's|/usr/bin/python$|&2|' \
     "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
     "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
 
diff --git a/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch b/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch
new file mode 100644
index 000000000..080aa4fca
--- /dev/null
+++ b/extra/llvm/clang-3.1-fix-libprofile_rt.a-location.patch
@@ -0,0 +1,12 @@
+diff -upr clang-3.1.src.orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
+--- clang-3.1.src.orig/lib/Driver/Tools.cpp	2012-04-19 00:32:25.000000000 +0300
++++ clang-3.1.src/lib/Driver/Tools.cpp	2012-05-23 21:12:08.000000000 +0300
+@@ -193,7 +193,7 @@ static void addProfileRT(const ToolChain
+   // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is
+   // not supported by old linkers.
+   std::string ProfileRT =
+-    std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a";
++    std::string(TC.getDriver().Dir) + "/../lib/llvm/libprofile_rt.a";
+ 
+   CmdArgs.push_back(Args.MakeArgString(ProfileRT));
+ }
diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch
index 3c8691b17..3205fbf69 100644
--- a/extra/llvm/enable-lto.patch
+++ b/extra/llvm/enable-lto.patch
@@ -16,11 +16,11 @@ Index: lib/Driver/Tools.cpp
 --- lib/Driver/Tools.cpp	(revision 123373)
 +++ lib/Driver/Tools.cpp	(working copy)
 @@ -3412,11 +3412,11 @@
-     }
-   }
- 
--  if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+  // if (Args.hasArg(options::OPT_use_gold_plugin)) {
+   // Tell the linker to load the plugin. This has to come before AddLinkerInputs
+   // as gold requires -plugin to come before any -plugin-opt that -Wl might
+   // forward.
+-  if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
++  // if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
      CmdArgs.push_back("-plugin");
 -    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
 +    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so";
@@ -28,5 +28,5 @@ Index: lib/Driver/Tools.cpp
 -  }
 +  // }
  
-   C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
+   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs);
  }
diff --git a/extra/llvm/llvm-Config-config.h b/extra/llvm/llvm-Config-config.h
new file mode 100644
index 000000000..c369b4551
--- /dev/null
+++ b/extra/llvm/llvm-Config-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "config-32.h"
+#elif __WORDSIZE == 64
+#include "config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/extra/llvm/llvm-Config-llvm-config.h b/extra/llvm/llvm-Config-llvm-config.h
new file mode 100644
index 000000000..2fa08c9be
--- /dev/null
+++ b/extra/llvm/llvm-Config-llvm-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "llvm-config-32.h"
+#elif __WORDSIZE == 64
+#include "llvm-config-64.h"
+#else
+#error "Unknown word size"
+#endif
diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD
index 9de576e21..63cfbf7c6 100644
--- a/extra/misdnuser/PKGBUILD
+++ b/extra/misdnuser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159134 2012-05-16 12:27:20Z tpowa $
+# $Id: PKGBUILD 159456 2012-05-24 13:58:07Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=misdnuser
-pkgver=2.0.13_20120513
+pkgver=2.0.13_20120524
 pkgrel=1
 pkgdesc="Tools and library for mISDN"
 arch=('i686' 'x86_64')
@@ -39,7 +39,8 @@ package() {
   install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service
   install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf
 }
-md5sums=('f61339c3a28a370cd971957e6ef07f5c'
+
+md5sums=('d9b400e9888042e75c14fb3a8c2885cb'
          '2009563b144de037ecb20f8d727a772e'
          '638b399f7e0937639960c4dfb3d5138e'
          '42c3b46880a68c3883ee1ed00af34b45')
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
index 65c934af6..b703d4fb2 100644
--- a/extra/opengtl/PKGBUILD
+++ b/extra/opengtl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148868 2012-02-05 11:53:26Z ibiru $
+# $Id: PKGBUILD 159432 2012-05-24 08:42:21Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andries Radu <admiral0@live.it>
 
 pkgname=opengtl
 pkgver=0.9.16
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
 url="http://www.opengtl.org"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,6 +17,11 @@ sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
 
 build() {
   cd "${srcdir}"
+  # Fix build with LLVM 3.1
+  sed -i 's/LLVM_VERSION STREQUAL "3.0"/LLVM_VERSION STREQUAL "3.1"/' \
+    OpenGTL-${pkgver}/CMakeLists.txt
+  sed -i 's/ConstantArray::get/ConstantDataArray::getString/' \
+    OpenGTL-${pkgver}/OpenGTL/GTLCore/AST/Expression.cpp
   mkdir build
   cd build
   cmake ../OpenGTL-${pkgver} \
diff --git a/extra/pm-utils/PKGBUILD b/extra/pm-utils/PKGBUILD
index 735400365..ea34f27b1 100644
--- a/extra/pm-utils/PKGBUILD
+++ b/extra/pm-utils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149612 2012-02-08 20:16:43Z pierre $
+# $Id: PKGBUILD 159434 2012-05-24 09:48:16Z bluewind $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=pm-utils
 pkgver=1.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Utilities and scripts for suspend and hibernate power management"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pm-utils.freedesktop.org"
@@ -16,14 +16,12 @@ source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
         02-logging-append.patch
         12-fix-intel-audio-powersave-hook.patch
         13-49bluetooth-sync.patch
-        14-disable-sata-alpm.patch
-        11netcfg)
+        14-disable-sata-alpm.patch)
 md5sums=('1742a556089c36c3a89eb1b957da5a60'
          'a45149617bf3eb8dc32e6d9e22ae715d'
          'edada31a7d722763513fbe705d95d19d'
          '298f78b873c03c025700d5da619ac134'
-         'd0040f7d30b6a0dd195b5401abbbbdb9'
-         '9839687c8787d99fd4ff36aa3238c27b')
+         'd0040f7d30b6a0dd195b5401abbbbdb9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -41,9 +39,6 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  # install additional hooks
-  install -m755 "${srcdir}/11netcfg" "${pkgdir}/usr/lib/pm-utils/sleep.d/"
-
   # nm >=0.8.2 has native udev suspend/resume support
   rm -f "${pkgdir}/usr/lib/pm-utils/sleep.d/55NetworkManager"
   
diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD
index 1ba25f17f..73bf3de67 100644
--- a/extra/qjackctl/PKGBUILD
+++ b/extra/qjackctl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151342 2012-02-25 14:50:45Z pierre $
+# $Id: PKGBUILD 159470 2012-05-24 18:44:02Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 
 pkgname=qjackctl
-pkgver=0.3.8
-pkgrel=2
+pkgver=0.3.9
+pkgrel=1
 pkgdesc="A Qt front-end for the JACK low-latency audio server"
 url="http://qjackctl.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('jack' 'qt')
 options=('!makeflags')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('8a0992c01e50d8be22064ab7b08fbc78')
+md5sums=('f932c916f43ba3251d3a9ed62a448e43')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index be87f4b35..6c5d12d48 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 156133 2012-04-14 10:06:17Z andrea $
+# $Id: PKGBUILD 159391 2012-05-23 12:59:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.1
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -15,23 +15,17 @@ makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbu
     'mysql' 'unixodbc' 'cups' 'gtk2')
 options=('!libtool')
 _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
-source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
+source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop'
-        'gcc47.patch'
         'improve-cups-support.patch'
-        'fix-buffer-overflow.patch'
-        'fix-cursortox-crash.patch'
 	'declarative-fix-sigbus.patch')
-md5sums=('7960ba8e18ca31f0c6e4895a312f92ff'
+md5sums=('3c1146ddf56247e16782f96910a8423b'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
          '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'd8a0e81075b290ddc18ecd33b9b7ee22'
          'c439c7731c25387352d8453ca7574971'
-         'c493dca3c11fffb9af6719c6735cb0d2'
-         '13171b6aec2f240be05feb968178f70e'
          'aac963d05a9d5733e2bfce9e26607f51')
 
 build() {
@@ -40,14 +34,6 @@ build() {
   # MIPS N32-specific fix, shouldn't affect correctness on other platforms.
   patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
 
-  patch -p1 -i "${srcdir}"/gcc47.patch
-  
-  # (FS#29158)
-  patch -p1 -i "${srcdir}"/fix-buffer-overflow.patch
-  
-  # (FS#29402) (QTBUG#24718)
-  patch -p1 -i "${srcdir}"/fix-cursortox-crash.patch
-
   # (FS#28381) (KDEBUG#180051)
   patch -p1 -i "${srcdir}"/improve-cups-support.patch
 
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index 94849c15f..5f4f6538c 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 146627 2012-01-14 15:25:15Z andrea $
+# $Id: PKGBUILD 159414 2012-05-23 22:31:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
 license=('LGPL2.1' 'GPL3')
-depends=('qt' 'gperf' 'bison' 'gstreamer0.10-base')
-makedepends=('python2' 'mesa' 'chrpath')
+depends=('qt' 'gstreamer0.10-base')
+makedepends=('python2' 'mesa' 'gperf')
 conflicts=('qt<4.8')
-#source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/QtWebKit-${pkgver}.tar.gz"
-        "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-4.8.0.tar.bz2"
-        'python2-path.patch')
-sha1sums=('283fc116882157df0474af496be73bb9b34cb001'
-          '0e44b27a0f71aceb91a89a2c28ab6331126518d9'
-          'b0ef3d5596171e3900a685df9bcfac3068ad6330')
+_qtver=4.8.2
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-source.tar.gz"
+        "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-${_qtver}.tar.xz"
+        'glibc.patch'
+        'fix-build.patch')
+sha1sums=('914d7cc099e5b6181c2d74fc7a74e1b4478b75a4'
+          '33c83272ed8110180ee6e7e3733e68cc513e2802'
+          '9e47ba5725a2ebd072b8bff31fa2f71aa83f0333'
+          'c6dfb001b0412a8adfcb7f1f565a24314a753448')
 
 build() {
-  cd "${srcdir}"/QtWebKit-${pkgver}
+  cd "${srcdir}"/${pkgname}-${pkgver}-source
 
   if [ "$CARCH" = "mips64el" ]; then
       # Fix MIPS N32 support.
@@ -31,28 +33,83 @@ build() {
           Source/JavaScriptCore/wtf/Platform.h
   fi
 
-  patch -p1 -i "${srcdir}"/python2-path.patch
+  patch -p1 -i "${srcdir}"/glibc.patch
+  patch -p1 -i "${srcdir}"/fix-build.patch
 
-  cd Tools/Scripts
-  ./build-webkit --qt \
-    --prefix=/usr \
-    --makeargs="${MAKEFLAGS}" \
-    --release \
-    --3d-canvas
+  # move headers
+  mv include Source/
+
+  cd Source
+  qmake
+  cd ../
+
+  make -C Source
 
   # Build the QWebView plugin (FS#27914)
-  cd "${srcdir}"/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview
+  cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview
   qmake
   make
 }
 
 package() {
-  cd "${srcdir}"/QtWebKit-${pkgver}
-  make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
+  cd "${srcdir}"/${pkgname}-${pkgver}-source
+  make INSTALL_ROOT="${pkgdir}" -C Source install
 
-  # Fix RPATH
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
-
-  cd "${srcdir}"/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview
+  cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview
   make INSTALL_ROOT="${pkgdir}" install
 }
+
+_source() {
+  local _current_dir=$(pwd)
+  local _tmp=$(mktemp -d --tmpdir)
+
+  cd _tmp
+  git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git
+
+  # fetch the make-package.py script
+  git clone git://qt.gitorious.org/qtwebkit/tools.git
+
+  # create the qtwebkit tarball
+  cd qtwebkit
+  git checkout -b ${pkgname}-${pkgver} ${pkgname}-${pkgver}
+
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    ../tools/make-package.py
+  python2 ../tools/make-package.py
+
+  mv ${pkgname}-${pkgver}-source.tar.gz ${_current_dir}/
+
+  cd ..
+  
+  # create the qwebview plugin tarball
+  mkdir qwebview-${_qtver}
+  cd qwebview-${_qtver}
+  wget http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz
+  tar xf qt-everywhere-opensource-src-${_qtver}.tar.gz
+  mkdir -p ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/
+  cp -ra qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview \
+    ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/
+
+  cat > ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pro <<"EOF"
+TEMPLATE = subdirs
+CONFIG += ordered
+
+REQUIRES = !CONFIG(static,shared|static)
+contains(QT_CONFIG, webkit): SUBDIRS += qwebview
+EOF
+
+  cat > $(_tmp)/header.txt <<"EOF"
+INCLUDEPATH += ../../../Source/include
+LIBS += -L../../../Source/lib
+
+EOF
+
+  cat $(_tmp)/header.txt qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/plugins.pri > \
+    ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pri
+
+  tar cJf qwebview-${_qtver}.tar.xz ${pkgname}-${pkgver}-source
+
+  mv qwebview-${_qtver}.tar.xz ${_current_dir}/
+
+  rm -rf ${_tmp}
+}
diff --git a/extra/qtwebkit/fix-build.patch b/extra/qtwebkit/fix-build.patch
new file mode 100644
index 000000000..46313bbe9
--- /dev/null
+++ b/extra/qtwebkit/fix-build.patch
@@ -0,0 +1,36 @@
+diff -up qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror qtwebkit-2.2.2-source/Source/WebKit.pri
+--- qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror	2012-05-22 09:30:37.000000000 -0500
++++ qtwebkit-2.2.2-source/Source/WebKit.pri	2012-05-22 09:51:42.126610618 -0500
+@@ -102,7 +102,7 @@ CONFIG -= warn_on
+ 
+ # Treat warnings as errors on x86/Linux/GCC
+ linux-g++* {
+-    !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
++    #!CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror
+ 
+     greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) {
+         if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
+
+diff -up webkit-qtwebkit/Source/common.pri.me webkit-qtwebkit/Source/common.pri
+--- webkit-qtwebkit/Source/common.pri.me	2012-01-24 14:51:49.000000000 +0100
++++ webkit-qtwebkit/Source/common.pri	2012-01-24 14:52:01.000000000 +0100
+@@ -3,12 +3,12 @@
+ contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
+ contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
+ 
+-linux-g++ {
+-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
+-    message(Using gold linker)
+-    QMAKE_LFLAGS+=-fuse-ld=gold
+-}
+-}
++#linux-g++ {
++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
++#    message(Using gold linker)
++#    QMAKE_LFLAGS+=-fuse-ld=gold
++#}
++#}
+ 
+ # We use this flag on production branches
+ # See https://bugs.webkit.org/show_bug.cgi?id=60824
+diff -up webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h.me webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h
diff --git a/extra/qtwebkit/glibc.patch b/extra/qtwebkit/glibc.patch
new file mode 100644
index 000000000..bd7cb9416
--- /dev/null
+++ b/extra/qtwebkit/glibc.patch
@@ -0,0 +1,339 @@
+diff -up webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am
+--- webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231	2011-11-09 16:32:47.000000000 +0100
++++ webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am	2011-12-21 12:50:19.000000000 +0100
+@@ -438,7 +438,6 @@ javascriptcore_sources += \
+ 	Source/JavaScriptCore/wtf/gobject/GRefPtr.h \
+ 	Source/JavaScriptCore/wtf/gobject/GTypedefs.h \
+ 	Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
+-	Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
+ 	Source/JavaScriptCore/wtf/HashCountedSet.h \
+ 	Source/JavaScriptCore/wtf/HashFunctions.h \
+ 	Source/JavaScriptCore/wtf/HashIterators.h \
+diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp
+--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231	2011-11-09 16:32:47.000000000 +0100
++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp	2011-12-21 12:50:19.000000000 +0100
+@@ -37,18 +37,6 @@ template <> void freeOwnedGPtr<GList>(GL
+     g_list_free(ptr);
+ }
+ 
+-template <> void freeOwnedGPtr<GCond>(GCond* ptr)
+-{
+-    if (ptr)
+-        g_cond_free(ptr);
+-}
+-
+-template <> void freeOwnedGPtr<GMutex>(GMutex* ptr)
+-{
+-    if (ptr)
+-        g_mutex_free(ptr);
+-}
+-
+ template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr)
+ {
+     if (ptr)
+diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h
+--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231	2011-11-09 16:32:47.000000000 +0100
++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h	2011-12-21 12:50:19.000000000 +0100
+@@ -35,8 +35,6 @@ namespace WTF {
+ template <typename T> inline void freeOwnedGPtr(T* ptr);
+ template<> void freeOwnedGPtr<GError>(GError*);
+ template<> void freeOwnedGPtr<GList>(GList*);
+-template<> void freeOwnedGPtr<GCond>(GCond*);
+-template<> void freeOwnedGPtr<GMutex>(GMutex*);
+ template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
+ template<> void freeOwnedGPtr<GDir>(GDir*);
+ 
+diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231	2011-11-09 16:32:47.000000000 +0100
++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h	2011-12-21 12:50:19.000000000 +0100
+@@ -39,7 +39,6 @@ typedef void* gpointer;
+ typedef struct _GAsyncResult GAsyncResult;
+ typedef struct _GCancellable GCancellable;
+ typedef struct _GCharsetConverter GCharsetConverter;
+-typedef struct _GCond GCond;
+ typedef struct _GDir GDir;
+ typedef struct _GdkAtom* GdkAtom;
+ typedef struct _GdkCursor GdkCursor;
+@@ -52,7 +51,6 @@ typedef struct _GFile GFile;
+ typedef struct _GHashTable GHashTable;
+ typedef struct _GInputStream GInputStream;
+ typedef struct _GList GList;
+-typedef struct _GMutex GMutex;
+ typedef struct _GPatternSpec GPatternSpec;
+ typedef struct _GPollableOutputStream GPollableOutputStream;
+ typedef struct _GSocketClient GSocketClient;
+diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp
+--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231	2011-12-21 12:52:25.000000000 +0100
++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp	2011-12-21 12:52:28.000000000 +0100
+@@ -1,248 +0,0 @@
+-/*
+- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+- * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1.  Redistributions of source code must retain the above copyright
+- *     notice, this list of conditions and the following disclaimer.
+- * 2.  Redistributions in binary form must reproduce the above copyright
+- *     notice, this list of conditions and the following disclaimer in the
+- *     documentation and/or other materials provided with the distribution.
+- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
+- *     its contributors may be used to endorse or promote products derived
+- *     from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+- */
+-
+-#include "config.h"
+-#include "Threading.h"
+-
+-#if !USE(PTHREADS)
+-
+-#include "CurrentTime.h"
+-#include "HashMap.h"
+-#include "MainThread.h"
+-#include "RandomNumberSeed.h"
+-#include <wtf/StdLibExtras.h>
+-
+-#include <glib.h>
+-#include <limits.h>
+-
+-namespace WTF {
+-
+-typedef HashMap<ThreadIdentifier, GThread*> ThreadMap;
+-
+-static Mutex* atomicallyInitializedStaticMutex;
+-
+-static Mutex& threadMapMutex()
+-{
+-    DEFINE_STATIC_LOCAL(Mutex, mutex, ());
+-    return mutex;
+-}
+-
+-void initializeThreading()
+-{
+-    if (!g_thread_supported())
+-        g_thread_init(NULL);
+-    ASSERT(g_thread_supported());
+-
+-    if (!atomicallyInitializedStaticMutex) {
+-        atomicallyInitializedStaticMutex = new Mutex;
+-        threadMapMutex();
+-        initializeRandomNumberGenerator();
+-    }
+-}
+-
+-void lockAtomicallyInitializedStaticMutex()
+-{
+-    ASSERT(atomicallyInitializedStaticMutex);
+-    atomicallyInitializedStaticMutex->lock();
+-}
+-
+-void unlockAtomicallyInitializedStaticMutex()
+-{
+-    atomicallyInitializedStaticMutex->unlock();
+-}
+-
+-static ThreadMap& threadMap()
+-{
+-    DEFINE_STATIC_LOCAL(ThreadMap, map, ());
+-    return map;
+-}
+-
+-static ThreadIdentifier identifierByGthreadHandle(GThread*& thread)
+-{
+-    MutexLocker locker(threadMapMutex());
+-
+-    ThreadMap::iterator i = threadMap().begin();
+-    for (; i != threadMap().end(); ++i) {
+-        if (i->second == thread)
+-            return i->first;
+-    }
+-
+-    return 0;
+-}
+-
+-static ThreadIdentifier establishIdentifierForThread(GThread*& thread)
+-{
+-    ASSERT(!identifierByGthreadHandle(thread));
+-
+-    MutexLocker locker(threadMapMutex());
+-
+-    static ThreadIdentifier identifierCount = 1;
+-
+-    threadMap().add(identifierCount, thread);
+-
+-    return identifierCount++;
+-}
+-
+-static GThread* threadForIdentifier(ThreadIdentifier id)
+-{
+-    MutexLocker locker(threadMapMutex());
+-
+-    return threadMap().get(id);
+-}
+-
+-static void clearThreadForIdentifier(ThreadIdentifier id)
+-{
+-    MutexLocker locker(threadMapMutex());
+-
+-    ASSERT(threadMap().contains(id));
+-
+-    threadMap().remove(id);
+-}
+-
+-ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*)
+-{
+-    GThread* thread;
+-    if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) {
+-        LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data);
+-        return 0;
+-    }
+-
+-    ThreadIdentifier threadID = establishIdentifierForThread(thread);
+-    return threadID;
+-}
+-
+-void initializeCurrentThreadInternal(const char*)
+-{
+-}
+-
+-int waitForThreadCompletion(ThreadIdentifier threadID, void** result)
+-{
+-    ASSERT(threadID);
+-
+-    GThread* thread = threadForIdentifier(threadID);
+-
+-    void* joinResult = g_thread_join(thread);
+-    if (result)
+-        *result = joinResult;
+-
+-    clearThreadForIdentifier(threadID);
+-    return 0;
+-}
+-
+-void detachThread(ThreadIdentifier)
+-{
+-}
+-
+-ThreadIdentifier currentThread()
+-{
+-    GThread* currentThread = g_thread_self();
+-    if (ThreadIdentifier id = identifierByGthreadHandle(currentThread))
+-        return id;
+-    return establishIdentifierForThread(currentThread);
+-}
+-
+-void yield()
+-{
+-    g_thread_yield();
+-}
+-
+-Mutex::Mutex()
+-    : m_mutex(g_mutex_new())
+-{
+-}
+-
+-Mutex::~Mutex()
+-{
+-}
+-
+-void Mutex::lock()
+-{
+-    g_mutex_lock(m_mutex.get());
+-}
+-
+-bool Mutex::tryLock()
+-{
+-    return g_mutex_trylock(m_mutex.get());
+-}
+-
+-void Mutex::unlock()
+-{
+-    g_mutex_unlock(m_mutex.get());
+-}
+-
+-ThreadCondition::ThreadCondition()
+-    : m_condition(g_cond_new())
+-{
+-}
+-
+-ThreadCondition::~ThreadCondition()
+-{
+-}
+-
+-void ThreadCondition::wait(Mutex& mutex)
+-{
+-    g_cond_wait(m_condition.get(), mutex.impl().get());
+-}
+-
+-bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime)
+-{
+-    // Time is in the past - return right away.
+-    if (absoluteTime < currentTime())
+-        return false;
+-    
+-    // Time is too far in the future for g_cond_timed_wait - wait forever.
+-    if (absoluteTime > INT_MAX) {
+-        wait(mutex);
+-        return true;
+-    }
+-
+-    int timeSeconds = static_cast<int>(absoluteTime);
+-    int timeMicroseconds = static_cast<int>((absoluteTime - timeSeconds) * 1000000.0);
+-    
+-    GTimeVal targetTime;
+-    targetTime.tv_sec = timeSeconds;
+-    targetTime.tv_usec = timeMicroseconds;
+-
+-    return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime);
+-}
+-
+-void ThreadCondition::signal()
+-{
+-    g_cond_signal(m_condition.get());
+-}
+-
+-void ThreadCondition::broadcast()
+-{
+-    g_cond_broadcast(m_condition.get());
+-}
+-
+-
+-}
+-
+-#endif // !USE(PTHREADS)
+diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h
+--- webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231	2011-11-09 16:32:47.000000000 +0100
++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h	2011-12-21 12:50:19.000000000 +0100
+@@ -44,8 +44,6 @@
+ 
+ #if USE(PTHREADS)
+ #include <pthread.h>
+-#elif PLATFORM(GTK)
+-#include "GOwnPtr.h"
+ #endif
+ 
+ #if PLATFORM(QT)
+@@ -66,10 +64,6 @@ typedef pthread_rwlock_t PlatformReadWri
+ typedef void* PlatformReadWriteLock;
+ #endif
+ typedef pthread_cond_t PlatformCondition;
+-#elif PLATFORM(GTK)
+-typedef GOwnPtr<GMutex> PlatformMutex;
+-typedef void* PlatformReadWriteLock; // FIXME: Implement.
+-typedef GOwnPtr<GCond> PlatformCondition;
+ #elif PLATFORM(QT)
+ typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex;
+ typedef void* PlatformReadWriteLock; // FIXME: Implement.
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index c4af9200b..54235bfd4 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 159275 2012-05-20 10:17:15Z andyrtr $
+# $Id: PKGBUILD 159464 2012-05-24 16:48:31Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl')
-_amalgamationver=3071200
+_amalgamationver=3071201
 _amalgamationver2=${_amalgamationver/00/}
 #pkgver=${_amalgamationver2//0/.}
-pkgver=3.7.12
-pkgrel=2
+pkgver=3.7.12.1
+pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with
 	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!libtool' '!emptydirs')
-md5sums=('28842cb51a699c0b554120bafe6418ff'
+md5sums=('eb7bbd258913518ad30971ea7ecb0ca9'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 5a3ba5468..920d08a1c 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 156457 2012-04-18 12:20:57Z stephane $
+# $Id: PKGBUILD 159359 2012-05-22 14:33:28Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.4
-pkgrel=3
+pkgver=1.7.5
+pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
 license=('APACHE')
 depends=('neon' 'apr-util' 'sqlite' 'file')
 optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
-            'python2: for some hook scripts' 'ruby: for some hook scripts' 'java-environment')
+            'python2: for some hook scripts') # 'ruby: for some hook scripts' 'java-environment')
 makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
              'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
 [ "$CARCH" = "mips64el" ] && \
@@ -23,8 +23,8 @@ provides=('svn')
 options=('!makeflags' '!libtool' '!emptydirs')
 source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve svn svnserve.conf subversion.rpath.fix.patch)
-sha1sums=('57a3cd351c1dbedddd020e7a1952df6cd2674527'
-          'eebe0be6d539bf7dc37cf01b3c738072f1d9197b'
+sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1'
+          'b267cba19b4f56360657a5bf5b231950e027a45a'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
@@ -74,10 +74,10 @@ package() {
 
    install -d "${pkgdir}"/usr/share/subversion
    cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
-   rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
+   rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
 
-   rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
-   rm -rf "${pkgdir}"/usr/lib/perl5/core_perl
+   rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
+   rm -r "${pkgdir}"/usr/lib/perl5/core_perl
 
    install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
    install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
@@ -88,5 +88,4 @@ package() {
    for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
       ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
    done
-
 }
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 4c02876de..4162a8664 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 156045 2012-04-12 07:21:32Z ibiru $
+# $Id: PKGBUILD 159387 2012-05-22 23:09:02Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.51
+pkgver=2.52
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
@@ -11,7 +11,7 @@ license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
 source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
         transmissiond transmissiond.conf)
-md5sums=('47bfbb133f5f997a48b54f7a350d84ea'
+md5sums=('b50cc87b4cd77ba0cbda98b5568a4d07'
          '08875299e3fbb68fc546c1f350ac1f06'
          'be39806c35b7544856fa4070b00fc960')
 
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 8159e9582..2307f13d7 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 156655 2012-04-22 13:28:46Z guillaume $
+# $Id: PKGBUILD 159382 2012-05-22 20:52:55Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.6.7
-pkgrel=2
+pkgver=1.6.8
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('7e39f1c0ea4abd8bffa5122df800ca5d')
+md5sums=('dcdc5f4904af5804b622c955a30974e2')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"