daemonratte/gtk2-ng
Watch
1
0
Fork
You've already forked gtk2-ng
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix abicheck

Browse source 
Update symbols files, and ignore marshallers that appear.
This commit is contained in:
Matthias Clasen 2018-01-08 15:24:59 -05:00
commit 331877fe36
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk/abicheck.sh
View file

@ -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

9
gtk/gtk.symbols
View file

@ -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