summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2011-07-01 12:38:14 +0200
committerLadislav Hagara2011-07-01 12:38:14 +0200
commite172197ff7607922e59947eb54c23d3a2b2dd9e5 (patch)
treead8b600e6ee6dab35e04813a5549027206c51d58
parentf5b252d8d4e00729ab0dde4cd6c6dafacdfff812 (diff)
webkitgtk 1.4.2
-rwxr-xr-xhttp/webkitgtk/DETAILS8
-rw-r--r--http/webkitgtk/HISTORY4
-rwxr-xr-xhttp/webkitgtk/PRE_BUILD4
-rw-r--r--http/webkitgtk/perl514.patch40
4 files changed, 8 insertions, 48 deletions
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index cf16dc63e7..0a2c750673 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,16 +1,16 @@
SPELL=webkitgtk
if [[ $WEBKITGTK_NIGHT == "y" ]]; then
- 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"
else
- VERSION=1.4.1
+ VERSION=1.4.2
SECURITY_PATCH=4
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"
fi
WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 4aea446de9..20e66a7f90 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/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
diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
deleted file mode 100755
index 10e39669d8..0000000000
--- a/http/webkitgtk/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p0 < "$SPELL_DIRECTORY/perl514.patch"
diff --git a/http/webkitgtk/perl514.patch b/http/webkitgtk/perl514.patch
deleted file mode 100644
index a7a917d2b8..0000000000
--- a/http/webkitgtk/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)
-+}