third_party/instrumented_libraries/libgtk2.0-0.diff

   1 diff -rupN ./gtk/gtkmain.c ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c
   2 --- ./gtk/gtkmain.c     2014-05-29 19:39:07.000000000 +0400
   3 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c    2014-05-29 19:44:00.368263970 +0400
   4 @@ -759,7 +759,7 @@ _overlay_scrollbar_init (void)
   5      return;
   6
   7    /* default extension library to use for this release */
   8 -  gchar *path = "/usr/lib/liboverlay-scrollbar-0.2.so.0";
   9 +  gchar *path = "liboverlay-scrollbar-0.2.so.0";
  10
  11    module = g_module_open (path, G_MODULE_BIND_LOCAL);
  12    if (module == NULL)
  13 diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h
  14 --- ./gtk/gtkmenushell.h        2011-08-16 06:30:52.000000000 +0400
  15 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h       2014-05-29 19:42:28.029449496 +0400
  16 @@ -135,7 +135,9 @@ void     _gtk_menu_shell_update_mnemonic
  17  void     _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell,
  18                                              gboolean      keyboard_mode);
  19  gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell);
  20 -
  21 +// https://bugs.launchpad.net/bugs/945135
  22 +gboolean ubuntu_gtk_menu_shell_activate_mnemonic (GtkMenuShell *shell, GtkWidget *item);
  23 +gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, gboolean search_sensitive);
  24  G_END_DECLS
  25
  26  #endif /* __GTK_MENU_SHELL_H__ */
  27 diff -rupN ./gtk/Makefile.am ../gtk+2.0-2.24.10-patched/gtk/Makefile.am
  28 --- ./gtk/Makefile.am   2014-05-29 19:39:07.000000000 +0400
  29 +++ ../gtk+2.0-2.24.10-patched/gtk/Makefile.am  2014-05-29 19:42:28.029449496 +0400
  30 @@ -1391,8 +1391,10 @@ stamp-icons: $(STOCK_ICONS)
  31  if CROSS_COMPILING
  32  gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
  33  else
  34 +# Use the system-installed, uninstrumented gtk-update-icon-cache. The
  35 +# just-built one cannot be used because it doesn't have the right RPATH set.
  36  gtk_update_icon_cache_program =                                                        \
  37 -          ./gtk-update-icon-cache
  38 +          gtk-update-icon-cache
  39  endif
  40
  41  gtkbuiltincache.h: @REBUILD@ stamp-icons