[SVN-Commit] r1101 - trunk/www/firefox-nightly/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Nov 24 02:29:30 2012
New Revision: 1101

Log:
remove unused hunk

Modified:
   trunk/www/firefox-nightly/files/patch-bug807492

Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492	Sat Nov 24 02:29:23 2012	(r1100)
+++ trunk/www/firefox-nightly/files/patch-bug807492	Sat Nov 24 02:29:30 2012	(r1101)
@@ -2014,46 +2014,6 @@
              'include_dirs': [
                '$(DEPTH)/dist/include',
              ],
-diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/common.py media/webrtc/trunk/tools/gyp/pylib/gyp/common.py
-index 6144d2f..84ff5be 100644
---- media/webrtc/trunk/tools/gyp/pylib/gyp/common.py
-+++ media/webrtc/trunk/tools/gyp/pylib/gyp/common.py
-@@ -354,25 +354,28 @@ def WriteOnDiff(filename):
- 
-   return Writer()
- 
- 
- def GetFlavor(params):
-   """Returns |params.flavor| if it's set, the system's default flavor else."""
-   flavors = {
-     'cygwin': 'win',
--    'win32': 'win',
-     'darwin': 'mac',
--    'sunos5': 'solaris',
--    'freebsd7': 'freebsd',
--    'freebsd8': 'freebsd',
--    'freebsd9': 'freebsd',
-+    'sunos': 'solaris',
-   }
--  flavor = flavors.get(sys.platform, 'linux')
--  return params.get('flavor', flavor)
-+  # platform name without major version
-+  platform = sys.platform.rstrip('0123456789')
-+
-+  if 'flavor' in params:
-+    return params['flavor']
-+  if platform in flavors:
-+    return flavors[platform]
-+
-+  return platform
- 
- 
- def CopyTool(flavor, out_path):
-   """Finds (mac|sun|win)_tool.gyp in the gyp directory and copies it
-   to |out_path|."""
-   prefix = { 'solaris': 'sun', 'mac': 'mac', 'win': 'win' }.get(flavor, None)
-   if not prefix:
-     return
 diff --git media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
 index 338d0b7..2241d41 100644
 --- media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py