From fa52c8105b87d7e9963e9ca7a346575b0f0cf24c Mon Sep 17 00:00:00 2001 From: earthdok Date: Mon, 9 Feb 2015 11:18:56 -0800 Subject: Instrumented libraries: drop liboverlay-scrollbar. Chrome doesn't use overlay scrollbars. The only thing that we do with this library is attempt to initialize it (as part of gtk2+ init) which occasionally tries to read a missing settings schema and crashes. BUG=456205 TBR=glider@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/905703003 Cr-Commit-Position: refs/heads/master@{#315361} --- .../patches/libgtk2.0-0.precise.diff | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'third_party/instrumented_libraries/patches') diff --git a/third_party/instrumented_libraries/patches/libgtk2.0-0.precise.diff b/third_party/instrumented_libraries/patches/libgtk2.0-0.precise.diff index e0bf1a8..75f4f64 100644 --- a/third_party/instrumented_libraries/patches/libgtk2.0-0.precise.diff +++ b/third_party/instrumented_libraries/patches/libgtk2.0-0.precise.diff @@ -1,18 +1,20 @@ diff -rupN ./gtk/gtkmain.c ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c --- ./gtk/gtkmain.c 2014-05-29 19:39:07.000000000 +0400 -+++ ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c 2014-05-29 19:44:00.368263970 +0400 -@@ -759,7 +759,7 @@ _overlay_scrollbar_init (void) - return; ++++ ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c 2015-02-09 21:52:59.213636172 +0300 +@@ -751,6 +751,10 @@ _overlay_scrollbar_init (void) + GModule *module = NULL; + gpointer symbol = NULL; - /* default extension library to use for this release */ -- gchar *path = "/usr/lib/liboverlay-scrollbar-0.2.so.0"; -+ gchar *path = "liboverlay-scrollbar-0.2.so.0"; ++ /* Chrome doesn't use overlay-scrollbar anyway. By disabling it here, we avoid ++ * having to build it. */ ++ return; ++ + gchar *flag = (gchar*) g_getenv ("LIBOVERLAY_SCROLLBAR"); - module = g_module_open (path, G_MODULE_BIND_LOCAL); - if (module == NULL) + /* check if LIBOVERLAY_SCROLLBAR is set to 0 or an empty value diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h --- ./gtk/gtkmenushell.h 2011-08-16 06:30:52.000000000 +0400 -+++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h 2014-05-29 19:42:28.029449496 +0400 ++++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h 2015-02-09 21:49:49.052032041 +0300 @@ -135,7 +135,9 @@ void _gtk_menu_shell_update_mnemonic void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell, gboolean keyboard_mode); -- cgit v1.1