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/1025@755 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
2012-09-04 17:10:13 +00:00 · 2012-09-04 17:10:13 +00:00 · aaf8df75df
parent e390fbe5b6
commit aaf8df75df
2 changed files with 18 additions and 0 deletions
--- a/patch/patch.cfg
+++ b/patch/patch.cfg
@ -17,6 +17,11 @@ patches = [
    'name': '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
    'name': 'spi_webcore_364',
--- a/patch/patches/zlib.patch
+++ b/patch/patches/zlib.patch
@ -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)