From e0303dbe2cf4b21c4a0b6ea3529c461357c418bd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 8 Jun 2011 07:52:07 +0200 Subject: [PATCH] webkit-gtk3: update to 1.4.1. --- srcpkgs/webkit-gtk3/patches/gcc46.patch | 11 ----- .../replace-switch-with-given-when.patch | 45 +++++++++++++++++++ srcpkgs/webkit-gtk3/template | 9 ++-- 3 files changed, 51 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/webkit-gtk3/patches/gcc46.patch create mode 100644 srcpkgs/webkit-gtk3/patches/replace-switch-with-given-when.patch diff --git a/srcpkgs/webkit-gtk3/patches/gcc46.patch b/srcpkgs/webkit-gtk3/patches/gcc46.patch deleted file mode 100644 index 2a3ad9f039e..00000000000 --- a/srcpkgs/webkit-gtk3/patches/gcc46.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: Source/WebCore/dom/make_names.pl -=================================================================== ---- Source/WebCore/dom/make_names.pl (revision 73989) -+++ Source/WebCore/dom/make_names.pl (revision 84123) -@@ -66,5 +66,5 @@ - $gccLocation = "/usr/bin/gcc"; - } --my $preprocessor = $gccLocation . " -E -P -x c++"; -+my $preprocessor = $gccLocation . " -E -x c++"; - - GetOptions( diff --git a/srcpkgs/webkit-gtk3/patches/replace-switch-with-given-when.patch b/srcpkgs/webkit-gtk3/patches/replace-switch-with-given-when.patch new file mode 100644 index 00000000000..4e64610bbb5 --- /dev/null +++ b/srcpkgs/webkit-gtk3/patches/replace-switch-with-given-when.patch @@ -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) diff --git a/srcpkgs/webkit-gtk3/template b/srcpkgs/webkit-gtk3/template index 3ba9c767ad4..6dca277ee09 100644 --- a/srcpkgs/webkit-gtk3/template +++ b/srcpkgs/webkit-gtk3/template @@ -1,15 +1,18 @@ # Template file for 'webkit-gtk3' pkgname=webkit-gtk3 -version=1.4.0 +version=1.4.1 +patch_args="-Np1" wrksrc=webkit-${version} -distfiles="http://www.webkitgtk.org/webkit-${version}.tar.gz" +homepage="http://webkitgtk.org/" +license="LGPL-2.1, Simplified BSD (2 clause)" +distfiles="${homepage}/webkit-${version}.tar.gz" build_style=gnu_configure configure_args="--enable-video --with-gtk=3.0 --enable-jit --enable-3d-transforms --with-font-backend=freetype --enable-introspection --with-unicode-backend=icu --disable-schemas-compile" short_desc="GTK+3 port of the WebKit browser engine" maintainer="Juan RP " -checksum=3eb0fe06a99878a32f18a77cdaaf5a33ce2af36ee33c251ae14f4e4b3fa57f88 +checksum=d0db4f6c8e4dd73ebb7fd34c8ca21b0b3b245ac7162d884e789a2104ca631c64 long_desc=" WebKit is an open source web browser engine. WebKit is also the name of the Mac OS X system framework version of the engine that's used by