[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 0799914bb98f69caa259930af42a7fd51380b471
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 23:21:33 2009 +0000

    2009-11-13  Norbert Leser  <norbert.leser&nokia.com>
    
            Reviewed by Eric Seidel.
    
            Added macros for USERINCLUDE paths within symbian blocks
            to guarantee inclusion of respective header files from local path
            first (to avoid clashes with same names of header files in system include path).
    
            * JavaScriptCore.pri:
    2009-11-13  Norbert Leser  <norbert.leser&nokia.com>
    
            Reviewed by Eric Seidel.
    
            Added macros for USERINCLUDE paths within symbian blocks
            to guarantee inclusion of respective header files from local path
            first (to avoid clashes with same names of header files in system include path).
    
            * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50970 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3f39e6b..896a13f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-13  Norbert Leser  <norbert.leser&nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Added macros for USERINCLUDE paths within symbian blocks
+        to guarantee inclusion of respective header files from local path
+        first (to avoid clashes with same names of header files in system include path).
+
+        * JavaScriptCore.pri:
+
 2009-11-13  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index 295ee2c..ce0a89a 100644
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -9,6 +9,11 @@ CONFIG(debug, debug|release) {
     OBJECTS_DIR = obj/release
 }
 
+symbian: {
+    # Need to guarantee this comes before system includes of /epoc32/include
+    MMP_RULES += "USERINCLUDE ../JavaScriptCore/profiler"
+}
+
 INCLUDEPATH = \
     $$PWD \
     $$PWD/.. \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 227f6fb..6d5d205 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-13  Norbert Leser  <norbert.leser&nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Added macros for USERINCLUDE paths within symbian blocks
+        to guarantee inclusion of respective header files from local path
+        first (to avoid clashes with same names of header files in system include path).
+
+        * WebCore.pro:
+
 2009-11-13  Hironori Bono  <hbono at chromium.org>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 415b22d..f889ede 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -12,6 +12,9 @@ symbian: {
     DEPLOYMENT += webkitlibs
 
     TARGET.UID3 = 0x200267C2
+    # Need to guarantee that these come before system includes of /epoc32/include
+    MMP_RULES += "USERINCLUDE rendering"
+    MMP_RULES += "USERINCLUDE platform/text"
     # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target.
     # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
     MMP_RULES += "LINKEROPTION  armcc --rw-base 0xE00000"

-- 
WebKit Debian packaging