[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 7799c02a845247a01fc1e8e3d501f74f7a8559dc
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 20:20:37 2010 +0000

    2010-08-24  Xan Lopez  <xlopez at igalia.com>
    
            Try to fix GTK+ build.
    
            Move GTK_API_VERSION_2 define to here, since we want to use it
            outside of WebCore/WebKit.
    
            * GNUmakefile.am:
    
    WebCore:
    
    2010-08-24  Xan Lopez  <xlopez at igalia.com>
    
            Try to fix GTK+ build.
    
            Move GTK_API_VERSION_2 define out.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65927 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 61d1abd..c2b0451 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-24  Xan Lopez  <xlopez at igalia.com>
+
+        Try to fix GTK+ build.
+
+        Move GTK_API_VERSION_2 define to here, since we want to use it
+        outside of WebCore/WebKit.
+
+        * GNUmakefile.am:
+
 2010-08-24  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
 
         [EFL] Unreviewed build fix after r65891.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 87b9564..4590e1c 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -275,6 +275,14 @@ global_cppflags += \
 	-DBUILDING_GTK__=1 \
 	-DWTF_CHANGES
 
+# ----
+# GTK+ 2.x/3.x support
+# ----
+if GTK_API_VERSION_2
+global_cppflags += \
+	-DGTK_API_VERSION_2=1
+endif
+
 if USE_ICU_UNICODE
 global_cppflags += \
 	-DWTF_USE_ICU_UNICODE=1
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1b308f5..b4f12f1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-24  Xan Lopez  <xlopez at igalia.com>
+
+        Try to fix GTK+ build.
+
+        Move GTK_API_VERSION_2 define out.
+
+        * GNUmakefile.am:
+
 2010-08-24  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 2f05367..5e2f2be 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2580,15 +2580,6 @@ webcore_sources += \
 endif
 
 # ----
-# GTK+ 2.x/3.x support
-# ----
-
-if GTK_API_VERSION_2
-webcore_cppflags += \
-	-DGTK_API_VERSION_2=1
-endif
-
-# ----
 # icu unicode backend
 # ----
 if USE_ICU_UNICODE

-- 
WebKit Debian packaging