[arch-commits] Commit in webkitgtk/repos (6 files)

Fri Oct 17 09:44:46 UTC 2014

Date: Friday, October 17, 2014 @ 11:44:46
  Author: fyan
Revision: 224673

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  webkitgtk/repos/staging-i686/
  webkitgtk/repos/staging-i686/PKGBUILD
    (from rev 224672, webkitgtk/trunk/PKGBUILD)
  webkitgtk/repos/staging-i686/fix-pretty-quotes.patch
    (from rev 224672, webkitgtk/trunk/fix-pretty-quotes.patch)
  webkitgtk/repos/staging-x86_64/
  webkitgtk/repos/staging-x86_64/PKGBUILD
    (from rev 224672, webkitgtk/trunk/PKGBUILD)
  webkitgtk/repos/staging-x86_64/fix-pretty-quotes.patch
    (from rev 224672, webkitgtk/trunk/fix-pretty-quotes.patch)

----------------------------------------+
 staging-i686/PKGBUILD                  |   79 +++++++++++++++++++++++++++++++
 staging-i686/fix-pretty-quotes.patch   |   26 ++++++++++
 staging-x86_64/PKGBUILD                |   79 +++++++++++++++++++++++++++++++
 staging-x86_64/fix-pretty-quotes.patch |   26 ++++++++++
 4 files changed, 210 insertions(+)

Copied: webkitgtk/repos/staging-i686/PKGBUILD (from rev 224672, webkitgtk/trunk/PKGBUILD)
===================================================================

--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2014-10-17 09:44:46 UTC (rev 224673)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=webkitgtk
+pkgname=(webkitgtk webkitgtk2)
+pkgver=2.4.6
+pkgrel=3
+pkgdesc="GTK+ Web content engine library"
+arch=(i686 x86_64)
+url="http://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
+         libsecret libwebp harfbuzz-icu)
+makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
+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=('6fef4aa8d4a2668e03ea15472a71396ea7b776bbe56ad9459a4124b823c11457'
+            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
+
+prepare() {
+  mkdir build-gtk{,2} path
+
+  ln -s /usr/bin/python2 path/python
+
+  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 \
+    --disable-webkit2 \
+    --disable-gtk-doc \
+    "$@"
+
+  # 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() {
+  PATH="$srcdir/path:$PATH"
+
+  _build gtk
+  _build gtk2 --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/staging-i686/fix-pretty-quotes.patch (from rev 224672, webkitgtk/trunk/fix-pretty-quotes.patch)
===================================================================
--- staging-i686/fix-pretty-quotes.patch	                        (rev 0)
+++ staging-i686/fix-pretty-quotes.patch	2014-10-17 09:44:46 UTC (rev 224673)
@@ -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: webkitgtk/repos/staging-x86_64/PKGBUILD (from rev 224672, webkitgtk/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2014-10-17 09:44:46 UTC (rev 224673)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=webkitgtk
+pkgname=(webkitgtk webkitgtk2)
+pkgver=2.4.6
+pkgrel=3
+pkgdesc="GTK+ Web content engine library"
+arch=(i686 x86_64)
+url="http://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
+         libsecret libwebp harfbuzz-icu)
+makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
+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=('6fef4aa8d4a2668e03ea15472a71396ea7b776bbe56ad9459a4124b823c11457'
+            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
+
+prepare() {
+  mkdir build-gtk{,2} path
+
+  ln -s /usr/bin/python2 path/python
+
+  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 \
+    --disable-webkit2 \
+    --disable-gtk-doc \
+    "$@"
+
+  # 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() {
+  PATH="$srcdir/path:$PATH"
+
+  _build gtk
+  _build gtk2 --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/staging-x86_64/fix-pretty-quotes.patch (from rev 224672, webkitgtk/trunk/fix-pretty-quotes.patch)
===================================================================
--- staging-x86_64/fix-pretty-quotes.patch	                        (rev 0)
+++ staging-x86_64/fix-pretty-quotes.patch	2014-10-17 09:44:46 UTC (rev 224673)
@@ -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,

