diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-15 03:26:32 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-15 03:26:32 +0000 |
| commit | ad45d1982b97faa9372d99e51daa687c7c09de7d (patch) | |
| tree | af490221f2b733b8f0cf68f3898566d5049c3ab4 /extra/webkitgtk | |
| parent | 7c266ff5a9e1f533fd8bd8c2fbbcc05df350dcd3 (diff) | |
Tue Apr 15 03:22:01 UTC 2014
Diffstat (limited to 'extra/webkitgtk')
| -rw-r--r-- | extra/webkitgtk/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/webkitgtk/fix-pretty-quotes.patch | 26 |
2 files changed, 39 insertions, 6 deletions
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 0e32d59ca..75c614adf 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 206637 2014-03-03 22:06:04Z heftig $ +# $Id: PKGBUILD 210544 2014-04-14 20:07:41Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=webkitgtk pkgname=(webkitgtk webkitgtk2) -pkgver=2.2.5 -pkgrel=2 +pkgver=2.4.0 +pkgrel=1 pkgdesc="GTK+ Web content engine library" arch=(i686 x86_64) url="http://webkitgtk.org/" @@ -12,12 +12,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() ( @@ -42,7 +49,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) diff --git a/extra/webkitgtk/fix-pretty-quotes.patch b/extra/webkitgtk/fix-pretty-quotes.patch new file mode 100644 index 000000000..fce4a8e20 --- /dev/null +++ b/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, |