[arch-commits] Commit in libwebkit/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, June 1, 2011 @ 17:54:34
  Author: foutrelis
Revision: 126164

Patch make-hash-tools.pl to use the given/when keywords available in Perl >= 5.10.

Added:
  libwebkit/trunk/replace-switch-with-given-when.patch
Modified:
  libwebkit/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |    8 ++++-
 replace-switch-with-given-when.patch |   45 +++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-01 20:58:28 UTC (rev 126163)
+++ PKGBUILD	2011-06-01 21:54:34 UTC (rev 126164)
@@ -13,13 +13,17 @@
 makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
 options=('!libtool')
 install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz gcc46.patch)
+source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz
+        gcc46.patch
+        replace-switch-with-given-when.patch)
 md5sums=('10c969db3b5484c71df1aa9a338377ff'
-         '970a2fa91b9827dff8e9b9edb4867701')
+         '970a2fa91b9827dff8e9b9edb4867701'
+         '3ba708a26b7af0e1e853867966fe14f7')
 
 build() {
   cd "${srcdir}/webkit-${pkgver}"
   patch -Np1 -i "${srcdir}/gcc46.patch"
+  patch -Np1 -i "${srcdir}/replace-switch-with-given-when.patch"
   mkdir build-gtk{2,3}
 
   ( cd build-gtk2 && _build --with-gtk=2.0 )

Added: replace-switch-with-given-when.patch
===================================================================
--- replace-switch-with-given-when.patch	                        (rev 0)
+++ replace-switch-with-given-when.patch	2011-06-01 21:54:34 UTC (rev 126164)
@@ -0,0 +1,45 @@
+diff -upr webkit-1.4.0.orig/Source/WebCore/make-hash-tools.pl webkit-1.4.0/Source/WebCore/make-hash-tools.pl
+--- webkit-1.4.0.orig/Source/WebCore/make-hash-tools.pl	2011-04-25 22:27:15.000000000 +0300
++++ webkit-1.4.0/Source/WebCore/make-hash-tools.pl	2011-06-02 00:41:26.000000000 +0300
+@@ -20,7 +20,7 @@
+ #   Boston, MA 02110-1301, USA.
+ 
+ use strict;
+-use Switch;
++use feature 'switch';
+ use File::Basename;
+ 
+ my $outdir = $ARGV[0];
+@@ -28,9 +28,9 @@ shift;
+ my $option = basename($ARGV[0],".gperf");
+ 
+ 
+-switch ($option) {
++given ($option) {
+ 
+-case "DocTypeStrings" {
++when ("DocTypeStrings") {
+ 
+     my $docTypeStringsGenerated    = "$outdir/DocTypeStrings.cpp";
+     my $docTypeStringsGperf        = $ARGV[0];
+@@ -38,9 +38,9 @@ case "DocTypeStrings" {
+ 
+     system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
+ 
+-} # case "DocTypeStrings"
++} # when ("DocTypeStrings")
+ 
+-case "ColorData" {
++when ("ColorData") {
+ 
+     my $colorDataGenerated         = "$outdir/ColorData.cpp";
+     my $colorDataGperf             = $ARGV[0];
+@@ -48,6 +48,6 @@ case "ColorData" {
+ 
+     system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
+ 
+-} # case "ColorData"
++} # when ("ColorData")
+ 
+-} # switch ($option)
++} # given ($option)