Bug 162776 – REGRESSION(r206505) [GTK] Build broken with GTK+ 3.14

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Carlos Alberto Lopez Perez]

Trying to build current trunk (r206631) of WebKitGTK+ on Debian stable (GTK+ 3.14.5) without the internal jhbuild results in this:



[.... compiler parameters .... ] -o Source/WebKit2/CMakeFiles/WebKit2.dir/UIProcess/gtk/WebContextMenuProxyGtk.cpp.o -c ../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp
../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp:69:93: error: use of undeclared identifier 'gtk_widget_get_action_group'; did you mean 'gtk_widget_set_margin_top'?
    g_action_map_add_action(((((GActionMap*) g_type_check_instance_cast ((GTypeInstance*) ((gtk_widget_get_action_group(((((GtkWidget*) g_type_check_instance_cast ((GTypeInstance*) ((m_menu)), ((gtk_widget_get_type ())))))), gContextMenuItemGroup))), ((g_action_map_get_type ())))))), action);
                                                                                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~
                                                                                            gtk_widget_set_margin_top
/usr/include/gtk-3.0/gtk/gtkwidget.h:1115:6: note: 'gtk_widget_set_margin_top' declared here
void gtk_widget_set_margin_top (GtkWidget *widget,
     ^
../../Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp:69:226: error: cannot initialize a parameter of type 'gint' (aka 'int') with an lvalue of type 'const char *'
    g_action_map_add_action(((((GActionMap*) g_type_check_instance_cast ((GTypeInstance*) ((gtk_widget_get_action_group(((((GtkWidget*) g_type_check_instance_cast ((GTypeInstance*) ((m_menu)), ((gtk_widget_get_type ())))))), gContextMenuItemGroup))), ((g_action_map_get_type ())))))), action);
                                                                                                                                                                                                                                 ^~~~~~~~~~~~~~~~~~~~~
/usr/include/gtk-3.0/gtk/gtkwidget.h:1116:45: note: passing argument to parameter 'margin' here
                                       gint margin);
                                            ^
2 errors generated.

[Carlos Garcia Campos]

I'm sorry about this, I checked the Since tag of gtk_widget_set_action_group() and assumed it was the same for the getter. I guess we can simply save the action group somewhere to fix this instead of querying the widget.

[Carlos Garcia Campos]

Created attachment 292884 [details]
Patch

[Carlos Garcia Campos]

Committed r207870: <http://trac.webkit.org/changeset/207870>