Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16191
Modified Files:
webkit-1.0.2.info webkit-1.0.2.patch
Log Message:
fix for clang
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.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- webkit-1.0.2.info 3 Aug 2013 05:47:33 -0000 1.8
+++ webkit-1.0.2.info 5 Aug 2013 09:16:54 -0000 1.9
@@ -1,6 +1,6 @@
Package: webkit-1.0.2
Version: 1.2.7
-Revision: 3
+Revision: 4
# need system-perl switch-pmXXX for 10.9+?
Distribution: 10.7, 10.8
@@ -29,7 +29,6 @@
libiconv-dev,
libicu36-dev,
libjpeg9,
- llvm-gcc,
libpng16,
libsoup2.4.1-ssl (>= 2.28.0-1),
libxml2 (>= 2.9.1-1),
@@ -49,11 +48,9 @@
Replaces: webkit-1.0.1
BuildDependsOnly: true
GCC: 4.0
-SetCC: llvm-gcc-4.2
-SetCXX: llvm-g++-4.2
PatchFile: %n.patch
-PatchFile-MD5: ac89711f6014a6e1091b21c1119ed3ce
+PatchFile-MD5: 51e122528ff29a2002431e0cf019f2b7
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
@@ -222,6 +219,15 @@
WebCore exposes uses X11 headers in public API, so need to
propagate its -I when libtestnetscapeplugin.la uses it.
+
+ clang++ doesn't know GNU's __inline extensions, so having
+ multiple .cpp #include HTMLEntities.c causes "duplicate
+ symbol" error when linking their .o together.
+ # Force use of llvm-g++, which handles __inline to avoid
+ # making actual externally-visible symbol
+ ^-- 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)
<<
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.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- webkit-1.0.2.patch 3 Aug 2013 05:47:33 -0000 1.5
+++ webkit-1.0.2.patch 5 Aug 2013 09:16:54 -0000 1.6
@@ -196,6 +196,18 @@
m_rule = 0;
bool ok = false;
+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
+@@ -45,7 +45,7 @@
+ #include <wtf/unicode/Unicode.h>
+
+ // Use __GNUC__ instead of PLATFORM(GCC) to stay consistent with the gperf
generated c file
+-#ifdef __GNUC__
++#if defined __GNUC__ && !defined(__clang__)
+ // The main tokenizer includes this too so we are getting two copies of the
data. However, this way the code gets inlined.
+ #include "HTMLEntityNames.c"
+ #else
diff -Nurd -x'*~'
webkit-1.2.7.orig/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
webkit-1.2.7/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
--- webkit-1.2.7.orig/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
2010-12-28 07:28:51.000000000 -0500
+++ webkit-1.2.7/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
2013-08-02 14:56:22.000000000 -0400
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
