The patch looks ok in general, some comments: --- ../../gtk/gtkplug-stub.c.orig 2006-01-08 21:52:05.000000000 +0100 +++ ../../gtk/gtkplug-stub.c 2006-01-08 21:53:14.000000000 +0100 @@ -25,6 +25,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */
+#include <gtk.h> #include "gtkplugprivate.h" GdkNativeWindow =================================================================== --- ../../gtk/gtksocket-stub.c.orig 2006-01-08 21:53:36.000000000 +0100 +++ ../../gtk/gtksocket-stub.c 2006-01-08 21:54:20.000000000 +0100 @@ -25,6 +25,7 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ +#include <gtk.h> #include "gtksocketprivate.h" Why is this necessary ? gtk sources usually just include the individual headers they need. =================================================================== --- ../../gdk/gdk.symbols.orig 2006-01-08 21:40:54.000000000 +0100 +++ ../../gdk/gdk.symbols 2006-01-08 21:43:29.000000000 +0100 @@ -326,10 +326,10 @@ #if IN_FILE(__GDK_COLOR_X11_C__) gdk_colormap_new gdk_colormap_get_type G_GNUC_CONST +#ifndef GDK_DISABLE_DEPRECATED gdk_colormap_change gdk_colors_alloc gdk_colors_free -#ifndef GDK_DISABLE_DEPRECATED gdk_colormap_get_system_size gdk_color_change #endif @@ -530,6 +530,8 @@ gdk_drawable_ref gdk_drawable_unref gdk_draw_string +gdk_draw_text +gdk_draw_text_wc #endif gdk_drawable_get_depth gdk_drawable_get_display @@ -553,8 +555,6 @@ gdk_draw_polygon gdk_draw_rectangle gdk_draw_segments -gdk_draw_text -gdk_draw_text_wc gdk_draw_trapezoids #endif #endif @@ -806,12 +806,15 @@ These are independent bugfixes @@ -806,12 +806,15 @@ gdk_keymap_get_for_display gdk_keymap_lookup_key gdk_keymap_translate_keyboard_state +#ifndef GDK_WINDOWING_DIRECTFB gdk_keyval_convert_case +#endif gdk_keyval_from_name gdk_keyval_name G_GNUC_CONST #endif #endif The directfb backend needs to implement gdk_keyval_convert_case. +if test "x$gdktarget" = "xdirectfb"; then + DIRECTFB_REQUIRED_VERSION=0.9.21 + AC_MSG_CHECKING(for DirectFB) + + if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then + AC_MSG_RESULT(found) + GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags directfb` $GDK_EXTRA_CFLAGS" + GDK_EXTRA_LIBS="`$PKG_CONFIG --libs directfb` $GDK_EXTRA_LIBS" + else + AC_MSG_ERROR([ +*** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest +*** version of DirectFB is always available from http://www.directfb.org/. + The definition of DIRECTFB_REQUIRED_VERSION should probably be move up to the other required versions at the top of configure.in. Matthias _______________________________________________ gtk-devel-list mailing list gtk-devel-list@gnome.org http://mail.gnome.org/mailman/listinfo/gtk-devel-list
