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

ggaren at apple.com ggaren at apple.com
Wed Dec 22 17:53:27 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3b701757e516f12c7951365bf8e672a918417351
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 02:52:33 2010 +0000

    Try to fix the Qt Linux build.
    
    * wtf/wtf.pri: Use the POSIX OSAllocator for Qt Linux.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73097 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 0602eb0..f6166db 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-12-01  Geoffrey Garen  <ggaren at apple.com>
 
+        Try to fix the Qt Linux build.
+
+        * wtf/wtf.pri: Use the POSIX OSAllocator for Qt Linux.
+
+2010-12-01  Geoffrey Garen  <ggaren at apple.com>
+
         Windows build fix: commit doesn't have a return value.
 
         * wtf/OSAllocatorWin.cpp:
diff --git a/JavaScriptCore/wtf/wtf.pri b/JavaScriptCore/wtf/wtf.pri
index 77c3113..e9d57f3 100644
--- a/JavaScriptCore/wtf/wtf.pri
+++ b/JavaScriptCore/wtf/wtf.pri
@@ -13,7 +13,7 @@ SOURCES += \
     wtf/HashTable.cpp \
     wtf/MD5.cpp \
     wtf/MainThread.cpp \
-    wtf/OSAllocatorSymbian.cpp \
+    wtf/OSAllocatorPosix.cpp \
     wtf/qt/MainThreadQt.cpp \
     wtf/qt/StringQt.cpp \
     wtf/qt/ThreadingQt.cpp \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list