third_party/instrumented_libraries/patches/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/patches/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
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

(...skipping 21 matching lines...) Expand all Loading...
32 gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)	32 gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)

33 else	33 else

34 +# Use the system-installed, uninstrumented gtk-update-icon-cache. The	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.	35 +# just-built one cannot be used because it doesn't have the right RPATH set.

36 gtk_update_icon_cache_program = \	36 gtk_update_icon_cache_program = \

37 - ./gtk-update-icon-cache	37 - ./gtk-update-icon-cache

38 + gtk-update-icon-cache	38 + gtk-update-icon-cache

39 endif	39 endif

40	40

41 gtkbuiltincache.h: @REBUILD@ stamp-icons	41 gtkbuiltincache.h: @REBUILD@ stamp-icons

OLD	NEW