extra/webkitgtk to 2.4.0-1

extra/webkitgtk/PKGBUILD

@@ -2,13 +2,12 @@
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - re-enabled --disable-silent-rules, needed for v5 and v6 to build
 #  - use --disable-jit to solve segfaults
 
-pkgbase=webkitgtk
+kgbase=webkitgtk
 pkgname=(webkitgtk webkitgtk2)
-pkgver=2.2.5
-pkgrel=2.1
+pkgver=2.4.0
+pkgrel=1
 pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64)
 url="http://webkitgtk.org/"
@@ -16,12 +15,19 @@ license=(custom)
 depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gst-plugins-base-libs
          libsecret libwebp harfbuzz-icu)
 makedepends=(gtk3 gtk2 gperf gobject-introspection python mesa ruby gtk-doc)
+optdepends=('gst-plugins-base: free media decoding'
+            'gst-plugins-good: media decoding'
+            'gst-libav: nonfree media decoding')
 options=(!emptydirs)
-source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('c710994a1ed0ec78f746a05ae7dc65369ed56d7475f0de576ca7a73ad9c6e670')
+source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
+        fix-pretty-quotes.patch)
+sha256sums=('dc5277cda89ee038408f78c94b1b07f101997f01ef877a142ffedac3b537dfbb'
+            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
 
 prepare() {
   mkdir build-gtk{,2}
+  cd $pkgbase-$pkgver
+  patch -Np0 -i ../fix-pretty-quotes.patch
 }
 
 _build() (
@@ -46,7 +52,7 @@ build() {
 
 package_webkitgtk() {
   depends+=(gtk3)
-  optdepends=('gtk2: Netscape plugin support')
+  optdepends+=('gtk2: Netscape plugin support')
   provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
   conflicts=(webkitgtk3 libwebkit3)
   replaces=(webkitgtk3 libwebkit3)

extra/webkitgtk/fix-pretty-quotes.patch

@@ -0,0 +1,26 @@
+Pretty quotes in licence break Python stdin.
+
+https://bugs.webkit.org/show_bug.cgi?id=128971
+
+--- Source/WebCore/xml/XMLViewer.css.orig	2014-01-23 16:49:58.000000000 +0000
++++ Source/WebCore/xml/XMLViewer.css
+@@ -14,7 +14,7 @@
+  * distribution.
+  *
+  * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
+- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * "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 GOOGLE INC.
+  * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+--- Source/WebCore/xml/XMLViewer.js.orig	2014-01-23 16:49:58.000000000 +0000
++++ Source/WebCore/xml/XMLViewer.js
+@@ -15,7 +15,7 @@
+  * distribution.
+  *
+  * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. AND ITS CONTRIBUTORS
+- * “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * "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 GOOGLE INC.
+  * OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,