diff options
| author | earthdok <earthdok@chromium.org> | 2014-09-30 12:12:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 19:12:52 +0000 |
| commit | 72058c85190c68b203bf7ed0099f86307ee4ecaf (patch) | |
| tree | 195b653535d736ed8424fdb505e2ac7541022620 /third_party/instrumented_libraries/patches | |
| parent | 1a1faa8e07d852a65650779f5f5d019199a1b05b (diff) | |
| download | chromium_src-72058c85190c68b203bf7ed0099f86307ee4ecaf.zip chromium_src-72058c85190c68b203bf7ed0099f86307ee4ecaf.tar.gz chromium_src-72058c85190c68b203bf7ed0099f86307ee4ecaf.tar.bz2 | |
Instrumented libraries: replace some makefile patches with sed invocations.
Some cases are simple enough that a search and replace is sufficient. At the
same time, the fewer patches we have, the less time will be spent rebasing them.
BUG=414189
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/618013002
Cr-Commit-Position: refs/heads/master@{#297474}
Diffstat (limited to 'third_party/instrumented_libraries/patches')
| -rw-r--r-- | third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff | 14 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/patches/libgtk2.0-0.diff | 15 |
2 files changed, 0 insertions, 29 deletions
diff --git a/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff b/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff deleted file mode 100644 index 74288c1..0000000 --- a/third_party/instrumented_libraries/patches/libgdk-pixbuf2.0-0.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN ./gdk-pixbuf/Makefile.am ../gdk-pixbuf-2.26.1-patched/gdk-pixbuf/Makefile.am ---- ./gdk-pixbuf/Makefile.am 2012-04-14 22:11:34.000000000 +0400 -+++ ../gdk-pixbuf-2.26.1-patched/gdk-pixbuf/Makefile.am 2014-04-17 19:37:22.105253318 +0400 -@@ -782,7 +782,9 @@ loaders.cache: $(loader_LTLIBRARIES) gdk - LOADERS=`echo libpixbufloader-*.la` ; \ - if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \ - echo "Writing a loaders.cache file to use when running examples before installing gdk-pixbuf."; \ -- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./loaders.cache ;\ -+ # Use the system-installed gdk-pixbuf-query-loaders. The just-built one \ -+ # won't work. \ -+ /usr/bin/gdk-pixbuf-query-loaders $$LOADERS > ./loaders.cache ;\ - else \ - echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \ - touch loaders.cache; \ diff --git a/third_party/instrumented_libraries/patches/libgtk2.0-0.diff b/third_party/instrumented_libraries/patches/libgtk2.0-0.diff index b561b20..e0bf1a8 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 |