From owner-svn-ports-head@FreeBSD.ORG  Wed Feb 26 00:13:31 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 265CEEFE;
 Wed, 26 Feb 2014 00:13:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E7C801B9D;
 Wed, 26 Feb 2014 00:13:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q0DUdx093663;
 Wed, 26 Feb 2014 00:13:30 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q0DUsE093662;
 Wed, 26 Feb 2014 00:13:30 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201402260013.s1Q0DUsE093662@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Wed, 26 Feb 2014 00:13:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r346081 - head/www/chromium/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Feb 2014 00:13:31 -0000

Author: rene
Date: Wed Feb 26 00:13:30 2014
New Revision: 346081
URL: http://svnweb.freebsd.org/changeset/ports/346081
QAT: https://qat.redports.org/buildarchive/r346081/

Log:
  Add a patch that slipped through first to try to fix the build once more ...
  
  Noticed by:	John Carr, nox

Modified:
  head/www/chromium/files/patch-build__common.gypi

Modified: head/www/chromium/files/patch-build__common.gypi
==============================================================================
--- head/www/chromium/files/patch-build__common.gypi	Tue Feb 25 23:49:18 2014	(r346080)
+++ head/www/chromium/files/patch-build__common.gypi	Wed Feb 26 00:13:30 2014	(r346081)
@@ -1,6 +1,15 @@
---- build/common.gypi.orig	2012-05-30 10:01:43.000000000 +0300
-+++ build/common.gypi	2012-06-05 23:01:25.000000000 +0300
-@@ -575,6 +575,10 @@
+--- build/common.gypi.orig	2014-02-20 21:28:44.000000000 +0100
++++ build/common.gypi	2014-02-24 23:02:26.000000000 +0100
+@@ -573,7 +573,7 @@
+         }],
+ 
+         # DBus usage.
+-        ['OS=="linux" and embedded==0', {
++        ['(OS=="linux" or OS=="freebsd") and embedded==0', {
+           'use_dbus%': 1,
+         }, {
+           'use_dbus%': 0,
+@@ -1008,6 +1008,10 @@
      # able to turn it off for various reasons.
      'linux_disable_pie%': 0,
  
@@ -11,16 +20,16 @@
      # The release channel that this build targets. This is used to restrict
      # channel-specific build options, like which installer packages to create.
      # The default is 'all', which does no channel-specific filtering.
-@@ -806,7 +810,7 @@
-         # This is used to tweak build flags for gcc 4.4.
-         'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
+@@ -1283,7 +1287,7 @@
+       }],
+       ['os_posix==1 and OS!="mac" and OS!="ios"', {
          # Figure out the python architecture to decide if we build pyauto.
 -        'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
 +        'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)<(prefix_dir)/lib/libpython<(python_ver).so.1)',
          'conditions': [
-           ['branding=="Chrome"', {
-             'linux_breakpad%': 1,
-@@ -2278,6 +2282,13 @@
+           ['target_arch=="mipsel"', {
+             'werror%': '',
+@@ -3610,6 +3614,13 @@
          'ldflags': [
            '-Wl,--no-keep-memory',
          ],