diff options
author | Krzysztof Pawlik <none@none> | 2011-08-06 23:44:33 +0200 |
---|---|---|
committer | Krzysztof Pawlik <none@none> | 2011-08-06 23:44:33 +0200 |
commit | 1bd649eedba364f37e4b63a68dded028a3f6dc2e (patch) | |
tree | fa5bd708f62d714f4a0f6a9d5cf21d3c14cc1055 /www-client/chromium/files/chromium-system-zlib-r0.patch | |
parent | Update for portage API. (diff) | |
download | nelchael-1bd649eedba364f37e4b63a68dded028a3f6dc2e.tar.gz nelchael-1bd649eedba364f37e4b63a68dded028a3f6dc2e.tar.bz2 nelchael-1bd649eedba364f37e4b63a68dded028a3f6dc2e.zip |
Add chromium-14.0.825.0 (restored from portage tree).
Diffstat (limited to 'www-client/chromium/files/chromium-system-zlib-r0.patch')
-rw-r--r-- | www-client/chromium/files/chromium-system-zlib-r0.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-system-zlib-r0.patch b/www-client/chromium/files/chromium-system-zlib-r0.patch new file mode 100644 index 0000000..894525d --- /dev/null +++ b/www-client/chromium/files/chromium-system-zlib-r0.patch @@ -0,0 +1,35 @@ +--- content/browser/renderer_host/clipboard_message_filter.cc.orig 2011-04-21 12:29:49.000000000 +0200 ++++ content/browser/renderer_host/clipboard_message_filter.cc 2011-04-21 12:31:14.000000000 +0200 +@@ -4,6 +4,12 @@ + + #include "content/browser/renderer_host/clipboard_message_filter.h" + ++#if defined(USE_SYSTEM_ZLIB) ++#include <zlib.h> ++#else ++#include "third_party/zlib/zlib.h" ++#endif ++ + #include "base/stl_util-inl.h" + #include "chrome/browser/browser_process.h" + #include "chrome/browser/clipboard_dispatcher.h" +@@ -11,7 +17,6 @@ + #include "googleurl/src/gurl.h" + #include "ipc/ipc_message_macros.h" + #include "third_party/skia/include/core/SkBitmap.h" +-#include "third_party/zlib/zlib.h" + #include "ui/gfx/codec/png_codec.h" + #include "ui/gfx/size.h" + +--- content/content_browser.gypi.orig 2011-04-21 12:32:18.000000000 +0200 ++++ content/content_browser.gypi 2011-04-21 12:32:56.000000000 +0200 +@@ -13,7 +13,8 @@ + '../ppapi/ppapi.gyp:ppapi_proxy', + '../skia/skia.gyp:skia', + '../third_party/flac/flac.gyp:libflac', +- '../third_party/speex/speex.gyp:libspeex', ++ '../third_party/speex/speex.gyp:libspeex', ++ '../third_party/zlib/zlib.gyp:zlib', + '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', + '../ui/ui.gyp:ui_base', + ], |