summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Cook2011-07-01 21:50:22 -0500
committerRobin Cook2011-07-01 21:50:22 -0500
commit17499db543cb973188af6abb4ba47f6bb59f7378 (patch)
tree2a52bd518fe49895779de00589ac78f5af0e8385
parent6653c7865a5dbba06c0c73baa115ac95204ccea2 (diff)
parentd98f8515c123a1e479eda4c7d778925663f19036 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xftp/aria2/DETAILS4
-rw-r--r--ftp/aria2/HISTORY3
-rwxr-xr-xhttp/webkitgtk/DETAILS8
-rw-r--r--http/webkitgtk/HISTORY4
-rwxr-xr-xhttp/webkitgtk/PRE_BUILD4
-rw-r--r--http/webkitgtk/perl514.patch40
-rwxr-xr-xhttp/webkitgtk3/DETAILS4
-rw-r--r--http/webkitgtk3/HISTORY4
-rwxr-xr-xhttp/webkitgtk3/PRE_BUILD4
-rw-r--r--http/webkitgtk3/perl514.patch40
10 files changed, 19 insertions, 96 deletions
diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index da58982473..85f5b6bba6 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
SPELL=aria2
- VERSION=1.11.2
- SOURCE_HASH=sha512:0fa10520d86a0a3d8aaacf546290ffc97ea10c53d7ce111507f16d85c859d2bb8c0d8d31d42ab52e9132c7b7edb400892c002ad711922e294e6afa7fcccaf645
+ VERSION=1.12.0
+ SOURCE_HASH=sha512:ebdb5a4a9506b0f3fa3a1d696ed249c1b5859e7d0d80867c6a97a6c4c0989f0934bebe327d28c0ffde5b42aa1cb2c97fea76ea5002a9d461afd4450a56a92edc
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 4446674db8..3a7ec61c50 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2011-07-01 Bor Kraljič <pyrobor@ver.si>
+ * DETAILS: updated spell to 1.12.0
+
2011-05-22 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: updated spell to 1.11.2
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)
-+}
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)
-+}