From owner-freebsd-gecko@FreeBSD.ORG Sat Nov 24 02:29:37 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 81DE0953 for ; Sat, 24 Nov 2012 02:29:37 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id E0F338FC18 for ; Sat, 24 Nov 2012 02:29:36 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id qAO2TZ22078718 for ; Sat, 24 Nov 2012 02:29:35 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id qAO2TUr0078421 for freebsd-gecko@freebsd.org; Sat, 24 Nov 2012 02:29:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 24 Nov 2012 02:29:30 GMT Message-Id: <201211240229.qAO2TUr0078421@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1101 - trunk/www/firefox-nightly/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2012 02:29:37 -0000 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