third_party/instrumented_libraries/libgtk2.0-0.diff - Issue 361473002: Instrumented libraries: improve handling of custom patches.

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 361473002: Instrumented libraries: improve handling of custom patches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: use -i to pass filename to patch Created 6 years, 5 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 | Annotate | Revision Log

OLD	NEW
	(Empty)
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 +0 400

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.0294 49496 +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, GtkWidge t item);

23 +gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, gboole an 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 +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 + gtk-update-icon-cache

39 endif

40

41 gtkbuiltincache.h: @REBUILD@ stamp-icons

OLD	NEW

« no previous file with comments | « third_party/instrumented_libraries/libgdk-pixbuf2.0-0.sh ('k') | third_party/instrumented_libraries/libgtk2.0-0.sh » ('j') | no next file with comments »