diff options
3 files changed, 13 insertions, 22 deletions
diff --git a/third_party/instrumented_libraries/install-build-deps.sh b/third_party/instrumented_libraries/install-build-deps.sh index a7dfb55..a0b9256 100755 --- a/third_party/instrumented_libraries/install-build-deps.sh +++ b/third_party/instrumented_libraries/install-build-deps.sh @@ -59,7 +59,6 @@ libxrender1 \ libxss1 \ libxtst6 \ nss \ -overlay-scrollbar \ pango1.0 \ pulseaudio \ udev \ @@ -69,7 +68,8 @@ brltty" precise_specific_packages="libtasn1-3" trusty_specific_packages="\ libtasn1-6 \ -harfbuzz" +harfbuzz +libsecret" ubuntu_release=$(lsb_release -cs) diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index e30c36b..7aac24b 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -131,7 +131,6 @@ '<(_sanitizer_type)-libgdk-pixbuf2.0-0', '<(_sanitizer_type)-libpci3', '<(_sanitizer_type)-libdbusmenu-glib4', - '<(_sanitizer_type)-overlay-scrollbar', '<(_sanitizer_type)-libgconf-2-4', '<(_sanitizer_type)-libappindicator1', '<(_sanitizer_type)-libdbusmenu', @@ -658,16 +657,6 @@ 'includes': ['standard_instrumented_package_target.gypi'], }, { - 'package_name': 'overlay-scrollbar', - 'extra_configure_flags': [ - '--disable-static', - '--with-gtk=2', - ], - 'dependencies=': [], - 'run_before_build': 'scripts/autogen.sh', - 'includes': ['standard_instrumented_package_target.gypi'], - }, - { 'package_name': 'libgconf-2-4', 'extra_configure_flags': [ '--disable-static', 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); |