diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-01-08 15:24:59 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-01-08 16:35:39 -0500 |
| commit | 331877fe367f9c4e9472f5a211499b4225ef2513 (patch) | |
| tree | 40f56a5e46c7893b98efda9cb35ea0e4162fa1ca | |
| parent | 61d5c82f5ca7d4f00f8182d17d30c350f43a4424 (diff) | |
| download | gtk+-331877fe367f9c4e9472f5a211499b4225ef2513.tar.gz | |
Fix abicheck
Update symbols files, and ignore marshallers that appear.
| -rwxr-xr-x | gtk/abicheck.sh | 2 | ||||
| -rw-r--r-- | gtk/gtk.symbols | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh index 0d033fb0a1..23b2b0a098 100755 --- a/gtk/abicheck.sh +++ b/gtk/abicheck.sh @@ -1,5 +1,5 @@ #! /bin/sh cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi -nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi +nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | egrep -v '^g_cclosure_marshal' | sort > actual-abi diff -u expected-abi actual-abi && rm -f expected-abi actual-abi diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 6d5d5b6fa2..5f9ba56d47 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -2510,10 +2510,16 @@ gtk_marshal_BOOLEAN__VOID gtk_marshal_ENUM__ENUM gtk_marshal_INT__POINTER gtk_marshal_INT__POINTER_CHAR_CHAR +gtk_marshal_VOID__BOOLEAN +gtk_marshal_VOID__BOXED +gtk_marshal_VOID__ENUM gtk_marshal_VOID__ENUM_FLOAT gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN +gtk_marshal_VOID__INT gtk_marshal_VOID__INT_INT gtk_marshal_VOID__INT_INT_POINTER +gtk_marshal_VOID__OBJECT +gtk_marshal_VOID__POINTER gtk_marshal_VOID__POINTER_INT gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT gtk_marshal_VOID__POINTER_POINTER @@ -2523,10 +2529,13 @@ gtk_marshal_VOID__POINTER_STRING_STRING gtk_marshal_VOID__POINTER_UINT gtk_marshal_VOID__POINTER_UINT_ENUM gtk_marshal_VOID__POINTER_UINT_UINT +gtk_marshal_VOID__STRING gtk_marshal_VOID__STRING_INT_POINTER +gtk_marshal_VOID__UINT gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM gtk_marshal_VOID__UINT_STRING +gtk_marshal_VOID__VOID #endif #endif #endif |