Date: Tuesday, April 7, 2015 @ 22:16:26
Author: andyrtr
Revision: 235599
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
webkit2gtk/repos/staging-i686/
webkit2gtk/repos/staging-i686/PKGBUILD
(from rev 235598, webkit2gtk/trunk/PKGBUILD)
webkit2gtk/repos/staging-i686/fix-pretty-quotes.patch
(from rev 235598, webkit2gtk/trunk/fix-pretty-quotes.patch)
webkit2gtk/repos/staging-x86_64/
webkit2gtk/repos/staging-x86_64/PKGBUILD
(from rev 235598, webkit2gtk/trunk/PKGBUILD)
webkit2gtk/repos/staging-x86_64/fix-pretty-quotes.patch
(from rev 235598, webkit2gtk/trunk/fix-pretty-quotes.patch)
----------------------------------------+
staging-i686/PKGBUILD | 54 +++++++++++++++++++++++++++++++
staging-i686/fix-pretty-quotes.patch | 26 ++++++++++++++
staging-x86_64/PKGBUILD | 54 +++++++++++++++++++++++++++++++
staging-x86_64/fix-pretty-quotes.patch | 26 ++++++++++++++
4 files changed, 160 insertions(+)
Copied: webkit2gtk/repos/staging-i686/PKGBUILD (from rev 235598,
webkit2gtk/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-04-07 20:16:26 UTC (rev 235599)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Eric Bélanger <e...@archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.8.0
+pkgrel=2
+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=('05fad239f5f035b0a3628bb7bc1536d916f772fc9ff95de22e3cec1af2ac6815'
+ '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/staging-i686/fix-pretty-quotes.patch (from rev 235598,
webkit2gtk/trunk/fix-pretty-quotes.patch)
===================================================================
--- staging-i686/fix-pretty-quotes.patch (rev 0)
+++ staging-i686/fix-pretty-quotes.patch 2015-04-07 20:16:26 UTC (rev
235599)
@@ -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,
Copied: webkit2gtk/repos/staging-x86_64/PKGBUILD (from rev 235598,
webkit2gtk/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-04-07 20:16:26 UTC (rev 235599)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Eric Bélanger <e...@archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.8.0
+pkgrel=2
+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=('05fad239f5f035b0a3628bb7bc1536d916f772fc9ff95de22e3cec1af2ac6815'
+ '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/staging-x86_64/fix-pretty-quotes.patch (from rev
235598, webkit2gtk/trunk/fix-pretty-quotes.patch)
===================================================================
--- staging-x86_64/fix-pretty-quotes.patch (rev 0)
+++ staging-x86_64/fix-pretty-quotes.patch 2015-04-07 20:16:26 UTC (rev
235599)
@@ -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,
