Date: Saturday, May 24, 2014 @ 17:45:22 Author: heftig Revision: 213550
archrelease: copy trunk to extra-i686, extra-x86_64 Added: webkitgtk/repos/extra-i686/PKGBUILD (from rev 213549, webkitgtk/trunk/PKGBUILD) webkitgtk/repos/extra-i686/fix-pretty-quotes.patch (from rev 213549, webkitgtk/trunk/fix-pretty-quotes.patch) webkitgtk/repos/extra-x86_64/PKGBUILD (from rev 213549, webkitgtk/trunk/PKGBUILD) webkitgtk/repos/extra-x86_64/fix-pretty-quotes.patch (from rev 213549, webkitgtk/trunk/fix-pretty-quotes.patch) Deleted: webkitgtk/repos/extra-i686/PKGBUILD webkitgtk/repos/extra-i686/fix-pretty-quotes.patch webkitgtk/repos/extra-x86_64/PKGBUILD webkitgtk/repos/extra-x86_64/fix-pretty-quotes.patch --------------------------------------+ /PKGBUILD | 144 +++++++++++++++++++++++++++++++++ /fix-pretty-quotes.patch | 52 +++++++++++ extra-i686/PKGBUILD | 72 ---------------- extra-i686/fix-pretty-quotes.patch | 26 ----- extra-x86_64/PKGBUILD | 72 ---------------- extra-x86_64/fix-pretty-quotes.patch | 26 ----- 6 files changed, 196 insertions(+), 196 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-05-24 15:32:11 UTC (rev 213549) +++ extra-i686/PKGBUILD 2014-05-24 15:45:22 UTC (rev 213550) @@ -1,72 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase=webkitgtk -pkgname=(webkitgtk webkitgtk2) -pkgver=2.4.1 -pkgrel=1 -pkgdesc="GTK+ Web content engine library" -arch=(i686 x86_64) -url="http://webkitgtk.org/" -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 - fix-pretty-quotes.patch) -sha256sums=('6eed5d41ecdcfbafe3c2fbb0f0b79b9cda87a5ea0e7d0938afb6c6c82996e2f7' - '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') - -prepare() { - mkdir build-gtk{,2} - cd $pkgbase-$pkgver - patch -Np0 -i ../fix-pretty-quotes.patch -} - -_build() ( - _ver="$1"; shift - cd build-${_ver} - - ../$pkgbase-$pkgver/configure --prefix=/usr \ - --libexecdir=/usr/lib/webkit${_ver} \ - --enable-introspection \ - "$@" - - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make all stamp-po -) - -build() { - _build gtk --enable-gtk-doc - _build gtk2 --disable-webkit2 --with-gtk=2.0 -} - -package_webkitgtk() { - depends+=(gtk3) - optdepends+=('gtk2: Netscape plugin support') - provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") - conflicts=(webkitgtk3 libwebkit3) - replaces=(webkitgtk3 libwebkit3) - - make -C build-gtk -j1 DESTDIR="$pkgdir" install - install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ - "$pkgdir/usr/share/licenses/webkitgtk/LICENSE" -} - -package_webkitgtk2() { - pkgdesc+=" for GTK2" - depends+=(gtk2) - provides=("libwebkit=${pkgver}") - conflicts=(libwebkit) - replaces=(libwebkit) - - make -C build-gtk2 -j1 DESTDIR="$pkgdir" install - install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ - "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE" -} Copied: webkitgtk/repos/extra-i686/PKGBUILD (from rev 213549, webkitgtk/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-05-24 15:45:22 UTC (rev 213550) @@ -0,0 +1,72 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=webkitgtk +pkgname=(webkitgtk webkitgtk2) +pkgver=2.4.2 +pkgrel=1 +pkgdesc="GTK+ Web content engine library" +arch=(i686 x86_64) +url="http://webkitgtk.org/" +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 + fix-pretty-quotes.patch) +sha256sums=('cac8385c3b8a956793eb6b67712c23297a39e5f8b429523f32bbdcdf9c21d00a' + '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') + +prepare() { + mkdir build-gtk{,2} + cd $pkgbase-$pkgver + patch -Np0 -i ../fix-pretty-quotes.patch +} + +_build() ( + _ver="$1"; shift + cd build-${_ver} + + ../$pkgbase-$pkgver/configure --prefix=/usr \ + --libexecdir=/usr/lib/webkit${_ver} \ + --enable-introspection \ + "$@" + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make all stamp-po +) + +build() { + _build gtk --enable-gtk-doc + _build gtk2 --disable-webkit2 --with-gtk=2.0 +} + +package_webkitgtk() { + depends+=(gtk3) + optdepends+=('gtk2: Netscape plugin support') + provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") + conflicts=(webkitgtk3 libwebkit3) + replaces=(webkitgtk3 libwebkit3) + + make -C build-gtk -j1 DESTDIR="$pkgdir" install + install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ + "$pkgdir/usr/share/licenses/webkitgtk/LICENSE" +} + +package_webkitgtk2() { + pkgdesc+=" for GTK2" + depends+=(gtk2) + provides=("libwebkit=${pkgver}") + conflicts=(libwebkit) + replaces=(libwebkit) + + make -C build-gtk2 -j1 DESTDIR="$pkgdir" install + install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ + "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE" +} Deleted: extra-i686/fix-pretty-quotes.patch =================================================================== --- extra-i686/fix-pretty-quotes.patch 2014-05-24 15:32:11 UTC (rev 213549) +++ extra-i686/fix-pretty-quotes.patch 2014-05-24 15:45:22 UTC (rev 213550) @@ -1,26 +0,0 @@ -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, Copied: webkitgtk/repos/extra-i686/fix-pretty-quotes.patch (from rev 213549, webkitgtk/trunk/fix-pretty-quotes.patch) =================================================================== --- extra-i686/fix-pretty-quotes.patch (rev 0) +++ extra-i686/fix-pretty-quotes.patch 2014-05-24 15:45:22 UTC (rev 213550) @@ -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, Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-05-24 15:32:11 UTC (rev 213549) +++ extra-x86_64/PKGBUILD 2014-05-24 15:45:22 UTC (rev 213550) @@ -1,72 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> - -pkgbase=webkitgtk -pkgname=(webkitgtk webkitgtk2) -pkgver=2.4.1 -pkgrel=1 -pkgdesc="GTK+ Web content engine library" -arch=(i686 x86_64) -url="http://webkitgtk.org/" -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 - fix-pretty-quotes.patch) -sha256sums=('6eed5d41ecdcfbafe3c2fbb0f0b79b9cda87a5ea0e7d0938afb6c6c82996e2f7' - '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') - -prepare() { - mkdir build-gtk{,2} - cd $pkgbase-$pkgver - patch -Np0 -i ../fix-pretty-quotes.patch -} - -_build() ( - _ver="$1"; shift - cd build-${_ver} - - ../$pkgbase-$pkgver/configure --prefix=/usr \ - --libexecdir=/usr/lib/webkit${_ver} \ - --enable-introspection \ - "$@" - - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make all stamp-po -) - -build() { - _build gtk --enable-gtk-doc - _build gtk2 --disable-webkit2 --with-gtk=2.0 -} - -package_webkitgtk() { - depends+=(gtk3) - optdepends+=('gtk2: Netscape plugin support') - provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") - conflicts=(webkitgtk3 libwebkit3) - replaces=(webkitgtk3 libwebkit3) - - make -C build-gtk -j1 DESTDIR="$pkgdir" install - install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ - "$pkgdir/usr/share/licenses/webkitgtk/LICENSE" -} - -package_webkitgtk2() { - pkgdesc+=" for GTK2" - depends+=(gtk2) - provides=("libwebkit=${pkgver}") - conflicts=(libwebkit) - replaces=(libwebkit) - - make -C build-gtk2 -j1 DESTDIR="$pkgdir" install - install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ - "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE" -} Copied: webkitgtk/repos/extra-x86_64/PKGBUILD (from rev 213549, webkitgtk/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-05-24 15:45:22 UTC (rev 213550) @@ -0,0 +1,72 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> + +pkgbase=webkitgtk +pkgname=(webkitgtk webkitgtk2) +pkgver=2.4.2 +pkgrel=1 +pkgdesc="GTK+ Web content engine library" +arch=(i686 x86_64) +url="http://webkitgtk.org/" +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 + fix-pretty-quotes.patch) +sha256sums=('cac8385c3b8a956793eb6b67712c23297a39e5f8b429523f32bbdcdf9c21d00a' + '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') + +prepare() { + mkdir build-gtk{,2} + cd $pkgbase-$pkgver + patch -Np0 -i ../fix-pretty-quotes.patch +} + +_build() ( + _ver="$1"; shift + cd build-${_ver} + + ../$pkgbase-$pkgver/configure --prefix=/usr \ + --libexecdir=/usr/lib/webkit${_ver} \ + --enable-introspection \ + "$@" + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make all stamp-po +) + +build() { + _build gtk --enable-gtk-doc + _build gtk2 --disable-webkit2 --with-gtk=2.0 +} + +package_webkitgtk() { + depends+=(gtk3) + optdepends+=('gtk2: Netscape plugin support') + provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") + conflicts=(webkitgtk3 libwebkit3) + replaces=(webkitgtk3 libwebkit3) + + make -C build-gtk -j1 DESTDIR="$pkgdir" install + install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ + "$pkgdir/usr/share/licenses/webkitgtk/LICENSE" +} + +package_webkitgtk2() { + pkgdesc+=" for GTK2" + depends+=(gtk2) + provides=("libwebkit=${pkgver}") + conflicts=(libwebkit) + replaces=(libwebkit) + + make -C build-gtk2 -j1 DESTDIR="$pkgdir" install + install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ + "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE" +} Deleted: extra-x86_64/fix-pretty-quotes.patch =================================================================== --- extra-x86_64/fix-pretty-quotes.patch 2014-05-24 15:32:11 UTC (rev 213549) +++ extra-x86_64/fix-pretty-quotes.patch 2014-05-24 15:45:22 UTC (rev 213550) @@ -1,26 +0,0 @@ -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, Copied: webkitgtk/repos/extra-x86_64/fix-pretty-quotes.patch (from rev 213549, webkitgtk/trunk/fix-pretty-quotes.patch) =================================================================== --- extra-x86_64/fix-pretty-quotes.patch (rev 0) +++ extra-x86_64/fix-pretty-quotes.patch 2014-05-24 15:45:22 UTC (rev 213550) @@ -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,