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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1c93d83e3d9d2c7ba6e0d1c896cde2eee3245f6d
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 17:33:22 2010 +0000

    2010-08-25  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] CodeGeneratorGObject not picking up FEATURE_DEFINES
            https://bugs.webkit.org/show_bug.cgi?id=44608
    
            Move FEATURE_DEFINES declaration here, since it's used by the
            bindings code generator. Also, fix typo in the variable holding
            the defines.
    
            * GNUmakefile.am:
    
    WebCore:
    
    2010-08-25  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] CodeGeneratorGObject not picking up FEATURE_DEFINES
            https://bugs.webkit.org/show_bug.cgi?id=44608
    
            Move FEATURE_DEFINES declaration to the toplevel GNUmakefile.am,
            since it's used there now too.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66021 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 2508bd4..1e80120 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-25  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] CodeGeneratorGObject not picking up FEATURE_DEFINES
+        https://bugs.webkit.org/show_bug.cgi?id=44608
+
+        Move FEATURE_DEFINES declaration here, since it's used by the
+        bindings code generator. Also, fix typo in the variable holding
+        the defines.
+
+        * GNUmakefile.am:
+
 2010-08-25  Rafael Antognolli  <antognolli at profusion.mobi>
 
         Unreviewed build fix.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 6496c0c..1ca3cdf 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -818,9 +818,10 @@ $(top_builddir)/DerivedSources/webkit/WebKitDOMEventTargetPrivate.h: $(WebCore)/
 	$(AM_V_GEN)cp -f $< $@
 
 # Filter out SVG for now
+FEATURE_DEFINES :=
 gdom_feature_defines := $(filter-out ENABLE-SVG%, $(FEATURE_DEFINES))
 DerivedSources/webkit/WebKitDOM%.cpp DerivedSources/webkit/WebKitDOM%.h DerivedSources/webkit/WebKitDOM%Private.h:: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm
-	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKIT)" --defines "LANGUAGE_GOBJECT=1 $(gdom_features_defines)" --generator GObject $<
+	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKIT)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject $<
 
 webkitgtk_cppflags += \
 	-DBUILDING_WEBKIT \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7a157e9..9269315 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-25  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] CodeGeneratorGObject not picking up FEATURE_DEFINES
+        https://bugs.webkit.org/show_bug.cgi?id=44608
+
+        Move FEATURE_DEFINES declaration to the toplevel GNUmakefile.am,
+        since it's used there now too.
+
+        * GNUmakefile.am:
+
 2010-08-25  Dawit Alemayehu  <adawit at kde.org>
 
         Reviewed by Ariya Hidayat.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index c3d230a..8f3b7cc 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1,4 +1,3 @@
-FEATURE_DEFINES :=
 SVG_FEATURES :=
 HTML_FEATURES :=
 

-- 
WebKit Debian packaging