Skip to content

Commit

Permalink
Use the official zlib repository rather than Chromium's mirror
Browse files Browse the repository at this point in the history
Historically OSS Mozc has checked out a patched version of zlib from Chromium's repository.  However, OSS Mozc doesn't rely on those local patches in practice.  Thus we will check out zlib from Mark Adler's GitHub repository.
No user-visible behavior change is intended.

BUG=none
TEST=unittest

git-svn-id: https://mozc.googlecode.com/svn/trunk@565 a6090854-d499-a067-5803-1114d4e51264
  • Loading branch information
yukawa committed Apr 11, 2015
1 parent 57aa5c3 commit be8d070
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
5 changes: 2 additions & 3 deletions src/DEPS
Expand Up @@ -38,7 +38,7 @@ vars = {
"wtl_revision": "587",
"zinnia_revision": "16",
"jsr305_version": "2.0.2",
"zlib_revision": "198222",
"zlib_revision": "50893291621658f355bc5b4d450a8d06a563053d",
"japanese_usage_dictionary_revision": "10",
}

Expand Down Expand Up @@ -87,7 +87,6 @@ deps_os = {
"https://github.com/googlei18n/fonttools.git@" +
Var("fonttools_revision"),
"src/third_party/zlib/v1_2_8":
"https://src.chromium.org/chrome/trunk/src/third_party/zlib@" +
Var("zlib_revision"),
"https://github.com/madler/zlib.git@" + Var("zlib_revision"),
},
}
2 changes: 1 addition & 1 deletion src/mozc_version_template.txt
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=17
BUILD=2074
BUILD=2075
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.
Expand Down
4 changes: 1 addition & 3 deletions src/protobuf/protobuf.gyp
Expand Up @@ -300,10 +300,8 @@
],
},
'cflags': [
'-Wno-error=uninitialized',
'-Wno-implicit-function-declaration',
'-Wno-uninitialized',
'-Wno-unused-value',
'-Wno-incompatible-pointer-types-discards-qualifiers',
],
'configurations': {
'Debug_Base': {
Expand Down

0 comments on commit be8d070

Please sign in to comment.