system-zlib.patch

   1 --- src/third_party/zlib/zlib.gyp
   2 +++ src/third_party/zlib/zlib.gyp
   3 @@ -81,14 +81,6 @@
   4            'defines': [
   5              'USE_SYSTEM_ZLIB',
   6            ],
   7 -          'sources': [
   8 -            'contrib/minizip/ioapi.c',
   9 -            'contrib/minizip/ioapi.h',
  10 -            'contrib/minizip/unzip.c',
  11 -            'contrib/minizip/unzip.h',
  12 -            'contrib/minizip/zip.c',
  13 -            'contrib/minizip/zip.h',
  14 -          ],
  15            'conditions': [
  16              ['OS=="android"', {
  17                'toolsets': ['target', 'host'],
  18 @@ -97,6 +89,7 @@
  19            'link_settings': {
  20              'libraries': [
  21                '-lz',
  22 +              '-lminizip',
  23              ],
  24            },
  25          }],
  26
  27 https://code.google.com/p/mod-spdy/issues/detail?id=71
  28
  29 --- src/build/common.gypi
  30 +++ src/build/common.gypi
  31 @@ -25,7 +25,7 @@
  32      # (Chromium already has transitive dependencies on these libraries
  33      # via gtk). We want to link these libraries into our binaries so
  34      # we change the default behavior.
  35 -    'use_system_zlib': 0,
  36 +    'use_system_zlib%': 0,
  37      'use_system_apache_dev%': 0,
  38
  39      # Putting a variables dict inside another variables dict looks kind of