diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-04-21 13:31:45 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2011-04-21 13:31:45 +0000 |
| commit | 43b2889de735d07d240d52230a3b62413ebb9360 (patch) | |
| tree | 589edc6f96bfc9fe60fcd2e986a6d4a2f07d6309 /www-client/chromium/files | |
| parent | x86 stable per bug 363403 (diff) | |
| download | historical-43b2889de735d07d240d52230a3b62413ebb9360.tar.gz historical-43b2889de735d07d240d52230a3b62413ebb9360.tar.bz2 historical-43b2889de735d07d240d52230a3b62413ebb9360.zip | |
Version bump for dev channel release. Fixes bug #364205 by Julien Sanchez <julien.sanchez@gmail.com>. Used modified patch by Mike Gilbert <floppymaster@gmail.com>. Remove old.
Package-Manager: portage-2.1.9.42/cvs/Linux i686
Diffstat (limited to 'www-client/chromium/files')
| -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 000000000000..894525de69cd --- /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', + ], |