[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
yael.aharon at nokia.com
yael.aharon at nokia.com
Sun Feb 20 23:49:30 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit b8dd8435c861bdd7c3102b228437ce765063d200
Author: yael.aharon at nokia.com <yael.aharon at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 25 18:18:28 2011 +0000
Unreviewed build fix.
After r76466, efsrv.lib is used unconditionally.
Don't guard it with ENABLE_NETSCAPE_PLUGIN_API.
* WebCore.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76606 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b00e53d..f3df520 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-25 Yael Aharon <yael.aharon at nokia.com>
+
+ Unreviewed build fix.
+ After r76466, efsrv.lib is used unconditionally.
+ Don't guard it with ENABLE_NETSCAPE_PLUGIN_API.
+
+ * WebCore.pro:
+
2011-01-24 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
diff --git a/Source/WebCore/WebCore.pro b/Source/WebCore/WebCore.pro
index 3cd1826..bf900a9 100644
--- a/Source/WebCore/WebCore.pro
+++ b/Source/WebCore/WebCore.pro
@@ -2847,6 +2847,8 @@ symbian {
SOURCES += \
plugins/symbian/PluginDatabaseSymbian.cpp \
plugins/symbian/PluginPackageSymbian.cpp
+
+ LIBS += -lefsrv
}
contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
@@ -2862,8 +2864,6 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
plugins/symbian/PluginContainerSymbian.h \
plugins/symbian/npinterface.h
- LIBS += -lefsrv
-
} else {
unix {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list