[maemo-commits] [maemo-commits] r16998 - in projects/haf/trunk/gtk+: . gdk gtk gtk/tests tests
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Dec 17 17:05:28 EET 2008
- Previous message: [maemo-commits] r16997 - projects/haf/tags/hildon-fm
- Next message: [maemo-commits] r16999 - in projects/haf/trunk/gtk+: . debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kris Date: 2008-12-17 17:05:23 +0200 (Wed, 17 Dec 2008) New Revision: 16998 Modified: projects/haf/trunk/gtk+/ChangeLog projects/haf/trunk/gtk+/acconfig.h projects/haf/trunk/gtk+/configure.in projects/haf/trunk/gtk+/gdk/gdk.symbols projects/haf/trunk/gtk+/gdk/makegdkalias.pl projects/haf/trunk/gtk+/gtk/Makefile.am projects/haf/trunk/gtk+/gtk/gtk.symbols projects/haf/trunk/gtk+/gtk/tests/Makefile.am projects/haf/trunk/gtk+/tests/Makefile.am Log: 2008-12-17 Kristian Rietveld <kris at imendio.com> Fixes: NB#91632 - Errors compiling gtk+ maemo version removing MAEMO_CHANGES define * configure.in: introduce a --with-maemo argument that will add the MAEMO_CHANGES define to the CFLAGS and GTK_EXTRA_FLAGS and adds a MAEMO_CHANGES autoconf conditional. The addition to GTK_EXTRA_FLAGS will cause gtk+'s pkg-config file to pick up this compile flag. * acconfig.h: add MAEMO_CHANGES. * gdk/makegdkalias.pl: support #ifdefs that start with M (like the gtk/ equivalent already does). * gdk/gdk.symbols * gtk/gtk.symbols: guard maemo symbols in MAEMO_CHANGES #ifdefs. * gtk/Makefile.am: define MAEMO_CHANGES in the gtktypebuiltins.c rule. * gtk/tests/Makefile.am * tests/Makefile.am: only build maemo specific tests if --with-maemo has been enabled. Modified: projects/haf/trunk/gtk+/ChangeLog =================================================================== --- projects/haf/trunk/gtk+/ChangeLog 2008-12-16 17:13:01 UTC (rev 16997) +++ projects/haf/trunk/gtk+/ChangeLog 2008-12-17 15:05:23 UTC (rev 16998) @@ -1,3 +1,28 @@ +2008-12-17 Kristian Rietveld <kris at imendio.com> + + Fixes: NB#91632 - Errors compiling gtk+ maemo version removing + MAEMO_CHANGES define + + * configure.in: introduce a --with-maemo argument that will + add the MAEMO_CHANGES define to the CFLAGS and GTK_EXTRA_FLAGS + and adds a MAEMO_CHANGES autoconf conditional. The addition to + GTK_EXTRA_FLAGS will cause gtk+'s pkg-config file to pick up this + compile flag. + + * acconfig.h: add MAEMO_CHANGES. + + * gdk/makegdkalias.pl: support #ifdefs that start with M (like + the gtk/ equivalent already does). + + * gdk/gdk.symbols + * gtk/gtk.symbols: guard maemo symbols in MAEMO_CHANGES #ifdefs. + + * gtk/Makefile.am: define MAEMO_CHANGES in the gtktypebuiltins.c rule. + + * gtk/tests/Makefile.am + * tests/Makefile.am: only build maemo specific tests if + --with-maemo has been enabled. + 2008-12-16 Claudio Saavedra <csaavedra at igalia.com> Released 2:2.12.12-1maemo5 Modified: projects/haf/trunk/gtk+/acconfig.h =================================================================== --- projects/haf/trunk/gtk+/acconfig.h 2008-12-16 17:13:01 UTC (rev 16997) +++ projects/haf/trunk/gtk+/acconfig.h 2008-12-17 15:05:23 UTC (rev 16998) @@ -75,6 +75,8 @@ /* #undef PACKAGE */ /* #undef VERSION */ +#undef MAEMO_CHANGES + /* Leave that blank line there!! Autoheader needs it. If you're adding to this file, keep in mind: Modified: projects/haf/trunk/gtk+/configure.in =================================================================== --- projects/haf/trunk/gtk+/configure.in 2008-12-16 17:13:01 UTC (rev 16997) +++ projects/haf/trunk/gtk+/configure.in 2008-12-17 15:05:23 UTC (rev 16998) @@ -46,9 +46,6 @@ # Save this value here, since automake will set cflags later cflags_set=${CFLAGS+set} -### enable MAEMO platform extensions -CFLAGS="$CFLAGS -DMAEMO_CHANGES" - AM_INIT_AUTOMAKE(no-define) AM_CONFIG_HEADER(config.h) @@ -236,6 +233,10 @@ AC_ARG_WITH(xinput, [AC_HELP_STRING([--with-xinput=@<:@no/yes@:>@], [support XInput])]) +dnl arg to turn on maemo specific features +AC_ARG_WITH(maemo, + [AC_HELP_STRING([--with-maemo=@<:@no/yes@:>@], [enable Maemo specific features])]) + if test "$platform_win32" = yes; then gdktarget=win32 else @@ -1538,6 +1539,17 @@ GDK_PIXBUF_EXTRA_LIBS= fi +dnl Handle --with-maemo option +if test "x$with_maemo" = "xyes"; then + AC_DEFINE(MAEMO_CHANGES) + + CFLAGS="$CFLAGS -DMAEMO_CHANGES" + GTK_EXTRA_CFLAGS="$GTK_EXTRA_CFLAGS -DMAEMO_CHANGES" +fi + +AM_CONDITIONAL(MAEMO_CHANGES, test x$with_maemo = xyes) + + AC_SUBST(GDK_PIXBUF_PACKAGES) AC_SUBST(GDK_PIXBUF_EXTRA_LIBS) AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS) Modified: projects/haf/trunk/gtk+/gdk/gdk.symbols =================================================================== --- projects/haf/trunk/gtk+/gdk/gdk.symbols 2008-12-16 17:13:01 UTC (rev 16997) +++ projects/haf/trunk/gtk+/gdk/gdk.symbols 2008-12-17 15:05:23 UTC (rev 16998) @@ -84,7 +84,9 @@ gdk_pointer_is_grabbed gdk_pointer_ungrab gdk_event_send_client_message +#ifdef MAEMO_CHANGES gdk_close_all_temporary_windows +#endif gdk_event_send_clientmessage_toall #endif #endif Modified: projects/haf/trunk/gtk+/gdk/makegdkalias.pl =================================================================== --- projects/haf/trunk/gtk+/gdk/makegdkalias.pl 2008-12-16 17:13:01 UTC (rev 16997) +++ projects/haf/trunk/gtk+/gdk/makegdkalias.pl 2008-12-17 15:05:23 UTC (rev 16998) @@ -83,7 +83,7 @@ next; } - if ($_ =~ /^\#ifn?def\s+G/) + if ($_ =~ /^\#ifn?def\s+[GM]/) { print $_; Modified: projects/haf/trunk/gtk+/gtk/Makefile.am =================================================================== --- projects/haf/trunk/gtk+/gtk/Makefile.am 2008-12-16 17:13:01 UTC (rev 16997) +++ projects/haf/trunk/gtk+/gtk/Makefile.am 2008-12-17 15:05:23 UTC (rev 16998) @@ -819,7 +819,7 @@ && echo timestamp > $(@F) gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile ( cd $(srcdir) && $(GLIB_MKENUMS) \ - --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \ + --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#ifndef MAEMO_CHANGES\n#define MAEMO_CHANGES\n#endif\n#include \"gtk.h\"\n#undef MAEMO_CHANGES\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \ --ftail "#define __GTK_TYPE_BUILTINS_C__\n#include \"gtkaliasdef.c\"\n" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n at enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G at Type@Value values[] = {" \ Modified: projects/haf/trunk/gtk+/gtk/gtk.symbols =================================================================== --- projects/haf/trunk/gtk+/gtk/gtk.symbols 2008-12-16 17:13:01 UTC (rev 16997) +++ projects/haf/trunk/gtk+/gtk/gtk.symbols 2008-12-17 15:05:23 UTC (rev 16998) @@ -1183,6 +1183,9 @@ gtk_style_get_type G_GNUC_CONST gtk_style_lookup_icon_set gtk_style_lookup_color +#ifdef MAEMO_CHANGES +gtk_style_lookup_logical_color +#endif gtk_style_new gtk_style_render_icon gtk_style_set_background @@ -1261,8 +1264,13 @@ gtk_entry_text_index_to_layout_index gtk_entry_set_cursor_hadjustment gtk_entry_get_cursor_hadjustment +#ifdef MAEMO_CHANGES +hildon_gtk_entry_get_input_mode +hildon_gtk_entry_set_input_mode +hildon_gtk_entry_set_progress_adjustment #endif #endif +#endif #if IN_HEADER(__GTK_ENTRY_COMPLETION_H__) #if IN_FILE(__GTK_ENTRY_COMPLETION_C__) @@ -1424,9 +1432,11 @@ #if IN_HEADER(__GTK_FILE_CHOOSER_UTILS_H__) #if IN_FILE(__GTK_FILE_CHOOSER_UTILS_C__) +#ifdef MAEMO_CHANGES hildon_gtk_file_chooser_install_properties #endif #endif +#endif #if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__) #if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__) @@ -1487,6 +1497,9 @@ gtk_file_info_render_icon gtk_file_info_set_display_name gtk_file_info_set_icon_name +#ifdef MAEMO_CHANGES +gtk_file_info_set_icon_pixbuf +#endif gtk_file_info_set_is_folder gtk_file_info_set_is_hidden gtk_file_info_set_mime_type @@ -1903,12 +1916,14 @@ gtk_icon_view_get_tooltip_context gtk_icon_view_set_tooltip_column gtk_icon_view_get_tooltip_column +#ifdef MAEMO_CHANGES hildon_icon_view_get_hildon_ui_mode hildon_icon_view_get_row_header_func hildon_icon_view_set_hildon_ui_mode hildon_icon_view_set_row_header_func #endif #endif +#endif #if IN_HEADER(__GTK_IMAGE_H__) #if IN_FILE(__GTK_IMAGE_C__) @@ -1975,13 +1990,26 @@ gtk_im_context_get_preedit_string gtk_im_context_get_surrounding gtk_im_context_get_type G_GNUC_CONST +#ifdef MAEMO_CHANGES +gtk_im_context_hide +#endif gtk_im_context_reset gtk_im_context_set_client_window gtk_im_context_set_cursor_location gtk_im_context_set_surrounding gtk_im_context_set_use_preedit +#ifdef MAEMO_CHANGES +gtk_im_context_show +hildon_gtk_im_context_copy +hildon_gtk_im_context_cut +hildon_gtk_im_context_filter_event +hildon_gtk_im_context_has_selection +hildon_gtk_im_context_hide +hildon_gtk_im_context_paste +hildon_gtk_im_context_show #endif #endif +#endif #if IN_HEADER(__GTK_IM_CONTEXT_SIMPLE_H__) #if IN_FILE(__GTK_IM_CONTEXT_SIMPLE_C__) @@ -3964,8 +3992,12 @@ gtk_text_view_set_wrap_mode gtk_text_view_starts_display_line gtk_text_view_window_to_buffer_coords +#ifdef MAEMO_CHANGES +hildon_gtk_text_view_get_input_mode +hildon_gtk_text_view_set_input_mode #endif #endif +#endif #if IN_HEADER(__GTK_THEMES_H__) #if IN_FILE(__GTK_THEMES_C__) @@ -4535,12 +4567,14 @@ gtk_tree_view_widget_to_tree_coords #endif gtk_tree_view_columns_autosize +#ifdef MAEMO_CHANGES hildon_tree_view_get_hildon_ui_mode hildon_tree_view_get_row_header_func hildon_tree_view_set_hildon_ui_mode hildon_tree_view_set_row_header_func #endif #endif +#endif #if IN_HEADER(__GTK_TYPE_UTILS_H__) #if IN_FILE(__GTK_TYPE_UTILS_C__) @@ -4727,6 +4761,9 @@ gtk_widget_hide gtk_widget_hide_all gtk_widget_hide_on_delete +#ifdef MAEMO_CHANGES +gtk_widget_insensitive_press +#endif gtk_widget_intersect gtk_widget_is_ancestor gtk_widget_is_focus @@ -4756,6 +4793,10 @@ gtk_widget_set_uposition gtk_widget_set_usize #endif +#ifdef MAEMO_CHANGES +gtk_widget_tap_and_hold_menu_position_top +gtk_widget_tap_and_hold_setup +#endif gtk_widget_queue_draw gtk_widget_queue_draw_area gtk_widget_queue_resize Modified: projects/haf/trunk/gtk+/gtk/tests/Makefile.am =================================================================== --- projects/haf/trunk/gtk+/gtk/tests/Makefile.am 2008-12-16 17:13:01 UTC (rev 16997) +++ projects/haf/trunk/gtk+/gtk/tests/Makefile.am 2008-12-17 15:05:23 UTC (rev 16998) @@ -72,6 +72,7 @@ textbuffer_SOURCES = textbuffer.c pixbuf-init.c textbuffer_LDADD = $(progs_ldadd) +if MAEMO_CHANGES TEST_PROGS += treeview-hildon treeview_hildon_SOURCES = treeview-hildon.c treeview_hildon_LDADD = $(progs_ldadd) @@ -79,3 +80,4 @@ TEST_PROGS += iconview-hildon iconview_hildon_SOURCES = iconview-hildon.c iconview_hildon_LDADD = $(progs_ldadd) +endif Modified: projects/haf/trunk/gtk+/tests/Makefile.am =================================================================== --- projects/haf/trunk/gtk+/tests/Makefile.am 2008-12-16 17:13:01 UTC (rev 16997) +++ projects/haf/trunk/gtk+/tests/Makefile.am 2008-12-17 15:05:23 UTC (rev 16998) @@ -25,6 +25,10 @@ testsocket_programs = testsocket testsocket_child endif +if MAEMO_CHANGES +testmaemo_programs = testhildontreeview testhildoniconview +endif + TESTS = floatingtest buildertest noinst_PROGRAMS = \ @@ -53,6 +57,7 @@ testicontheme \ testimage \ testinput \ + $(testmaemo_programs) \ testmenus \ testmenubars \ testmultidisplay \ @@ -90,9 +95,7 @@ testactions \ testgrouping \ testtooltips \ - testvolumebutton \ - testhildoniconview \ - testhildontreeview + testvolumebutton if HAVE_CXX noinst_PROGRAMS += autotestkeywords
- Previous message: [maemo-commits] r16997 - projects/haf/tags/hildon-fm
- Next message: [maemo-commits] r16999 - in projects/haf/trunk/gtk+: . debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]