]>
Commit | Line | Data |
---|---|---|
d3aab3e7 AM |
1 | --- chromium-browser-16.0.912.21~r108057/src/third_party/zlib/zlib.gyp~ 2011-11-05 15:05:40.000000000 +0100 |
2 | +++ chromium-browser-16.0.912.21~r108057/src/third_party/zlib/zlib.gyp 2011-11-05 17:31:17.605374715 +0100 | |
3 | @@ -88,12 +88,6 @@ | |
fa8cbba1 ER |
4 | 'USE_SYSTEM_ZLIB', |
5 | ], | |
6 | 'sources': [ | |
7 | - 'contrib/minizip/ioapi.c', | |
8 | - 'contrib/minizip/ioapi.h', | |
9 | - 'contrib/minizip/unzip.c', | |
10 | - 'contrib/minizip/unzip.h', | |
11 | - 'contrib/minizip/zip.c', | |
12 | - 'contrib/minizip/zip.h', | |
d3aab3e7 AM |
13 | ], |
14 | 'conditions': [ | |
15 | ['OS=="android"', { | |
16 | @@ -102,7 +96,7 @@ | |
fa8cbba1 ER |
17 | ], |
18 | 'link_settings': { | |
19 | 'libraries': [ | |
d3aab3e7 | 20 | - '-lz', |
fa8cbba1 ER |
21 | + '-lminizip', |
22 | ], | |
23 | }, | |
24 | }, | |
c14cd342 ER |
25 | --- chromium-browser-17.0.963.26/src/chrome/common/zip.cc~ 2012-01-04 04:02:54.000000000 +0200 |
26 | +++ chromium-browser-17.0.963.26/src/chrome/common/zip.cc 2012-01-05 22:51:39.376075829 +0200 | |
27 | @@ -12,8 +12,8 @@ | |
28 | #include "chrome/common/zip_internal.h" | |
29 | #include "chrome/common/zip_reader.h" | |
30 | #include "net/base/file_stream.h" | |
31 | -#include "third_party/zlib/contrib/minizip/unzip.h" | |
32 | -#include "third_party/zlib/contrib/minizip/zip.h" | |
33 | +#include <minizip/unzip.h> | |
34 | +#include <minizip/zip.h> | |
35 | ||
36 | namespace { | |
37 | ||
38 | --- chromium-browser-17.0.963.26/src/chrome/common/zip_internal.h~ 2012-01-04 04:02:54.000000000 +0200 | |
39 | +++ chromium-browser-17.0.963.26/src/chrome/common/zip_internal.h 2012-01-06 01:00:57.206864774 +0200 | |
40 | @@ -8,8 +8,8 @@ | |
41 | ||
42 | #include <string> | |
43 | ||
44 | -#include "third_party/zlib/contrib/minizip/unzip.h" | |
45 | -#include "third_party/zlib/contrib/minizip/zip.h" | |
46 | +#include <minizip/unzip.h> | |
47 | +#include <minizip/zip.h> | |
48 | ||
49 | // Utility functions and constants used internally for the zip file | |
50 | // library in the directory. Don't use them outside of the library. | |
51 | --- chromium-browser-17.0.963.26/src/chrome/common/zip_internal.cc~ 2012-01-04 04:02:54.000000000 +0200 | |
52 | +++ chromium-browser-17.0.963.26/src/chrome/common/zip_internal.cc 2012-01-06 01:08:20.967378679 +0200 | |
53 | @@ -5,8 +5,8 @@ | |
54 | #include "chrome/common/zip.h" | |
55 | ||
56 | #include "base/utf_string_conversions.h" | |
57 | -#include "third_party/zlib/contrib/minizip/unzip.h" | |
58 | -#include "third_party/zlib/contrib/minizip/zip.h" | |
59 | +#include <minizip/unzip.h> | |
60 | +#include <minizip/zip.h> | |
61 | #if defined(OS_WIN) | |
62 | #include "third_party/zlib/contrib/minizip/iowin32.h" | |
63 | #endif | |
64 | --- chromium-browser-17.0.963.26/src/chrome/common/zip_reader.h~ 2012-01-04 04:02:54.000000000 +0200 | |
65 | +++ chromium-browser-17.0.963.26/src/chrome/common/zip_reader.h 2012-01-06 01:12:08.277856237 +0200 | |
66 | @@ -12,7 +12,7 @@ | |
67 | #include "base/file_path.h" | |
68 | #include "base/memory/scoped_ptr.h" | |
69 | #include "base/time.h" | |
70 | -#include "third_party/zlib/contrib/minizip/unzip.h" | |
71 | +#include <minizip/unzip.h> | |
72 | ||
73 | namespace zip { | |
74 | ||
75 | --- chromium-browser-17.0.963.26/src/chrome/common/zip_reader.cc~ 2012-01-04 04:02:54.000000000 +0200 | |
76 | +++ chromium-browser-17.0.963.26/src/chrome/common/zip_reader.cc 2012-01-06 01:12:40.065988131 +0200 | |
77 | @@ -10,7 +10,7 @@ | |
78 | #include "base/utf_string_conversions.h" | |
79 | #include "chrome/common/zip_internal.h" | |
80 | #include "net/base/file_stream.h" | |
81 | -#include "third_party/zlib/contrib/minizip/unzip.h" | |
82 | +#include <minizip/unzip.h> | |
83 | #if defined(OS_WIN) | |
84 | #include "third_party/zlib/contrib/minizip/iowin32.h" | |
85 | #endif | |
f4a8da6a ER |
86 | --- chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc~ 2012-02-12 16:37:27.000000000 +0100 |
87 | +++ chromium-browser-18.0.1025.11/src/chrome/common/zip_internal.cc 2012-02-12 16:53:51.341474034 +0100 | |
88 | @@ -10,7 +10,7 @@ | |
89 | #if defined(OS_WIN) | |
90 | #include "third_party/zlib/contrib/minizip/iowin32.h" | |
91 | #elif defined(OS_POSIX) | |
92 | -#include "third_party/zlib/contrib/minizip/ioapi.h" | |
93 | +#include <minizip/ioapi.h> | |
94 | #endif | |
95 | ||
96 | namespace { |