diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-07 02:29:26 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-07 02:29:26 -0300 |
commit | 3357db80ffa8a795fb5cdad0fc726470887706b0 (patch) | |
tree | 461a9d95f958d88aed12f371328b20d87b69323e /extra/libwebkit | |
parent | 1921cc4951557545f38946cbed66431f42af26b4 (diff) | |
parent | ff64a82ccedcb1690d2f0140d63432aa49676591 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-file-path-expand/PKGBUILD
community/perl-file-slurp/PKGBUILD
community/perl-getopt-argvfile/PKGBUILD
community/perl-graphics-colornames/PKGBUILD
community/perl-html-tableextract/PKGBUILD
community/perl-xml-regexp/PKGBUILD
community/perlio-eol/PKGBUILD
community/virtualbox/PKGBUILD
community/xemacs/PKGBUILD
core/gawk/PKGBUILD
extra/bogofilter/PKGBUILD
extra/feh/PKGBUILD
extra/gnome-phone-manager/PKGBUILD
extra/redland/PKGBUILD
extra/ruby/PKGBUILD
extra/samba/PKGBUILD
extra/squirrelmail/PKGBUILD
extra/subversion/PKGBUILD
extra/vsftpd/PKGBUILD
extra/xawtv/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-glib2/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/libwebkit')
-rw-r--r-- | extra/libwebkit/replace-switch-with-given-when.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/extra/libwebkit/replace-switch-with-given-when.patch b/extra/libwebkit/replace-switch-with-given-when.patch deleted file mode 100644 index 4e64610bb..000000000 --- a/extra/libwebkit/replace-switch-with-given-when.patch +++ /dev/null @@ -1,45 +0,0 @@ -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) |