Update Gears to r3147, and fix scons build to match.

gears/SConscript

 # Copyright (c) 2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Notes:
 # This is the main Gears SConscript file.  From here, we include sub-scripts
 # that handle building various targets (third party libs, common exes, the
 # browser plugins themselves, and installers).  Some sub-scripts return a
 # dictionary of variables to be appended to the environment, so other
 # sub-scripts can use them.
@@ skipping 78 matching lines @@
 vars.Update(env)
 
 env.Replace(
     USING_CCTESTS = (env['MODE'] == 'dbg' or not env['OFFICIAL_BUILD'])
 )
 
 # Version
 env.Replace(
     MAJOR = '0',
     MINOR = '5',
-    BUILD = '2',
-    PATCH = '6',
+    BUILD = '7',
+    PATCH = '0',
     VERSION = '${MAJOR}.${MINOR}.${BUILD}.${PATCH}',
 
     FRIENDLY_NAME = 'Google Gears',
     SHORT_NAME = 'gears',
 )
 
 # Platform
 # TODO: Symbian builds will override this value.
 # For other platforms we set just one value.
 if env['OS'] in ['wince', 'android']:
@@ skipping 232 matching lines @@
   env.Append(
       CPPDEFINES = 'USING_CCTESTS=1',
       M4FLAGS = '-DUSING_CCTESTS=1',
   )
 if env['OFFICIAL_BUILD']:
   env.Append(
       CPPDEFINES = 'OFFICIAL_BUILD=1',
       M4FLAGS = '-DOFFICIAL_BUILD=1',
   )
 
-# TODO: if USING_PNG
-env.Append(CPPDEFINES = 'PNG_USER_CONFIG')
+# TODO: if USING_LIBPNG
+env.Append(
+    CPPDEFINES = [
+        'PNG_USER_CONFIG',
+        'CHROME_PNG_WRITE_SUPPORT',
+        'GEARS_PNG_BUILD',
+    ]
+)
 # TODO: if USING_ZLIB
 env.Append(
     CPPDEFINES = [
         'NO_GZIP',
         'NO_GZCOMPRESS',
     ]
 )
 if env['OS'] == 'wince':
   env.Append(CPPDEFINES = 'NO_ERRNO_H')
 
@@ skipping 267 matching lines @@
       ],
       COMMON_LINKFLAGS = [
           '-fPIC',
           '-Bsymbolic',
           '-pthread',
       ],
       SHLINKFLAGS = [
           '-shared',
           '-Wl,--version-script',
           '-Wl,$OPEN_DIR/tools/xpcom-ld-script',
-# for PortAudio: need pthread and math
-          '-lpthread',
-          '-lm',
 # Additions to compile on hardy
           '-m32',
       ],
   )
   if env['MODE'] == 'dbg':
     env.Append(
       CPPFLAGS = [
           '-g',
           '-O0',
       ],
@@ skipping 83 matching lines @@
           '-DGEARS_PLUGIN_PATH="$SF_PLUGIN_PROXY_BUNDLE"',
           '-DGEARS_INSTALLER_OUT_DIR="$INSTALLER_OUTDIR/Safari"',
 
           # Keystone
           '-DKEYSTONE_BASE_DIR="$MAIN_DIR/$PRIVATE_THIRD_PARTY_DIR/googlemac/Releases/Keystone/"',
           '-DGEARS_INSTALLER_PACKAGE="$SF_INSTALLER_PKG"',
           '-DGEARS_GENFILES_DIR="$SF_OUTDIR/genfiles"',
           '-DGEARS_TOOLS_DIR="$MAIN_DIR/$PRIVATE_DIR/tools"',
       ],
   )
-  if not env['OFFICIAL_BUILD']:
-    # For PortAudio:
-    env.Append(FRAMEWORKS = [
-        'CoreAudio',
-        'AudioToolbox',
-        'AudioUnit',
-    ])
   if env['MODE'] == 'dbg':
     env.Append(
         CPPFLAGS = [
             '-g',
             '-O0',
         ],
     )
   else:  # MODE=opt
     env.Append(
         CPPFLAGS = [
@@ skipping 158 matching lines @@
 
 sconscripts = [
     'SConscript.googleurl',
     'SConscript.libjpeg',
     'SConscript.libpng',
     'SConscript.libmozjs',
     'SConscript.sqlite',
     'SConscript.zlib',
     'SConscript.libbreakpad_osx',
     'SConscript.libgd',
-    'SConscript.portaudio',
 ]
 
 for each in sconscripts:
   env.SConscript(each,
                  exports=['env'],
                  variant_dir='$COMMON_OUTDIR',
                  duplicate=0)
 
 # Order of execution is important here.  Each sub-script adds to the
 # environment, for use by later scripts.
@@ skipping 25 matching lines @@
   env.Append(**browser_outputs)
 
 # Note: even though the installers write to $INSTALLER_OUTDIR, they need to
 # read files from other dirs, so we give them a variant_dir at the toplevel.
 env.SConscript('SConscript.installers',
                exports=['env'],
                variant_dir='$BASE_OUTDIR',
                duplicate=0)
 
 env.Alias('gears-installers', 'gears')