From e12691c0fd881d32f2e0cb9dd10273d475e41a50 Mon Sep 17 00:00:00 2001 From: "zecke@webkit.org" Date: Thu, 3 Jan 2008 02:07:28 +0000 Subject: [PATCH] 2008-01-02 Holger Hans Peter Freyther Rubber stamped by Alp. Remove GDK_MULTIHEAD_SAFE and GTK_MULTIHEAD_SAFE because they break the build. At least people doing a debug build on Ubuntu Hardy will see the breakage. I was asked to leave the flags inside the files to ease future debugging. * GNUmakefile.am: * WebKit.pri: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29105 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 12 ++++++++++++ GNUmakefile.am | 8 +++++--- WebKit.pri | 3 ++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11ecd59..ccd8748 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-01-02 Holger Hans Peter Freyther + + Rubber stamped by Alp. + + Remove GDK_MULTIHEAD_SAFE and GTK_MULTIHEAD_SAFE because they break + the build. At least people doing a debug build on Ubuntu Hardy will see + the breakage. I was asked to leave the flags inside the files to ease future + debugging. + + * GNUmakefile.am: + * WebKit.pri: + 2008-01-01 Alp Toker GTK+ autotools build fix. Track changes in r29051, r29058 and pass the diff --git a/GNUmakefile.am b/GNUmakefile.am index f3ec252..aa6419e 100644 --- a/GNUmakefile.am +++ b/GNUmakefile.am @@ -180,9 +180,11 @@ webkitgtk_cppflags += \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ - -DPANGO_DISABLE_DEPRECATED \ - -DGDK_MULTIHEAD_SAFE \ - -DGTK_MULTIHEAD_SAFE + -DPANGO_DISABLE_DEPRECATED + +# Might be useful in the future +# -DGDK_MULTIHEAD_SAFE \ +# -DGTK_MULTIHEAD_SAFE endif if !ENABLE_DATABASE diff --git a/WebKit.pri b/WebKit.pri index ce32d28..36404ac 100644 --- a/WebKit.pri +++ b/WebKit.pri @@ -59,7 +59,8 @@ CONFIG(release) { } 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 + DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED +# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE } BASE_DIR = $$PWD -- 1.8.3.1