[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0aabd4dd38046ab665c908ba9a94ceac1c326431
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 12:44:35 2010 +0000

    2010-03-03  Fridrich Strba  <fridrich.strba at bluewin.ch>
    
            Reviewed by Xan Lopez.
    
            Miscellaneous little fixes for the windows build of webkit-gtk
            https://bugs.webkit.org/show_bug.cgi?id=35640
    
            * GNUmakefile.am: On Windows with GCC, presence of
            __declspec(dllexport) on some symbols disables the autoexport/autoimport
            feature for all others. Using regex here assures that all symbols that
            need to be exported in the dll are actually exported.
    2010-03-03  Fridrich Strba  <fridrich.strba at bluewin.ch>
    
            Reviewed by Xan Lopez.
    
            Miscellaneous little fixes for the windows build of webkit-gtk
            https://bugs.webkit.org/show_bug.cgi?id=35640
    
            * GNUmakefile.am: dist two new files concerning mathml support.
    2010-03-03  Fridrich Strba  <fridrich.strba at bluewin.ch>
    
            Reviewed by Xan Lopez.
    
            Miscellaneous little fixes for the windows build of webkit-gtk
            https://bugs.webkit.org/show_bug.cgi?id=35640
    
            * webkit/webkitdownload.cpp: Windows headers define ERROR
            which breaks the build. Undef ERROR if it is defined.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55457 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 63bfd52..ff7405a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-03  Fridrich Strba  <fridrich.strba at bluewin.ch>
+
+        Reviewed by Xan Lopez.
+
+        Miscellaneous little fixes for the windows build of webkit-gtk
+        https://bugs.webkit.org/show_bug.cgi?id=35640
+
+        * GNUmakefile.am: On Windows with GCC, presence of
+        __declspec(dllexport) on some symbols disables the autoexport/autoimport
+        feature for all others. Using regex here assures that all symbols that 
+        need to be exported in the dll are actually exported.
+
 2010-03-02  Arno Renevier  <arno at renevier.net>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 5a25554..dbcd52a 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -142,6 +142,7 @@ global_cxxflags += \
 # It breaks the build on other platforms, so we use it conditionally
 if OS_WIN32
 no_undefined = -no-undefined
+version_script = -export-symbols-regex "^(webkit_|JS).*"
 endif
 
 if OS_GNU
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 96ce561..c9a5a92 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-03  Fridrich Strba  <fridrich.strba at bluewin.ch>
+
+        Reviewed by Xan Lopez.
+
+        Miscellaneous little fixes for the windows build of webkit-gtk
+        https://bugs.webkit.org/show_bug.cgi?id=35640
+
+        * GNUmakefile.am: dist two new files concerning mathml support.
+
 2010-03-03  Xan Lopez  <xlopez at igalia.com>
 
         Unreviewed distcheck fix.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 685140c..15b13ba 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2766,6 +2766,8 @@ webcore_sources += \
 	WebCore/mathml/MathMLTextElement.h \
 	WebCore/mathml/RenderMathMLBlock.cpp \
 	WebCore/mathml/RenderMathMLBlock.h \
+	WebCore/mathml/RenderMathMLSubSup.cpp \
+	WebCore/mathml/RenderMathMLSubSup.h \
 	WebCore/mathml/RenderMathMLUnderOver.cpp \
 	WebCore/mathml/RenderMathMLUnderOver.h
 
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 4db23d9..408809e 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-03  Fridrich Strba  <fridrich.strba at bluewin.ch>
+
+        Reviewed by Xan Lopez.
+
+        Miscellaneous little fixes for the windows build of webkit-gtk
+        https://bugs.webkit.org/show_bug.cgi?id=35640
+
+        * webkit/webkitdownload.cpp: Windows headers define ERROR
+        which breaks the build. Undef ERROR if it is defined.
+
 2010-03-03  Philippe Normand  <pnormand at igalia.com>
 
         Unreviewed, build fix after r55452.
diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp
index 8f3214e..878bf8b 100644
--- a/WebKit/gtk/webkit/webkitdownload.cpp
+++ b/WebKit/gtk/webkit/webkitdownload.cpp
@@ -37,6 +37,10 @@
 
 #include <glib/gstdio.h>
 
+#ifdef ERROR
+#undef ERROR
+#endif
+
 using namespace WebKit;
 using namespace WebCore;
 

-- 
WebKit Debian packaging