Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27135
Modified Files:
webkit-1.0.2.info webkit-1.0.2.patch
Log Message:
more portable perl use for the build system.
Index: webkit-1.0.2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/webkit-1.0.2.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- webkit-1.0.2.info 5 Aug 2013 09:16:54 -0000 1.9
+++ webkit-1.0.2.info 9 Aug 2013 13:41:46 -0000 1.10
@@ -2,9 +2,6 @@
Version: 1.2.7
Revision: 4
-# need system-perl switch-pmXXX for 10.9+?
-Distribution: 10.7, 10.8
-
Source: http://webkitgtk.org/webkit-%v.tar.gz
Source-MD5: 25c7e548b65aeb6d83c0182c32ef0927
@@ -38,8 +35,6 @@
sqlite3-dev,
x11-dev
<<
-# switch-pmXXX is needed: in perlXXX-core from 5.7.3 to 5.13.1
-# so not need any dependency b/c 10.[5678] system-perl do have it
Depends: <<
%n-shlibs (= %v-%r),
glib2-shlibs (>= 2.22.0-1)
@@ -50,7 +45,7 @@
GCC: 4.0
PatchFile: %n.patch
-PatchFile-MD5: 51e122528ff29a2002431e0cf019f2b7
+PatchFile-MD5: 62c5481ac71d010b0f37d71921d1a40b
PatchScript: <<
%{default_script}
echo "WebKit is open source software with portions licensed under the
LGPL, BSD, and APSL licenses. Complete license and copyright information can be
found within the code and in the other LICENSE* files." > LICENSE
@@ -228,6 +223,10 @@
^-- eew, prefer to use clang (xcode is dropping llvm)
Use the non-inlined fallback mode in PreloadScanner.cpp
(avoids #include, so share "other" .cpp's global symbol)
+
+ Remove "Switch" in WebCore/dom/make_names.pl: dropped from
+ perl core. Easy to code around it to avoid needing
+ perl-varianted deps.
<<
DescDetail: <<
Index: webkit-1.0.2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/webkit-1.0.2.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- webkit-1.0.2.patch 5 Aug 2013 09:16:54 -0000 1.6
+++ webkit-1.0.2.patch 9 Aug 2013 13:41:47 -0000 1.7
@@ -196,6 +196,37 @@
m_rule = 0;
bool ok = false;
+diff -Nurd -x'*~' webkit-1.2.7.orig/WebCore/dom/make_names.pl
webkit-1.2.7/WebCore/dom/make_names.pl
+--- webkit-1.2.7.orig/WebCore/dom/make_names.pl 2010-09-10
09:20:33.000000000 -0400
++++ webkit-1.2.7/WebCore/dom/make_names.pl 2013-08-08 23:08:33.000000000
-0400
+@@ -35,7 +35,6 @@
+ use File::Path;
+ use IO::File;
+ use InFilesParser;
+-use Switch;
+
+ my $printFactory = 0;
+ my $printWrapperFactory = 0;
+@@ -206,17 +205,15 @@
+
+ my $InParser = InFilesParser->new();
+
+- switch ($type) {
+- case "tags" {
++ if ($type eq "tags") {
+ $InParser->parse($names, \¶metersHandler, \&tagsHandler);
+ }
+- case "attrs" {
++ elsif ($type eq "attrs") {
+ $InParser->parse($names, \¶metersHandler, \&attrsHandler);
+ }
+ else {
+ die "Do not know how to parse $type";
+ }
+- }
+
+ close($names);
+
diff -Nurd -x'*~' webkit-1.2.7.orig/WebCore/html/PreloadScanner.cpp
webkit-1.2.7/WebCore/html/PreloadScanner.cpp
--- webkit-1.2.7.orig/WebCore/html/PreloadScanner.cpp 2010-09-10
09:20:33.000000000 -0400
+++ webkit-1.2.7/WebCore/html/PreloadScanner.cpp 2013-08-05
04:21:36.000000000 -0400
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
