[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a0ba7faead92800071b5f065314d11ffdbcbd7f9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 15:43:02 2010 +0000

    2010-08-31  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Antonio Gomes.
    
            [CMake] Add IF (ENABLE_MATHML) around MathML sources
            https://bugs.webkit.org/show_bug.cgi?id=44927
    
            * CMakeLists.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 4ad0234..15911b3 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1146,21 +1146,6 @@ SET(WebCore_SOURCES
     loader/icon/PageURLRecord.cpp
     loader/loader.cpp
 
-    mathml/MathMLElement.cpp
-    mathml/MathMLInlineContainerElement.cpp
-    mathml/MathMLMathElement.cpp
-    mathml/MathMLTextElement.cpp
-    mathml/RenderMathMLBlock.cpp
-    mathml/RenderMathMLFenced.cpp
-    mathml/RenderMathMLFraction.cpp
-    mathml/RenderMathMLMath.cpp
-    mathml/RenderMathMLOperator.cpp
-    mathml/RenderMathMLRoot.cpp
-    mathml/RenderMathMLRow.cpp
-    mathml/RenderMathMLSquareRoot.cpp
-    mathml/RenderMathMLSubSup.cpp
-    mathml/RenderMathMLUnderOver.cpp
-
     page/BarInfo.cpp
     page/Chrome.cpp
     page/Console.cpp
@@ -1579,6 +1564,25 @@ IF (ENABLE_DATABASE)
     )
 ENDIF ()
 
+IF (ENABLE_MATHML)
+    LIST(APPEND WebCore_SOURCES
+        mathml/MathMLElement.cpp
+        mathml/MathMLInlineContainerElement.cpp
+        mathml/MathMLMathElement.cpp
+        mathml/MathMLTextElement.cpp
+        mathml/RenderMathMLBlock.cpp
+        mathml/RenderMathMLFenced.cpp
+        mathml/RenderMathMLFraction.cpp
+        mathml/RenderMathMLMath.cpp
+        mathml/RenderMathMLOperator.cpp
+        mathml/RenderMathMLRoot.cpp
+        mathml/RenderMathMLRow.cpp
+        mathml/RenderMathMLSquareRoot.cpp
+        mathml/RenderMathMLSubSup.cpp
+        mathml/RenderMathMLUnderOver.cpp
+    )
+ENDIF ()
+
 IF (ENABLE_SVG)
     LIST(APPEND WebCore_SOURCES
         bindings/js/JSSVGElementInstanceCustom.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 761b6ff..9faf21c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,14 @@
 2010-08-31  Patrick Gansterer  <paroga at paroga.com>
 
+        Reviewed by Antonio Gomes.
+
+        [CMake] Add IF (ENABLE_MATHML) around MathML sources
+        https://bugs.webkit.org/show_bug.cgi?id=44927
+
+        * CMakeLists.txt:
+
+2010-08-31  Patrick Gansterer  <paroga at paroga.com>
+
         Reviewed by Kenneth Rohde Christiansen.
 
         [CMake] Unify GENERATE_DOM_NAMES code

-- 
WebKit Debian packaging