patches/gtk2/Revert-Fix-abicheck.patch

   1 From: Emmanuele Bassi <ebassi@gnome.org>
   2 Date: Sat, 10 Feb 2018 18:55:59 +0000
   3 Subject: Revert "Fix abicheck"
   4
   5 This reverts commit 331877fe367f9c4e9472f5a211499b4225ef2513.
   6
   7 The newly visible symbols were the result of a bug in the Python port of
   8 glib-genmarshal, which was fixed in GLib 2.54.
   9
  10 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=793057
  11 Origin: upstream, 2.24.33, commit:f14fbca64509a5b79607f20ecbbe69239eb24e15
  12 ---
  13  gtk/abicheck.sh | 2 +-
  14  gtk/gtk.symbols | 9 ---------
  15  2 files changed, 1 insertion(+), 10 deletions(-)
  16
  17 diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh
  18 index 23b2b0a..0d033fb 100755
  19 --- a/gtk/abicheck.sh
  20 +++ b/gtk/abicheck.sh
  21 @@ -1,5 +1,5 @@
  22  #! /bin/sh
  23
  24  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
  25 -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
  26 +nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
  27  diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
  28 diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
  29 index 5f9ba56..6d5d5b6 100644
  30 --- a/gtk/gtk.symbols
  31 +++ b/gtk/gtk.symbols
  32 @@ -2510,16 +2510,10 @@ gtk_marshal_BOOLEAN__VOID
  33  gtk_marshal_ENUM__ENUM
  34  gtk_marshal_INT__POINTER
  35  gtk_marshal_INT__POINTER_CHAR_CHAR
  36 -gtk_marshal_VOID__BOOLEAN
  37 -gtk_marshal_VOID__BOXED
  38 -gtk_marshal_VOID__ENUM
  39  gtk_marshal_VOID__ENUM_FLOAT
  40  gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN
  41 -gtk_marshal_VOID__INT
  42  gtk_marshal_VOID__INT_INT
  43  gtk_marshal_VOID__INT_INT_POINTER
  44 -gtk_marshal_VOID__OBJECT
  45 -gtk_marshal_VOID__POINTER
  46  gtk_marshal_VOID__POINTER_INT
  47  gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT
  48  gtk_marshal_VOID__POINTER_POINTER
  49 @@ -2529,13 +2523,10 @@ gtk_marshal_VOID__POINTER_STRING_STRING
  50  gtk_marshal_VOID__POINTER_UINT
  51  gtk_marshal_VOID__POINTER_UINT_ENUM
  52  gtk_marshal_VOID__POINTER_UINT_UINT
  53 -gtk_marshal_VOID__STRING
  54  gtk_marshal_VOID__STRING_INT_POINTER
  55 -gtk_marshal_VOID__UINT
  56  gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER
  57  gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
  58  gtk_marshal_VOID__UINT_STRING
  59 -gtk_marshal_VOID__VOID
  60  #endif
  61  #endif
  62  #endif