Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory vz-cvs-3.sog:/tmp/cvs-serv17897/10.7/main/finkinfo/web
Modified Files:
webkit-1.0.2.info webkit-1.0.2.patch
Log Message:
build-fix (xlocale wackiness triggered by latest gettext)
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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- webkit-1.0.2.info 2 Aug 2012 14:43:29 -0000 1.3
+++ webkit-1.0.2.info 22 Sep 2012 18:17:31 -0000 1.4
@@ -37,8 +37,8 @@
sqlite3-dev,
x11-dev
<<
-# switch-pmXXX is needed: in perlXXX-core up to perl5.13.1
-# so not need any dependency b/c 10.[567] system-perl do have it
+# 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)
@@ -51,7 +51,7 @@
SetCXX: llvm-g++-4.2
PatchFile: %n.patch
-PatchFile-MD5: 745ed388c6064fb52c1e89a79e7c17e9
+PatchFile-MD5: 1fc6a3e79fdadd77d4278e52b41aec89
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
@@ -164,6 +164,9 @@
Make extra-sure we get the right libpng. Lots of noise under
libpng14 due to use of deprecated API, which is no longer
available at all in libpng15.
+
+ Upstream patch to config.h related to xlocale. See:
+ http://trac.webkit.org/changeset/75619
<<
DescPort: <<
fink's libicuXX-dev are just headers and lib-links for apple's
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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webkit-1.0.2.patch 9 Aug 2011 19:39:24 -0000 1.1
+++ webkit-1.0.2.patch 22 Sep 2012 18:17:31 -0000 1.2
@@ -57,6 +57,22 @@
return wrapper;
return createDOMNodeWrapper<WrapperClass>(exec, globalObject, node);
}
+diff -Nurd -x'*~' webkit-1.2.7.orig/WebCore/config.h
webkit-1.2.7/WebCore/config.h
+--- webkit-1.2.7.orig/WebCore/config.h 2010-09-10 09:20:33.000000000 -0400
++++ webkit-1.2.7/WebCore/config.h 2012-09-22 13:24:15.000000000 -0400
+@@ -124,8 +124,10 @@
+
+ // this breaks compilation of <QFontDatabase>, at least, so turn it off for
now
+ // Also generates errors on wx on Windows, presumably because these functions
+-// are used from wx headers.
+-#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM)
++// are used from wx headers.On GTK+ for Mac many GTK+ files include
<libintl.h>
++// or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
++// isacii().
++#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !(OS(DARWIN) &&
PLATFORM(GTK))
+ #include <wtf/DisallowCType.h>
+ #endif
+
diff -Nurd -x'*~' webkit-1.2.7.orig/configure webkit-1.2.7/configure
--- webkit-1.2.7.orig/configure 2011-02-07 12:43:44.000000000 -0500
+++ webkit-1.2.7/configure 2011-08-09 13:02:42.000000000 -0400
------------------------------------------------------------------------------
How fast is your code?
3 out of 4 devs don\\\'t know how their code performs in production.
Find out how slow your code is with AppDynamics Lite.
http://ad.doubleclick.net/clk;262219672;13503038;z?
http://info.appdynamics.com/FreeJavaPerformanceDownload.html
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
