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

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

Unified 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, 3 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 side-by-side diff with in-line comments

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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/instrumented_libraries/patches/libgtk2.0-0.diff

diff --git a/third_party/instrumented_libraries/patches/libgtk2.0-0.diff b/third_party/instrumented_libraries/patches/libgtk2.0-0.diff

index b561b2039e89e84f3629a965328c041bf4becef3..e0bf1a80d0700c0acf979295c0dc1abfc782b413 100644

--- a/third_party/instrumented_libraries/patches/libgtk2.0-0.diff

+++ b/third_party/instrumented_libraries/patches/libgtk2.0-0.diff

@@ -24,18 +24,3 @@ diff -rupN ./gtk/gtkmenushell.h ../gtk+2.0-2.24.10-patched/gtk/gtkmenushell.h

G_END_DECLS

#endif /* __GTK_MENU_SHELL_H__ */

-diff -rupN ./gtk/Makefile.am ../gtk+2.0-2.24.10-patched/gtk/Makefile.am

---- ./gtk/Makefile.am 2014-05-29 19:39:07.000000000 +0400

-+++ ../gtk+2.0-2.24.10-patched/gtk/Makefile.am 2014-05-29 19:42:28.029449496 +0400

-@@ -1391,8 +1391,10 @@ stamp-icons: $(STOCK_ICONS)

- if CROSS_COMPILING

- gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)

- else

-+# Use the system-installed, uninstrumented gtk-update-icon-cache. The

-+# just-built one cannot be used because it doesn't have the right RPATH set.

- gtk_update_icon_cache_program = \

-- ./gtk-update-icon-cache

-+ /usr/bin/gtk-update-icon-cache

- endif

- gtkbuiltincache.h: @REBUILD@ stamp-icons