Get abicheck to almost pass again

diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
index 6031ff9440afeed0bbddc1a19e25f2ce9429b9b6..14e9e736ea50e44e776e0dc97f2ae7c36ee7163f 100755 (executable)
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DGDK_ENABLE_BROKEN -include ../config.h -include ./gdkconfig.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
+cpp -P -DGDK_ENABLE_BROKEN -include ../config.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
 nm -D -g --defined-only .libs/libgdk-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
 diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 42e42521f599a725fa88b172555b8a47e498d03a..5115589b89e479e892a805fcdf410c153425003e 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -66,13 +66,10 @@ gdk_device_grab
 gdk_device_grab_info_libgtk_only
 gdk_device_list_axes
 gdk_device_list_slave_devices
-gdk_device_manager_core_get_type
 gdk_device_manager_get_client_pointer
 gdk_device_manager_get_display
 gdk_device_manager_get_type G_GNUC_CONST
 gdk_device_manager_list_devices
-gdk_device_manager_xi2_get_type
-gdk_device_manager_xi_get_type
 gdk_device_set_axis_use
 gdk_device_set_key
 gdk_device_set_mode
@@ -102,6 +99,7 @@ gdk_display_get_screen
 gdk_display_get_type G_GNUC_CONST
 gdk_display_get_window_at_device_position
 gdk_display_get_window_at_pointer
+gdk_display_has_pending
 gdk_display_is_closed
 gdk_display_keyboard_ungrab
 gdk_display_list_devices
@@ -109,6 +107,7 @@ gdk_display_manager_get
 gdk_display_manager_get_default_display
 gdk_display_manager_get_type G_GNUC_CONST
 gdk_display_manager_list_displays
+gdk_display_manager_open_display
 gdk_display_manager_set_default_display
 gdk_display_notify_startup_complete
 gdk_display_open
@@ -135,6 +134,7 @@ gdk_display_warp_pointer
 gdk_drag_abort
 gdk_drag_action_get_type G_GNUC_CONST
 gdk_drag_begin
+gdk_drag_begin_for_device
 gdk_drag_context_get_actions
 gdk_drag_context_get_dest_window
 gdk_drag_context_get_device
@@ -144,13 +144,10 @@ gdk_drag_context_get_source_window
 gdk_drag_context_get_suggested_action
 gdk_drag_context_get_type G_GNUC_CONST
 gdk_drag_context_list_targets
-gdk_drag_context_new
 gdk_drag_context_set_device
 gdk_drag_drop
 gdk_drag_drop_succeeded
-gdk_drag_find_window
 gdk_drag_find_window_for_screen
-gdk_drag_get_protocol
 gdk_drag_get_protocol_for_display
 gdk_drag_get_selection
 gdk_drag_motion
@@ -189,10 +186,6 @@ gdk_events_get_angle
 gdk_events_get_center
 gdk_events_get_distance
 gdk_events_pending
-gdk_event_translator_get_handled_events
-gdk_event_translator_get_type G_GNUC_CONST
-gdk_event_translator_select_window_events
-gdk_event_translator_translate
 gdk_event_type_get_type G_GNUC_CONST
 gdk_extension_mode_get_type G_GNUC_CONST
 gdk_filter_return_get_type G_GNUC_CONST
@@ -518,16 +511,25 @@ gdk_wm_decoration_get_type G_GNUC_CONST
 gdk_wm_function_get_type G_GNUC_CONST
 gdk_x11_atom_to_xatom
 gdk_x11_atom_to_xatom_for_display
+gdk_x11_cursor_get_type
 gdk_x11_cursor_get_xcursor
 gdk_x11_cursor_get_xdisplay
+gdk_x11_device_core_get_type
+gdk_x11_device_manager_core_get_type
+gdk_x11_device_manager_xi2_get_type
+gdk_x11_device_manager_xi_get_type
+gdk_x11_device_xi2_get_type
+gdk_x11_device_xi_get_type
 gdk_x11_display_broadcast_startup_message
 gdk_x11_display_error_trap_pop
 gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_error_trap_push
 gdk_x11_display_get_startup_notification_id
+gdk_x11_display_get_type
 gdk_x11_display_get_user_time
 gdk_x11_display_get_xdisplay
 gdk_x11_display_grab
+gdk_x11_display_manager_get_type
 gdk_x11_display_set_cursor_theme
 gdk_x11_display_set_startup_notification_id
 gdk_x11_display_string_to_compound_text
@@ -545,24 +547,25 @@ gdk_x11_get_xatom_by_name_for_display
 gdk_x11_get_xatom_name
 gdk_x11_get_xatom_name_for_display
 gdk_x11_grab_server
+gdk_x11_keymap_get_type
 gdk_x11_lookup_xdisplay
 gdk_x11_register_standard_event_type
 gdk_x11_screen_get_monitor_output
 gdk_x11_screen_get_screen_number
+gdk_x11_screen_get_type
 gdk_x11_screen_get_window_manager_name
 gdk_x11_screen_get_xscreen
 gdk_x11_screen_lookup_visual
 gdk_x11_screen_supports_net_wm_hint
 gdk_x11_set_sm_client_id
 gdk_x11_ungrab_server
+gdk_x11_visual_get_type
 gdk_x11_visual_get_xvisual
 gdk_x11_window_foreign_new_for_display
 gdk_x11_window_lookup_for_display
+gdk_x11_window_get_type
 gdk_x11_window_get_xid
 gdk_x11_window_move_to_current_desktop
 gdk_x11_window_set_user_time
 gdk_x11_xatom_to_atom
 gdk_x11_xatom_to_atom_for_display
-gdk_xid_table_lookup
-gdk_xid_table_lookup_for_display
-gdkx_visual_get