2007-12-27 Jan Michael Alonzo <jmalonzo@unpluggable.com>

        Reviewed by Alp Toker.

        http://bugs.webkit.org/show_bug.cgi?id=16353
        [GTK] Check for deprecated API use (G_DISABLE_DEPRECATED etc.)

        Added the flags mentioned in the bug only when doing 'debug'
        builds. -DGST_DISABLE_DEPRECATED only added when video is enabled.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index e815a279e5952d0cfbd5d4578c6c95212608496a..e7abbc722346cf1cfc19c512a87f2335bea11240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-12-27  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16353
+        [GTK] Check for deprecated API use (G_DISABLE_DEPRECATED etc.)
+
+        Added the flags mentioned in the bug only when doing 'debug'
+        builds. -DGST_DISABLE_DEPRECATED only added when video is enabled.
+
+        * GNUmakefile.am:
+        * WebKit.pri:
+
 2007-12-26  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
 
         Reviewed by Alp Toker.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 841e8bd6c486ba90e6c295d001517c6a3b054207..b5ff680155ffdab4c506d18f356be1897eb8ab98 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -154,6 +154,15 @@ global_cppflags += \
 
 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
+else 
+webkitgtk_cppflags += \
+       -DG_DISABLE_DEPRECATED \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
+       -DGDK_DISABLE_DEPRECATED \
+       -DGTK_DISABLE_DEPRECATED \
+       -DPANGO_DISABLE_DEPRECATED \
+       -DGDK_MULTIHEAD_SAFE \
+       -DGTK_MULTIHEAD_SAFE
 endif
 
 if TARGET_X11

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fcaefcb22c3581ebdacaef50c1a72760ae8506f3..7f157289b0e0604daff6cc22201946741aeda28d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2007-12-27  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16353
+        [GTK] Check for deprecated API use (G_DISABLE_DEPRECATED etc.)
+
+        Added the flags mentioned in the bug only when doing 'debug'
+        builds. -DGST_DISABLE_DEPRECATED only added when video is enabled.
+
+        * GNUmakefile.am:
+        * WebCore.pro:
+
 2007-12-27  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Eric Seidel.

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index e5cf73f69b1675bd0bee2670efbbd053e2858911..c575f2a4afb46893c6de9cc63a2c51a7a8bc65dd 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1044,6 +1044,10 @@ FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO=1
 
 webkitgtk_cppflags += -DENABLE_VIDEO=1
 
+if ENABLE_DEBUG
+webkitgtk_cppflags += -DGST_DISABLE_DEPRECATED
+endif # END ENABLE_DEBUG
+
 webkitgtk_built_sources += \
        DerivedSources/JSHTMLSourceElement.h \
        DerivedSources/JSHTMLAudioElement.h \

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 84dc6e8c827534ed0831b79aaf3d332532b33d2e..2f88abc2fa8824dfc9832090ab58fb0624af5d94 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1125,6 +1125,8 @@ contains(DEFINES, ENABLE_VIDEO=1) {
             platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp \
             platform/graphics/gtk/VideoSinkGStreamer.cpp
 
+        CONFIG(debug):DEFINES += GST_DISABLE_DEPRECATED
+
         PKGCONFIG += gstreamer-0.10 gstreamer-plugins-base-0.10 gnome-vfs-2.0
         LIBS += -lgstinterfaces-0.10 -lgstbase-0.10 -lgstvideo-0.10
     }

diff --git a/WebKit.pri b/WebKit.pri
index 640fa34174c42d509067ca84afd64c28e1fef8de..ce32d2857b8662dc4a98771246787a44d1e714a4 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -58,6 +58,10 @@ CONFIG(release) {
     DEFINES += NDEBUG
 }
 
+gtk-port:CONFIG(debug) {
+    DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE
+}
+
 BASE_DIR = $$PWD
 qt-port:INCLUDEPATH += \
     $$PWD/WebKit/qt/Api