[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 18:28:00 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 74cd7ec096acb9592e629c09947b4ceaffdf1411
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 11 07:14:32 2010 +0000
2010-12-10 Siddharth Mathur <siddharth.mathur at nokia.com>
Reviewed by Eric Seidel.
[Qt] Build fix for Symbian: don't compile POSIX memory management implementation
https://bugs.webkit.org/show_bug.cgi?id=50707
* wtf/wtf.pri:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 6f44577..6cb0bb6 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-10 Siddharth Mathur <siddharth.mathur at nokia.com>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] Build fix for Symbian: don't compile POSIX memory management implementation
+ https://bugs.webkit.org/show_bug.cgi?id=50707
+
+ * wtf/wtf.pri:
+
2010-12-10 Steve Falkenburg <sfalken at apple.com>
Windows production build fix.
diff --git a/JavaScriptCore/wtf/wtf.pri b/JavaScriptCore/wtf/wtf.pri
index 6a7ac41..4d50d48 100644
--- a/JavaScriptCore/wtf/wtf.pri
+++ b/JavaScriptCore/wtf/wtf.pri
@@ -43,6 +43,6 @@ contains(DEFINES, USE_GSTREAMER=1) {
SOURCES += wtf/TCSystemAlloc.cpp
}
-unix: SOURCES += wtf/OSAllocatorPosix.cpp
+unix:!symbian: SOURCES += wtf/OSAllocatorPosix.cpp
symbian: SOURCES += wtf/OSAllocatorSymbian.cpp
win*|wince*: SOURCES += wtf/OSAllocatorWin.cpp
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list