commit d8e17a2ad160d4e237b03c425f6b72da3bcd7567
Author: Maia Kozheva <si...@ubuntu.com>
Date: Sat Aug 28 16:29:06 2010 +0700
Make gtkpod build with -DG*_DISABLE_SINGLE_INCLUDES
configure.in | 5 ++++-
libgtkpod/tool_menu_action.c | 1 -
libgtkpod/tool_menu_action.h | 2 +-
plugins/track_display/rb_cell_renderer_rating.h | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index 77cdfcc..cfd4131 100644
--- a/configure.in
+++ b/configure.in
@@ -81,7 +81,10 @@ PKG_CHECK_MODULES(LIBANJUTA, libanjuta-1.0 >= 2.30.0,,
[AC_MSG_FAILURE([*** $LIB
PKG_CHECK_MODULES(LIBGDL, gdl-1.0 >= 2.26.0,, [AC_MSG_FAILURE([***
$LIBGDL_PKG_ERRORS])])
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.0,, [AC_MSG_FAILURE([***
$GIO_PKG_ERRORS])])
-CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS
$LIBGLADE_CFLAGS $LIBGPOD_CFLAGS $LIBANJUTA_CFLAGS $LIBGDL_CFLAGS"
+dnl Preparing for GTK3 transition
+GTK_CLEANLINESS_FLAGS="-DG_DISABLE_SINGLE_INCLUDES
-DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+
+CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS
$LIBGLADE_CFLAGS $LIBGPOD_CFLAGS $LIBANJUTA_CFLAGS $LIBGDL_CFLAGS
$GTK_CLEANLINESS_FLAGS"
LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $LIBGLADE_LIBS
$LIBGPOD_LIBS $LIBANJUTA_LIBS $LIBGDL_LIBS"
dnl Setup Gtkpod flags for building library
diff --git a/libgtkpod/tool_menu_action.c b/libgtkpod/tool_menu_action.c
index 2e6b013..3b84abb 100644
--- a/libgtkpod/tool_menu_action.c
+++ b/libgtkpod/tool_menu_action.c
@@ -3,7 +3,6 @@
|
| tool_menu_action.c
*/
-#include <gtk/gtkmenutoolbutton.h>
#include "tool_menu_action.h"
static void tool_menu_action_init (ToolMenuAction *tma);
diff --git a/libgtkpod/tool_menu_action.h b/libgtkpod/tool_menu_action.h
index f9f8cd5..487d536 100644
--- a/libgtkpod/tool_menu_action.h
+++ b/libgtkpod/tool_menu_action.h
@@ -6,7 +6,7 @@
#ifndef __TOOL_MENU_ACTION_H__
#define __TOOL_MENU_ACTION_H__
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/plugins/track_display/rb_cell_renderer_rating.h
b/plugins/track_display/rb_cell_renderer_rating.h
index cd8cbee..049d9c2 100644
--- a/plugins/track_display/rb_cell_renderer_rating.h
+++ b/plugins/track_display/rb_cell_renderer_rating.h
@@ -24,7 +24,7 @@
#ifndef __RB_CELL_RENDERER_RATING_H
#define __RB_CELL_RENDERER_RATING_H
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
