src/third_party/instrumented_libraries/libgtk2.0-0.diff

   1 diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h
   2 --- ./gtk/gtkmenushell.h        2011-08-16 06:30:52.000000000 +0400
   3 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h       2014-04-17 01:05:36.276800937 +0400
   4 @@ -135,7 +135,9 @@ void     _gtk_menu_shell_update_mnemonic
   5  void     _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell,
   6                                              gboolean      keyboard_mode);
   7  gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell);
   8 -
   9 +// https://bugs.launchpad.net/bugs/945135
  10 +gboolean ubuntu_gtk_menu_shell_activate_mnemonic (GtkMenuShell *shell, GtkWidget *item);
  11 +gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, gboolean search_sensitive);
  12  G_END_DECLS
  13
  14  #endif /* __GTK_MENU_SHELL_H__ */
  15 diff -rupN ./gtk/Makefile.am ../gtk+2.0-2.24.10-patched/gtk/Makefile.am
  16 --- ./gtk/Makefile.am   2014-04-17 01:03:15.000000000 +0400
  17 +++ ../gtk+2.0-2.24.10-patched/gtk/Makefile.am  2014-04-17 00:23:13.950329332 +0400
  18 @@ -1391,8 +1391,10 @@ stamp-icons: $(STOCK_ICONS)
  19  if CROSS_COMPILING
  20  gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
  21  else
  22 +# Use the system-installed, uninstrumented gtk-update-icon-cache. The
  23 +# just-built one cannot be used because it doesn't have the right RPATH set.
  24  gtk_update_icon_cache_program =                                                        \
  25 -          ./gtk-update-icon-cache
  26 +          gtk-update-icon-cache
  27  endif
  28
  29  gtkbuiltincache.h: @REBUILD@ stamp-icons