[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
philn at webkit.org
philn at webkit.org
Wed Dec 22 18:29:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1927b01ac16d5feb02a9496cf86ff6252df6b297
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Dec 12 11:30:56 2010 +0000
2010-12-12 Philippe Normand <pnormand at igalia.com>
Reviewed by Xan Lopez.
build-webkit --gtk --minimal fails
https://bugs.webkit.org/show_bug.cgi?id=46267
No new tests, build fix only.
* GNUmakefile.am: Include some JS bindings generated headers in
the build even if their corresponding feature is disabled. They
are needed to make the DOM bindings build.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73872 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9b94e75..153d09b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-12 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ build-webkit --gtk --minimal fails
+ https://bugs.webkit.org/show_bug.cgi?id=46267
+
+ No new tests, build fix only.
+
+ * GNUmakefile.am: Include some JS bindings generated headers in
+ the build even if their corresponding feature is disabled. They
+ are needed to make the DOM bindings build.
+
2010-12-12 Sam Magnuson <smagnuso at gmail.com>
Reviewed by Eric Seidel.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 1e7d4c7..cc121c9 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -206,6 +206,7 @@ webcore_built_sources += \
DerivedSources/WebCore/JSDocument.h \
DerivedSources/WebCore/JSDocumentType.cpp \
DerivedSources/WebCore/JSDocumentType.h \
+ DerivedSources/WebCore/JSDOMApplicationCache.h \
DerivedSources/WebCore/JSDOMCoreException.cpp \
DerivedSources/WebCore/JSDOMCoreException.h \
DerivedSources/WebCore/JSDOMFormData.cpp \
@@ -517,12 +518,19 @@ webcore_built_sources += \
DerivedSources/WebCore/JSSpeechInputResult.h \
DerivedSources/WebCore/JSSpeechInputResultList.cpp \
DerivedSources/WebCore/JSSpeechInputResultList.h \
+ DerivedSources/WebCore/JSSQLException.h \
+ DerivedSources/WebCore/JSSQLResultSetRowList.h \
+ DerivedSources/WebCore/JSSQLStatementErrorCallback.cpp \
+ DerivedSources/WebCore/JSSQLTransaction.h \
+ DerivedSources/WebCore/JSSQLTransactionSync.h \
+ DerivedSources/WebCore/JSStorage.h \
DerivedSources/WebCore/JSStyleMedia.cpp \
DerivedSources/WebCore/JSStyleMedia.h \
DerivedSources/WebCore/JSStyleSheet.cpp \
DerivedSources/WebCore/JSStyleSheet.h \
DerivedSources/WebCore/JSStyleSheetList.cpp \
DerivedSources/WebCore/JSStyleSheetList.h \
+ DerivedSources/WebCore/JSSVGElementInstance.h \
DerivedSources/WebCore/JSSVGElementWrapperFactory.cpp \
DerivedSources/WebCore/JSText.cpp \
DerivedSources/WebCore/JSTextEvent.cpp \
@@ -3902,8 +3910,7 @@ if ENABLE_OFFLINE_WEB_APPLICATIONS
FEATURE_DEFINES += ENABLE_OFFLINE_WEB_APPLICATIONS=1
webcore_cppflags += -DENABLE_OFFLINE_WEB_APPLICATIONS=1
webcore_built_sources += \
- DerivedSources/WebCore/JSDOMApplicationCache.cpp \
- DerivedSources/WebCore/JSDOMApplicationCache.h
+ DerivedSources/WebCore/JSDOMApplicationCache.cpp
endif # END ENABLE_OFFLINE_WEB_APPLICATIONS
# ----
@@ -3922,23 +3929,18 @@ webcore_built_sources += \
DerivedSources/WebCore/JSSQLError.cpp \
DerivedSources/WebCore/JSSQLError.h \
DerivedSources/WebCore/JSSQLException.cpp \
- DerivedSources/WebCore/JSSQLException.h \
DerivedSources/WebCore/JSSQLResultSet.cpp \
DerivedSources/WebCore/JSSQLResultSet.h \
DerivedSources/WebCore/JSSQLResultSetRowList.cpp \
- DerivedSources/WebCore/JSSQLResultSetRowList.h \
DerivedSources/WebCore/JSSQLStatementCallback.cpp \
DerivedSources/WebCore/JSSQLStatementCallback.h \
- DerivedSources/WebCore/JSSQLStatementErrorCallback.cpp \
DerivedSources/WebCore/JSSQLStatementErrorCallback.h \
DerivedSources/WebCore/JSSQLTransaction.cpp \
- DerivedSources/WebCore/JSSQLTransaction.h \
DerivedSources/WebCore/JSSQLTransactionCallback.cpp \
DerivedSources/WebCore/JSSQLTransactionCallback.h \
DerivedSources/WebCore/JSSQLTransactionErrorCallback.cpp \
DerivedSources/WebCore/JSSQLTransactionErrorCallback.h \
DerivedSources/WebCore/JSSQLTransactionSync.cpp \
- DerivedSources/WebCore/JSSQLTransactionSync.h \
DerivedSources/WebCore/JSSQLTransactionSyncCallback.cpp \
DerivedSources/WebCore/JSSQLTransactionSyncCallback.h
else
@@ -4017,7 +4019,6 @@ FEATURE_DEFINES += ENABLE_DOM_STORAGE=1
webcore_cppflags += -DENABLE_DOM_STORAGE=1
webcore_built_sources += \
DerivedSources/WebCore/JSStorage.cpp \
- DerivedSources/WebCore/JSStorage.h \
DerivedSources/WebCore/JSStorageEvent.cpp \
DerivedSources/WebCore/JSStorageEvent.h
endif # END ENABLE_DOM_STORAGE
@@ -4338,7 +4339,6 @@ webcore_built_sources += \
DerivedSources/WebCore/JSSVGElement.cpp \
DerivedSources/WebCore/JSSVGElement.h \
DerivedSources/WebCore/JSSVGElementInstance.cpp \
- DerivedSources/WebCore/JSSVGElementInstance.h \
DerivedSources/WebCore/JSSVGElementInstanceList.cpp \
DerivedSources/WebCore/JSSVGElementInstanceList.h \
DerivedSources/WebCore/JSSVGEllipseElement.cpp \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list