webkitgtk3 1.4.2

4 files changed, 6 insertions, 46 deletions

diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index e05950ed6c..5847c90f15 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
            SPELL=webkitgtk3
-         VERSION=1.4.1
+         VERSION=1.4.2
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:3eb7e3341cc7120d7966ef183bc53cbf41b4950c40c64aa641d99be6a4e475c969a6fcc8828e522138b82cb7432c1a11148c88b550df589422dd26299bc08807
+     SOURCE_HASH=sha512:53981d9177281c8a8784fecf070334af3f2febd7818c7517c4aed1efd45dbefdf34496d8313215255069b58aa8819be4d8dcd93a9c0ca505599e16f3f46e89b1
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
         WEB_SITE=http://webkitgtk.org/
      GATHER_DOCS=off
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index 42e177164f..cd0fb9466d 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,7 @@
+2011-07-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 1.4.2
+	* PRE_BUILD, perl514.patch: removed, fixed upstream
+
 2011-06-08 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 1.4.1
 	* PRE_BUILD, perl514.patch: added to fix compilation with new Perl 5.14
diff --git a/http/webkitgtk3/PRE_BUILD b/http/webkitgtk3/PRE_BUILD
deleted file mode 100755
index 10e39669d8..0000000000
--- a/http/webkitgtk3/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/perl514.patch"
diff --git a/http/webkitgtk3/perl514.patch b/http/webkitgtk3/perl514.patch
deleted file mode 100644
index a7a917d2b8..0000000000
--- a/http/webkitgtk3/perl514.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- Source/WebCore/make-hash-tools.pl.orig	2011-04-25 23:27:15.000000000 +0400
-+++ Source/WebCore/make-hash-tools.pl	2011-05-29 12:18:23.501169110 +0400
-@@ -20,7 +20,6 @@
- #   Boston, MA 02110-1301, USA.
- 
- use strict;
--use Switch;
- use File::Basename;
- 
- my $outdir = $ARGV[0];
-@@ -28,9 +27,7 @@
- my $option = basename($ARGV[0],".gperf");
- 
- 
--switch ($option) {
--
--case "DocTypeStrings" {
-+if ($option eq "DocTypeStrings") {
- 
-     my $docTypeStringsGenerated    = "$outdir/DocTypeStrings.cpp";
-     my $docTypeStringsGperf        = $ARGV[0];
-@@ -38,9 +35,7 @@
- 
-     system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
- 
--} # case "DocTypeStrings"
--
--case "ColorData" {
-+} elsif ($option eq "ColorData") {
- 
-     my $colorDataGenerated         = "$outdir/ColorData.cpp";
-     my $colorDataGperf             = $ARGV[0];
-@@ -48,6 +43,4 @@
- 
-     system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
- 
--} # case "ColorData"
--
--} # switch ($option)
-+}