Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (22bda5f697f4ce867329dd18be631e166dd98228)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (22bda5f697f4ce867329dd18be631e166dd98228)
  • Date: Sun, 29 May 2011 07:49:45 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/webkitgtk/HISTORY | 4 ++++
http/webkitgtk/PRE_BUILD | 4 ++++
http/webkitgtk/perl514.patch | 40 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+)

New commits:
commit 22bda5f697f4ce867329dd18be631e166dd98228
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

webkitgtk: fixed compilation with Perl 5.14

diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index fe17269..4f84a99 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2011-05-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * perl514.patch: added, to fix compilation with new Perl 5.14
+
2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: stable is now at 1.4.0, which requires devel libsoup

diff --git a/http/webkitgtk/PRE_BUILD b/http/webkitgtk/PRE_BUILD
new file mode 100755
index 0000000..10e3966
--- /dev/null
+++ b/http/webkitgtk/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/perl514.patch"
diff --git a/http/webkitgtk/perl514.patch b/http/webkitgtk/perl514.patch
new file mode 100644
index 0000000..a7a917d
--- /dev/null
+++ b/http/webkitgtk/perl514.patch
@@ -0,0 +1,40 @@
+--- 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)
++}



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (22bda5f697f4ce867329dd18be631e166dd98228), Vlad Glagolev, 05/29/2011

Archive powered by MHonArc 2.6.24.

Top of Page