third_party/instrumented_libraries/patches/libgtk2.0-0.diff - Issue 618013002: Instrumented libraries: replace some makefile patches with sed invocations.

Side by Side Diff: third_party/instrumented_libraries/patches/libgtk2.0-0.diff

Issue 618013002: Instrumented libraries: replace some makefile patches with sed invocations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff ('k') | third_party/instrumented_libraries/scripts/libgdk-pixbuf2.0-0.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 diff -rupN ./gtk/gtkmain.c ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c	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	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 +0 400	3 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmain.c 2014-05-29 19:44:00.368263970 +0 400

4 @@ -759,7 +759,7 @@ _overlay_scrollbar_init (void)	4 @@ -759,7 +759,7 @@ _overlay_scrollbar_init (void)

5 return;	5 return;

6	6

7 /* default extension library to use for this release */	7 /* default extension library to use for this release */

8 - gchar *path = "/usr/lib/liboverlay-scrollbar-0.2.so.0";	8 - gchar *path = "/usr/lib/liboverlay-scrollbar-0.2.so.0";

9 + gchar *path = "liboverlay-scrollbar-0.2.so.0";	9 + gchar *path = "liboverlay-scrollbar-0.2.so.0";

10	10

11 module = g_module_open (path, G_MODULE_BIND_LOCAL);	11 module = g_module_open (path, G_MODULE_BIND_LOCAL);

12 if (module == NULL)	12 if (module == NULL)

13 diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h	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	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.0294 49496 +0400	15 +++ ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h 2014-05-29 19:42:28.0294 49496 +0400

16 @@ -135,7 +135,9 @@ void _gtk_menu_shell_update_mnemonic	16 @@ -135,7 +135,9 @@ void _gtk_menu_shell_update_mnemonic

17 void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell,	17 void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell,

18 gboolean keyboard_mode);	18 gboolean keyboard_mode);

19 gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell);	19 gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell);

20 -	20 -

21 +// https://bugs.launchpad.net/bugs/945135	21 +// https://bugs.launchpad.net/bugs/945135

22 +gboolean ubuntu_gtk_menu_shell_activate_mnemonic (GtkMenuShell shell, GtkWidge t item);	22 +gboolean ubuntu_gtk_menu_shell_activate_mnemonic (GtkMenuShell shell, GtkWidge t item);

23 +gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, gboole an search_sensitive);	23 +gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, gboole an search_sensitive);

24 G_END_DECLS	24 G_END_DECLS

25	25

26 #endif /* __GTK_MENU_SHELL_H__ */	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 +0 400

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 + /usr/bin/gtk-update-icon-cache

39 endif

40

41 gtkbuiltincache.h: @REBUILD@ stamp-icons

OLD	NEW