diff options
| author | earthdok <earthdok@chromium.org> | 2014-10-01 10:43:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-01 17:44:07 +0000 |
| commit | da840b61c8e9c7f1c4e55ebb83eefeefb24c19d9 (patch) | |
| tree | 88964b84c46384b90f753fc5a617e4c2913d2fb0 /third_party/instrumented_libraries/patches | |
| parent | a040213b7020119ffe8f434ad948fe6adb37f1dc (diff) | |
| download | chromium_src-da840b61c8e9c7f1c4e55ebb83eefeefb24c19d9.zip chromium_src-da840b61c8e9c7f1c4e55ebb83eefeefb24c19d9.tar.gz chromium_src-da840b61c8e9c7f1c4e55ebb83eefeefb24c19d9.tar.bz2 | |
Instrumented libraries: introduce release-specific patches.
This CL enables applying different custom patches depending on the Ubuntu
release (Precise/Trusty). It also adds two Trusty-specific patches.
BUG=414189
R=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/614903003
Cr-Commit-Position: refs/heads/master@{#297672}
Diffstat (limited to 'third_party/instrumented_libraries/patches')
| -rw-r--r-- | third_party/instrumented_libraries/patches/libfontconfig.precise.diff (renamed from third_party/instrumented_libraries/patches/libfontconfig.diff) | 0 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/patches/libfontconfig.trusty.diff | 13 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/patches/libgtk2.0-0.precise.diff (renamed from third_party/instrumented_libraries/patches/libgtk2.0-0.diff) | 0 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/patches/libgtk2.0-0.trusty.diff | 15 |
4 files changed, 28 insertions, 0 deletions
diff --git a/third_party/instrumented_libraries/patches/libfontconfig.diff b/third_party/instrumented_libraries/patches/libfontconfig.precise.diff index 19f85f7..19f85f7 100644 --- a/third_party/instrumented_libraries/patches/libfontconfig.diff +++ b/third_party/instrumented_libraries/patches/libfontconfig.precise.diff diff --git a/third_party/instrumented_libraries/patches/libfontconfig.trusty.diff b/third_party/instrumented_libraries/patches/libfontconfig.trusty.diff new file mode 100644 index 0000000..7cfeba5 --- /dev/null +++ b/third_party/instrumented_libraries/patches/libfontconfig.trusty.diff @@ -0,0 +1,13 @@ +diff -rupN ./src/fcpat.c ../fontconfig-2.11.0-patched/src/fcpat.c +--- ./src/fcpat.c 2013-10-11 07:10:18.000000000 +0400 ++++ ../fontconfig-2.11.0-patched/src/fcpat.c 2014-09-30 22:14:55.818360071 +0400 +@@ -33,6 +33,9 @@ FcPatternCreate (void) + p = (FcPattern *) malloc (sizeof (FcPattern)); + if (!p) + return 0; ++ // Silence Valgrind/MemorySanitizer. There is uninitialized padding at the ++ // end of this structure. When serialized to file, this will cause a report. ++ memset(p, 0, sizeof(*p)); + p->num = 0; + p->size = 0; + p->elts_offset = FcPtrToOffset (p, NULL); diff --git a/third_party/instrumented_libraries/patches/libgtk2.0-0.diff b/third_party/instrumented_libraries/patches/libgtk2.0-0.precise.diff index e0bf1a8..e0bf1a8 100644 --- a/third_party/instrumented_libraries/patches/libgtk2.0-0.diff +++ b/third_party/instrumented_libraries/patches/libgtk2.0-0.precise.diff diff --git a/third_party/instrumented_libraries/patches/libgtk2.0-0.trusty.diff b/third_party/instrumented_libraries/patches/libgtk2.0-0.trusty.diff new file mode 100644 index 0000000..2a8295b --- /dev/null +++ b/third_party/instrumented_libraries/patches/libgtk2.0-0.trusty.diff @@ -0,0 +1,15 @@ +diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.23-patched/gtk/gtkmenushell.h +--- ./gtk/gtkmenushell.h 2014-03-06 08:56:42.000000000 +0400 ++++ ../gtk+2.0-2.24.23-patched/gtk/gtkmenushell.h 2014-09-30 23:37:46.908364552 +0400 +@@ -136,6 +136,11 @@ void _gtk_menu_shell_set_keyboard_mo + gboolean keyboard_mode); + gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell); + ++// https://bugs.launchpad.net/bugs/945135 ++gboolean ubuntu_gtk_menu_shell_activate_mnemonic (GtkMenuShell *shell, ++ GtkWidget *item); ++gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, ++ gboolean search_sensitive); + G_END_DECLS + + #endif /* __GTK_MENU_SHELL_H__ */ |