Date: Wednesday, May 20, 2015 @ 23:11:40 Author: heftig Revision: 239597
archrelease: copy trunk to extra-i686, extra-x86_64 Added: webkit2gtk/repos/extra-i686/PKGBUILD (from rev 239596, webkit2gtk/trunk/PKGBUILD) webkit2gtk/repos/extra-x86_64/PKGBUILD (from rev 239596, webkit2gtk/trunk/PKGBUILD) Deleted: webkit2gtk/repos/extra-i686/PKGBUILD webkit2gtk/repos/extra-i686/fix-pretty-quotes.patch webkit2gtk/repos/extra-x86_64/PKGBUILD webkit2gtk/repos/extra-x86_64/fix-pretty-quotes.patch --------------------------------------+ /PKGBUILD | 102 +++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 54 ----------------- extra-i686/fix-pretty-quotes.patch | 26 -------- extra-x86_64/PKGBUILD | 54 ----------------- extra-x86_64/fix-pretty-quotes.patch | 26 -------- 5 files changed, 102 insertions(+), 160 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-05-20 21:08:30 UTC (rev 239596) +++ extra-i686/PKGBUILD 2015-05-20 21:11:40 UTC (rev 239597) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=webkit2gtk -pkgver=2.8.2 -pkgrel=1 -pkgdesc="GTK+ Web content engine library" -arch=('i686' 'x86_64') -url="http://webkitgtk.org/" -license=('custom') -depends=('libxt' 'libxslt' 'enchant' 'geoclue2' 'gst-plugins-base-libs' - 'libsecret' 'libwebp' 'harfbuzz-icu' 'gtk3') -makedepends=('gtk2' 'gperf' 'gobject-introspection' 'ruby' 'gtk-doc' 'cmake' 'python') -optdepends=('gtk2: Netscape plugin support' - 'gst-plugins-base: free media decoding' - 'gst-plugins-good: media decoding' - 'gst-libav: nonfree media decoding') -options=('!emptydirs') -source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz - fix-pretty-quotes.patch) -sha256sums=('79dc0e628600446ac5590bb523a8372f0e28ac8ff022cf29c5ba979cb4635b43' - '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') - -prepare() { - mkdir build - - cd webkitgtk-$pkgver - patch -p0 -i ../fix-pretty-quotes.patch - sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc - rm -r Source/ThirdParty/gtest/ - rm -r Source/ThirdParty/qunit/ -} - -build() { - cd build - cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ - -DENABLE_GTKDOC=ON ../webkitgtk-$pkgver - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" - cd "$srcdir/webkitgtk-$pkgver/Source" - for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do - echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - done -} Copied: webkit2gtk/repos/extra-i686/PKGBUILD (from rev 239596, webkit2gtk/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-05-20 21:11:40 UTC (rev 239597) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=webkit2gtk +pkgver=2.8.3 +pkgrel=1 +pkgdesc="GTK+ Web content engine library" +arch=('i686' 'x86_64') +url="http://webkitgtk.org/" +license=('custom') +depends=('libxt' 'libxslt' 'enchant' 'geoclue2' 'gst-plugins-base-libs' + 'libsecret' 'libwebp' 'harfbuzz-icu' 'gtk3') +makedepends=('gtk2' 'gperf' 'gobject-introspection' 'ruby' 'gtk-doc' 'cmake' 'python') +optdepends=('gtk2: Netscape plugin support' + 'gst-plugins-base: free media decoding' + 'gst-plugins-good: media decoding' + 'gst-libav: nonfree media decoding') +options=('!emptydirs') +source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz) +sha256sums=('b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16') + +prepare() { + mkdir build + + cd webkitgtk-$pkgver + sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc + rm -r Source/ThirdParty/gtest/ + rm -r Source/ThirdParty/qunit/ +} + +build() { + cd build + cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ + -DENABLE_GTKDOC=ON ../webkitgtk-$pkgver + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" + cd "$srcdir/webkitgtk-$pkgver/Source" + for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do + echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + done +} Deleted: extra-i686/fix-pretty-quotes.patch =================================================================== --- extra-i686/fix-pretty-quotes.patch 2015-05-20 21:08:30 UTC (rev 239596) +++ extra-i686/fix-pretty-quotes.patch 2015-05-20 21:11:40 UTC (rev 239597) @@ -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, Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-05-20 21:08:30 UTC (rev 239596) +++ extra-x86_64/PKGBUILD 2015-05-20 21:11:40 UTC (rev 239597) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=webkit2gtk -pkgver=2.8.2 -pkgrel=1 -pkgdesc="GTK+ Web content engine library" -arch=('i686' 'x86_64') -url="http://webkitgtk.org/" -license=('custom') -depends=('libxt' 'libxslt' 'enchant' 'geoclue2' 'gst-plugins-base-libs' - 'libsecret' 'libwebp' 'harfbuzz-icu' 'gtk3') -makedepends=('gtk2' 'gperf' 'gobject-introspection' 'ruby' 'gtk-doc' 'cmake' 'python') -optdepends=('gtk2: Netscape plugin support' - 'gst-plugins-base: free media decoding' - 'gst-plugins-good: media decoding' - 'gst-libav: nonfree media decoding') -options=('!emptydirs') -source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz - fix-pretty-quotes.patch) -sha256sums=('79dc0e628600446ac5590bb523a8372f0e28ac8ff022cf29c5ba979cb4635b43' - '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6') - -prepare() { - mkdir build - - cd webkitgtk-$pkgver - patch -p0 -i ../fix-pretty-quotes.patch - sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc - rm -r Source/ThirdParty/gtest/ - rm -r Source/ThirdParty/qunit/ -} - -build() { - cd build - cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ - -DENABLE_GTKDOC=ON ../webkitgtk-$pkgver - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" - cd "$srcdir/webkitgtk-$pkgver/Source" - for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do - echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" - done -} Copied: webkit2gtk/repos/extra-x86_64/PKGBUILD (from rev 239596, webkit2gtk/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-05-20 21:11:40 UTC (rev 239597) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=webkit2gtk +pkgver=2.8.3 +pkgrel=1 +pkgdesc="GTK+ Web content engine library" +arch=('i686' 'x86_64') +url="http://webkitgtk.org/" +license=('custom') +depends=('libxt' 'libxslt' 'enchant' 'geoclue2' 'gst-plugins-base-libs' + 'libsecret' 'libwebp' 'harfbuzz-icu' 'gtk3') +makedepends=('gtk2' 'gperf' 'gobject-introspection' 'ruby' 'gtk-doc' 'cmake' 'python') +optdepends=('gtk2: Netscape plugin support' + 'gst-plugins-base: free media decoding' + 'gst-plugins-good: media decoding' + 'gst-libav: nonfree media decoding') +options=('!emptydirs') +source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz) +sha256sums=('b3de60c8676ed54bb3d6201c742bbd702ee176fdfef5ca06f2fc514783792f16') + +prepare() { + mkdir build + + cd webkitgtk-$pkgver + sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc + rm -r Source/ThirdParty/gtest/ + rm -r Source/ThirdParty/qunit/ +} + +build() { + cd build + cmake -DPORT=GTK -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib -DLIBEXEC_INSTALL_DIR=/usr/lib/webkit2gtk-4.0 \ + -DENABLE_GTKDOC=ON ../webkitgtk-$pkgver + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/licenses/webkit2gtk" + cd "$srcdir/webkitgtk-$pkgver/Source" + for f in $(find -name 'COPYING*' -or -name 'LICENSE*'); do + echo $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + cat $f >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + echo "" >> "$pkgdir/usr/share/licenses/webkit2gtk/LICENSE" + done +} Deleted: extra-x86_64/fix-pretty-quotes.patch =================================================================== --- extra-x86_64/fix-pretty-quotes.patch 2015-05-20 21:08:30 UTC (rev 239596) +++ extra-x86_64/fix-pretty-quotes.patch 2015-05-20 21:11:40 UTC (rev 239597) @@ -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,