Merge revision 753 changes:

- Add patch to fix opening of password protected files with CefZipReader (issue #496).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@755 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-09-04 17:10:13 +00:00
parent 741fcb8acf
commit ee3f60f8da
4 changed files with 36 additions and 0 deletions

View File

@ -16,6 +16,11 @@ patches = [
'name': 'tools_gyp', 'name': 'tools_gyp',
'path': '../tools/gyp/', 'path': '../tools/gyp/',
}, },
{
# http://code.google.com/p/chromiumembedded/issues/detail?id=496
'name': 'zlib',
'path': '../third_party/zlib/',
},
{ {
# http://code.google.com/p/chromiumembedded/issues/detail?id=364 # http://code.google.com/p/chromiumembedded/issues/detail?id=364
'name': 'spi_webcore_364', 'name': 'spi_webcore_364',

View File

@ -0,0 +1,13 @@
Index: contrib/minizip/unzip.c
===================================================================
--- contrib/minizip/unzip.c (revision 153668)
+++ contrib/minizip/unzip.c (working copy)
@@ -69,7 +69,7 @@
#include <string.h>
#ifndef NOUNCRYPT
- #define NOUNCRYPT
+// #define NOUNCRYPT
#endif
#if defined(USE_SYSTEM_ZLIB)

View File

@ -31,6 +31,11 @@ patches = [
'name': 'window_impl_642', 'name': 'window_impl_642',
'path': '../ui/base/win/', 'path': '../ui/base/win/',
}, },
{
# http://code.google.com/p/chromiumembedded/issues/detail?id=496
'name': 'zlib',
'path': '../third_party/zlib/',
},
{ {
# http://code.google.com/p/chromiumembedded/issues/detail?id=364 # http://code.google.com/p/chromiumembedded/issues/detail?id=364
'name': 'spi_webcore_364', 'name': 'spi_webcore_364',

View File

@ -0,0 +1,13 @@
Index: contrib/minizip/unzip.c
===================================================================
--- contrib/minizip/unzip.c (revision 153668)
+++ contrib/minizip/unzip.c (working copy)
@@ -69,7 +69,7 @@
#include <string.h>
#ifndef NOUNCRYPT
- #define NOUNCRYPT
+// #define NOUNCRYPT
#endif
#if defined(USE_SYSTEM_ZLIB)