From owner-svn-ports-all@freebsd.org Mon Sep 21 16:46:19 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B4C153F6194; Mon, 21 Sep 2020 16:46:19 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bw9Lg4Mdpz4TnQ; Mon, 21 Sep 2020 16:46:19 +0000 (UTC) (envelope-from swills@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78FFA113DC; Mon, 21 Sep 2020 16:46:19 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08LGkJAw041492; Mon, 21 Sep 2020 16:46:19 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08LGkIgU041489; Mon, 21 Sep 2020 16:46:18 GMT (envelope-from swills@FreeBSD.org) Message-Id: <202009211646.08LGkIgU041489@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 21 Sep 2020 16:46:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549458 - in head/devel/gn: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/devel/gn: . files X-SVN-Commit-Revision: 549458 X-SVN-Commit-Repository: ports 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.33 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: Mon, 21 Sep 2020 16:46:19 -0000 Author: swills Date: Mon Sep 21 16:46:18 2020 New Revision: 549458 URL: https://svnweb.freebsd.org/changeset/ports/549458 Log: devel/gn: Fix build on 11.4 and 11-STABLE PR: 249504 Submitted by: Oleh Hushchenkov (maintainer) Added: head/devel/gn/files/patch-src_gn_version.h (contents, props changed) Modified: head/devel/gn/Makefile (contents, props changed) head/devel/gn/files/patch-build_gen.py (contents, props changed) Modified: head/devel/gn/Makefile ============================================================================== --- head/devel/gn/Makefile Mon Sep 21 16:46:00 2020 (r549457) +++ head/devel/gn/Makefile Mon Sep 21 16:46:18 2020 (r549458) @@ -3,6 +3,7 @@ PORTNAME= gn DISTVERSIONPREFIX= v DISTVERSION= 1823 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= o.hushchenkov@gmail.com Modified: head/devel/gn/files/patch-build_gen.py ============================================================================== --- head/devel/gn/files/patch-build_gen.py Mon Sep 21 16:46:00 2020 (r549457) +++ head/devel/gn/files/patch-build_gen.py Mon Sep 21 16:46:18 2020 (r549458) @@ -1,8 +1,8 @@ - .git/ is missing in archive, so use version from environment ---- build/gen.py.orig 2020-02-22 10:07:32 UTC +--- build/gen.py.orig 2020-09-21 09:20:32 UTC +++ build/gen.py -@@ -124,25 +124,16 @@ def main(argv): +@@ -149,25 +149,16 @@ def main(argv): def GenerateLastCommitPosition(host, header): Added: head/devel/gn/files/patch-src_gn_version.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gn/files/patch-src_gn_version.h Mon Sep 21 16:46:18 2020 (r549458) @@ -0,0 +1,18 @@ +--- src/gn/version.h.orig 2020-09-21 09:21:46 UTC ++++ src/gn/version.h +@@ -8,6 +8,15 @@ + #include + #include + ++// Undefine major/minor from sys/types.h ++#ifdef major ++#undef major ++#endif ++ ++#ifdef minor ++#undef minor ++#endif ++ + // Represents a semantic version. + class Version { + public: