git: 09834aaf5a44 - main - devel/gn: Update to 2072
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 21 Nov 2022 05:06:29 UTC
The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=09834aaf5a440bbc644767a2e68ee9e721d89414 commit 09834aaf5a440bbc644767a2e68ee9e721d89414 Author: Oleh Hushchenkov <o.hushchenkov@gmail.com> AuthorDate: 2022-11-21 05:05:42 +0000 Commit: Guangyuan Yang <ygy@FreeBSD.org> CommitDate: 2022-11-21 05:05:42 +0000 devel/gn: Update to 2072 PR: 267867 --- devel/gn/Makefile | 3 +-- devel/gn/distinfo | 6 +++--- devel/gn/files/patch-build_gen.py | 10 +++++----- devel/gn/files/patch-src_gn_args.cc | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/devel/gn/Makefile b/devel/gn/Makefile index 783c53f27612..cd72a8827c92 100644 --- a/devel/gn/Makefile +++ b/devel/gn/Makefile @@ -1,7 +1,6 @@ PORTNAME= gn DISTVERSIONPREFIX= v -DISTVERSION= 1962 -PORTREVISION= 1 +DISTVERSION= 2072 CATEGORIES= devel MAINTAINER= o.hushchenkov@gmail.com diff --git a/devel/gn/distinfo b/devel/gn/distinfo index 39b4b96fb71b..4578c8f2513b 100644 --- a/devel/gn/distinfo +++ b/devel/gn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639844136 -SHA256 (cglogic-gn-v1962_GH0.tar.gz) = cd7393695af1160e71b59ea6e6bc51de7bb0c54d03dd93a8e6046239366cd387 -SIZE (cglogic-gn-v1962_GH0.tar.gz) = 1025892 +TIMESTAMP = 1668875475 +SHA256 (cglogic-gn-v2072_GH0.tar.gz) = db79ae073bcac3944c56f5f166c4b764a58c06594134c85b742bf859b42c5a66 +SIZE (cglogic-gn-v2072_GH0.tar.gz) = 1056984 diff --git a/devel/gn/files/patch-build_gen.py b/devel/gn/files/patch-build_gen.py index 8175fefbfe23..4c053b86c2e2 100644 --- a/devel/gn/files/patch-build_gen.py +++ b/devel/gn/files/patch-build_gen.py @@ -1,15 +1,15 @@ - .git/ is missing in archive, so use version from environment ---- build/gen.py.orig 2021-12-21 20:25:21 UTC +--- build/gen.py.orig 2022-11-19 16:33:38 UTC +++ build/gen.py -@@ -213,25 +213,16 @@ def main(argv): +@@ -216,25 +216,16 @@ def main(argv): def GenerateLastCommitPosition(host, header): - ROOT_TAG = 'initial-commit' - describe_output = subprocess.check_output( -- ['git', 'describe', 'HEAD', '--match', ROOT_TAG], shell=host.is_windows(), -- cwd=REPO_ROOT) +- ['git', 'describe', 'HEAD', '--abbrev=12', '--match', ROOT_TAG], +- shell=host.is_windows(), cwd=REPO_ROOT) - mo = re.match(ROOT_TAG + '-(\d+)-g([0-9a-f]+)', describe_output.decode()) - if not mo: - raise ValueError( @@ -30,7 +30,7 @@ # Only write/touch this file if the commit position has changed. old_contents = '' -@@ -274,7 +265,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -277,7 +268,7 @@ def WriteGenericNinja(path, static_libraries, executab 'msys': 'build_linux.ninja.template', 'darwin': 'build_mac.ninja.template', 'linux': 'build_linux.ninja.template', diff --git a/devel/gn/files/patch-src_gn_args.cc b/devel/gn/files/patch-src_gn_args.cc index 7e2fc6f9a3fc..628332310aaa 100644 --- a/devel/gn/files/patch-src_gn_args.cc +++ b/devel/gn/files/patch-src_gn_args.cc @@ -1,6 +1,6 @@ ---- src/gn/args.cc.orig 2021-12-17 12:22:18 UTC +--- src/gn/args.cc.orig 2022-11-19 16:37:02 UTC +++ src/gn/args.cc -@@ -360,7 +360,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const { +@@ -362,7 +362,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const { arch = kMips64; else if (os_arch == "s390x") arch = kS390X;