From owner-svn-ports-all@freebsd.org Wed Jan 11 10:26:35 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 169FCCAB083; Wed, 11 Jan 2017 10:26:35 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA40C1252; Wed, 11 Jan 2017 10:26:34 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BAQX1L010143; Wed, 11 Jan 2017 10:26:33 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BAQXFx010140; Wed, 11 Jan 2017 10:26:33 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201701111026.v0BAQXFx010140@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Wed, 11 Jan 2017 10:26:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431170 - in 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 10:26:35 -0000 Author: cpm Date: Wed Jan 11 10:26:33 2017 New Revision: 431170 URL: https://svnweb.freebsd.org/changeset/ports/431170 Log: - Fix build on HEAD In file included from ../../services/ui/ws/window_manager_state.cc:5: In file included from ../../services/ui/ws/window_manager_state.h:10: In file included from /usr/include/c++/v1/memory:599: /usr/include/c++/v1/__config:58:2: error: "_LIBCPP_TRIVIAL_PAIR_COPY_CTOR" is no longer supported. use _LIBCPP_DEPRECATED_ABI_DISABLE_PAIR_TRIVIAL_COPY_CTOR instead #error "_LIBCPP_TRIVIAL_PAIR_COPY_CTOR" is no longer supported. \ ^ 1 error generated. PR: 214654 Submitted by: dim Reported by: jbeich Reviewed by: rene Approved by: chromium (rene) MFH: 2017Q1 Added: head/www/chromium/files/extra-patch-libc++-new (contents, props changed) head/www/chromium/files/extra-patch-libc++-old (contents, props changed) Modified: head/www/chromium/Makefile Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Wed Jan 11 10:08:38 2017 (r431169) +++ head/www/chromium/Makefile Wed Jan 11 10:26:33 2017 (r431170) @@ -187,6 +187,12 @@ GN_ARGS+= is_clang=true EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang .endif +.if ${OSVERSION} < 1200017 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-old +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++-new +.endif + .if ${OSVERSION} < 1100000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-10 .endif Added: head/www/chromium/files/extra-patch-libc++-new ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/extra-patch-libc++-new Wed Jan 11 10:26:33 2017 (r431170) @@ -0,0 +1,14 @@ +--- services/ui/ws/BUILD.gn.orig 2016-12-09 17:47:26.343517000 +0000 ++++ services/ui/ws/BUILD.gn 2016-12-09 17:48:45.323876000 +0000 +@@ -103,6 +103,11 @@ + "window_tree_host_factory.h", + ] + ++ # Work around base r261801 ++ if (is_bsd) { ++ defines = ["_LIBCPP_ABI_UNSTABLE=1"] ++ } ++ + deps = [ + # TODO(sad): Temporary, until the GPU process is split out of ws. + "//services/ui/gpu", Added: head/www/chromium/files/extra-patch-libc++-old ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/extra-patch-libc++-old Wed Jan 11 10:26:33 2017 (r431170) @@ -0,0 +1,14 @@ +--- services/ui/ws/BUILD.gn.orig 2016-12-09 17:47:26.343517000 +0000 ++++ services/ui/ws/BUILD.gn 2016-12-09 17:50:06.387679000 +0000 +@@ -103,6 +103,11 @@ + "window_tree_host_factory.h", + ] + ++ # Work around base r261801 ++ if (is_bsd) { ++ defines = ["_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1"] ++ } ++ + deps = [ + # TODO(sad): Temporary, until the GPU process is split out of ws. + "//services/ui/gpu",