[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
mrobinson at webkit.org
mrobinson at webkit.org
Wed Dec 22 17:55:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b1e4cca98a336b8258b222c2d5687254ce00fa8f
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 18:14:33 2010 +0000
2010-12-02 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
[GTK] DumpRenderTree has two copies of JavaScriptCore
https://bugs.webkit.org/show_bug.cgi?id=49877
Prevent the need to compile JSC into DumpRenderTree twice, by adjusting
the symbol visibility rules for libwebkit. Make all JSC symbols visible,
while hiding WebCore/WebKit symbols.
* GNUmakefile.am: Move the symbol visibility flags to the WebKit build.
* autotools/symbols.filter: Update the symbol filter list with the real
mangled names of the symbols and include other symbols that DRT needs.
2010-12-02 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
[GTK] DumpRenderTree has two copies of JavaScriptCore
https://bugs.webkit.org/show_bug.cgi?id=49877
Keep WebKit/WebCore symbols hidden.
* GNUmakefile.am: Move the symbol visibility rules here, because
now JSC symbols are visible, but WebCore/WebKit symbols are hidden.
2010-12-02 Martin Robinson <mrobinson at igalia.com>
Reviewed by Xan Lopez.
[GTK] DumpRenderTree has two copies of JavaScriptCore
https://bugs.webkit.org/show_bug.cgi?id=49877
* GNUmakefile.am: Remove the second copy of JavaScriptCore from the
LDADD list for DumpRenderTree.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73150 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index ef0a145..606a9a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-02 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] DumpRenderTree has two copies of JavaScriptCore
+ https://bugs.webkit.org/show_bug.cgi?id=49877
+
+ Prevent the need to compile JSC into DumpRenderTree twice, by adjusting
+ the symbol visibility rules for libwebkit. Make all JSC symbols visible,
+ while hiding WebCore/WebKit symbols.
+
+ * GNUmakefile.am: Move the symbol visibility flags to the WebKit build.
+ * autotools/symbols.filter: Update the symbol filter list with the real
+ mangled names of the symbols and include other symbols that DRT needs.
+
2010-12-02 Daniel Bates <dbates at rim.com>
Add autotools generated files to svn:ignore so that these
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 8884fcb..27debae 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -92,7 +92,6 @@ global_cppflags += \
global_cxxflags += \
- $(SYMBOL_VISIBILITY_INLINES) \
-fno-rtti
# -no-undefined required for building DLLs on Windows
@@ -178,7 +177,6 @@ endif
if !ENABLE_DEBUG
global_cppflags += -DNDEBUG
-global_cflags += $(SYMBOL_VISIBILITY)
else
global_cppflags += \
-DG_DISABLE_DEPRECATED \
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index a706d60..74613de 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-02 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] DumpRenderTree has two copies of JavaScriptCore
+ https://bugs.webkit.org/show_bug.cgi?id=49877
+
+ Keep WebKit/WebCore symbols hidden.
+
+ * GNUmakefile.am: Move the symbol visibility rules here, because
+ now JSC symbols are visible, but WebCore/WebKit symbols are hidden.
+
2010-12-02 Daniel Bates <dbates at rim.com>
Ignore WebKit/gtk/docs/GNUmakefile.in and WebKit/gtk/po/*.pot so that
diff --git a/WebKit/gtk/GNUmakefile.am b/WebKit/gtk/GNUmakefile.am
index a3be816..a846f7f 100644
--- a/WebKit/gtk/GNUmakefile.am
+++ b/WebKit/gtk/GNUmakefile.am
@@ -27,9 +27,11 @@ libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_SOUR
$(webkitgtk_sources)
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
+ $(SYMBOL_VISIBILITY_INLINES) \
$(global_cxxflags)
libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
+ $(SYMBOL_VISIBILITY) \
$(global_cflags)
# When building WebCore/WebKit, we want WebCore/config.h and NOT JavaScriptCore/config.h,
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8e21e9f..4a6441b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-02 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] DumpRenderTree has two copies of JavaScriptCore
+ https://bugs.webkit.org/show_bug.cgi?id=49877
+
+ * GNUmakefile.am: Remove the second copy of JavaScriptCore from the
+ LDADD list for DumpRenderTree.
+
2010-12-02 Sergio Villar Senin <svillar at igalia.com>
Unreviewed: Added myself to list of Committers.
diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index 73b01de..4809831 100644
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -99,7 +99,6 @@ Programs_DumpRenderTree_CFLAGS = \
Programs_DumpRenderTree_LDADD = \
libwebkitgtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la \
- libJavaScriptCore.la \
$(GLOBALDEPS_LIBS) \
$(CAIRO_LIBS) \
$(GTK_LIBS) \
diff --git a/autotools/symbols.filter b/autotools/symbols.filter
index c42bce7..70bc717 100644
--- a/autotools/symbols.filter
+++ b/autotools/symbols.filter
@@ -1,9 +1,28 @@
{
global:
-_ZN3WTF10fastMallocEj;
-_ZN3WTF11fastReallocEPvj;
+_ZN3WTF10fastCallocEmm;
+_ZN3WTF10fastMallocEm;
+_ZN3WTF10fastStrDupEPKc;
+_ZN3WTF11fastReallocEPvm;
+_ZN3WTF14fastMallocSizeEPKv;
+_ZN3WTF16fastZeroedMallocEm;
+_ZN3WTF20fastMallocStatisticsEv;
_ZN3WTF8fastFreeEPv;
-_ZN3WTF10fastCallocEjj;
+_ZN3WTF3MD58addBytesEPKhm;
+_ZN3WTF3MD58checksumERNS_6VectorIhLm16EEE;
+_ZN3WTF3MD5C1Ev;
+_ZN3WTF3MD5C2Ev;
+_ZN3WTFL12MD5TransformEPjPKj;
+_ZN3WTF7CString11mutableDataEv;
+_ZN3WTF7CString16newUninitializedEmRPc;
+_ZN3WTF7CString18copyBufferIfNeededEv;
+_ZN3WTF7CString4initEPKcm;
+_ZN3WTF7CStringC1EPKc;
+_ZN3WTF7CStringC1EPKcm;
+_ZN3WTF7CStringC2EPKc;
+_ZN3WTF7CStringC2EPKcm;
+_ZN3WTF7CStringD1Ev;
+_ZN3WTF7CStringaSERKS0_;
_ZN24DumpRenderTreeSupportGtk*;
local:
_Z*;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list