[arch-commits] Commit in webkit2gtk/repos (8 files)

Jan Steffens heftig at archlinux.org
Thu Oct 9 08:26:52 UTC 2014 

    Date: Thursday, October 9, 2014 @ 10:26:52
  Author: heftig
Revision: 224140

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

Added:
  webkit2gtk/repos/testing-i686/PKGBUILD
    (from rev 224139, webkit2gtk/trunk/PKGBUILD)
  webkit2gtk/repos/testing-i686/fix-pretty-quotes.patch
    (from rev 224139, webkit2gtk/trunk/fix-pretty-quotes.patch)
  webkit2gtk/repos/testing-x86_64/PKGBUILD
    (from rev 224139, webkit2gtk/trunk/PKGBUILD)
  webkit2gtk/repos/testing-x86_64/fix-pretty-quotes.patch
    (from rev 224139, webkit2gtk/trunk/fix-pretty-quotes.patch)
Deleted:
  webkit2gtk/repos/testing-i686/PKGBUILD
  webkit2gtk/repos/testing-i686/fix-pretty-quotes.patch
  webkit2gtk/repos/testing-x86_64/PKGBUILD
  webkit2gtk/repos/testing-x86_64/fix-pretty-quotes.patch

----------------------------------------+
 /PKGBUILD                              |  108 +++++++++++++++++++++++++++++++
 /fix-pretty-quotes.patch               |   52 ++++++++++++++
 testing-i686/PKGBUILD                  |   53 ---------------
 testing-i686/fix-pretty-quotes.patch   |   26 -------
 testing-x86_64/PKGBUILD                |   53 ---------------
 testing-x86_64/fix-pretty-quotes.patch |   26 -------
 6 files changed, 160 insertions(+), 158 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2014-10-09 08:22:11 UTC (rev 224139)
+++ testing-i686/PKGBUILD	2014-10-09 08:26:52 UTC (rev 224140)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=webkit2gtk
-pkgver=2.6.0
-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 geoclue2 gst-plugins-base-libs
-         libsecret libwebp harfbuzz-icu gtk3)
-makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa 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=('beb702b3d57d5323b6eecc7f517033777454ea59f1d897d2d96090756aadf4f3'
-            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
-
-prepare() {
-  mkdir build
-
-  cd webkitgtk-$pkgver
-  patch -Np0 -i ../fix-pretty-quotes.patch
-  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 \
-        ../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/testing-i686/PKGBUILD (from rev 224139, webkit2gtk/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2014-10-09 08:26:52 UTC (rev 224140)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.6.0
+pkgrel=2
+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 gtk3)
+makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa 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=('beb702b3d57d5323b6eecc7f517033777454ea59f1d897d2d96090756aadf4f3'
+            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
+
+prepare() {
+  mkdir build
+
+  cd webkitgtk-$pkgver
+  patch -Np0 -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
+}

Deleted: testing-i686/fix-pretty-quotes.patch
===================================================================
--- testing-i686/fix-pretty-quotes.patch	2014-10-09 08:22:11 UTC (rev 224139)
+++ testing-i686/fix-pretty-quotes.patch	2014-10-09 08:26:52 UTC (rev 224140)
@@ -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: webkit2gtk/repos/testing-i686/fix-pretty-quotes.patch (from rev 224139, webkit2gtk/trunk/fix-pretty-quotes.patch)
===================================================================
--- testing-i686/fix-pretty-quotes.patch	                        (rev 0)
+++ testing-i686/fix-pretty-quotes.patch	2014-10-09 08:26:52 UTC (rev 224140)
@@ -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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2014-10-09 08:22:11 UTC (rev 224139)
+++ testing-x86_64/PKGBUILD	2014-10-09 08:26:52 UTC (rev 224140)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=webkit2gtk
-pkgver=2.6.0
-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 geoclue2 gst-plugins-base-libs
-         libsecret libwebp harfbuzz-icu gtk3)
-makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa 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=('beb702b3d57d5323b6eecc7f517033777454ea59f1d897d2d96090756aadf4f3'
-            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
-
-prepare() {
-  mkdir build
-
-  cd webkitgtk-$pkgver
-  patch -Np0 -i ../fix-pretty-quotes.patch
-  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 \
-        ../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/testing-x86_64/PKGBUILD (from rev 224139, webkit2gtk/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2014-10-09 08:26:52 UTC (rev 224140)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.6.0
+pkgrel=2
+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 gtk3)
+makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa 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=('beb702b3d57d5323b6eecc7f517033777454ea59f1d897d2d96090756aadf4f3'
+            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
+
+prepare() {
+  mkdir build
+
+  cd webkitgtk-$pkgver
+  patch -Np0 -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
+}

Deleted: testing-x86_64/fix-pretty-quotes.patch
===================================================================
--- testing-x86_64/fix-pretty-quotes.patch	2014-10-09 08:22:11 UTC (rev 224139)
+++ testing-x86_64/fix-pretty-quotes.patch	2014-10-09 08:26:52 UTC (rev 224140)
@@ -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: webkit2gtk/repos/testing-x86_64/fix-pretty-quotes.patch (from rev 224139, webkit2gtk/trunk/fix-pretty-quotes.patch)
===================================================================
--- testing-x86_64/fix-pretty-quotes.patch	                        (rev 0)
+++ testing-x86_64/fix-pretty-quotes.patch	2014-10-09 08:26:52 UTC (rev 224140)
@@ -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,

More information about the arch-commits mailing list