Date: Mon, 20 Dec 2021 03:03:12 GMT From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cea1608a85f1 - main - devel/gn: Update to v1962 Message-ID: <202112200303.1BK33CZl060606@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=cea1608a85f191537c52ebe4dd81958ec40d10b0 commit cea1608a85f191537c52ebe4dd81958ec40d10b0 Author: Oleh Hushchenkov <o.hushchenkov@gmail.com> AuthorDate: 2021-12-20 03:02:04 +0000 Commit: Li-Wen Hsu <lwhsu@FreeBSD.org> CommitDate: 2021-12-20 03:02:04 +0000 devel/gn: Update to v1962 Changelog: https://github.com/cglogic/gn/compare/v1897...v1962 PR: 260540 --- devel/gn/Makefile | 2 +- devel/gn/distinfo | 6 +++--- devel/gn/files/patch-build_gen.py | 4 ++-- devel/gn/files/patch-src_gn_args.cc | 4 ++-- devel/gn/files/patch-src_gn_version.h | 18 ------------------ 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/devel/gn/Makefile b/devel/gn/Makefile index beddd39ee45c..eae375a18de0 100644 --- a/devel/gn/Makefile +++ b/devel/gn/Makefile @@ -2,7 +2,7 @@ PORTNAME= gn DISTVERSIONPREFIX= v -DISTVERSION= 1897 +DISTVERSION= 1962 CATEGORIES= devel MAINTAINER= o.hushchenkov@gmail.com diff --git a/devel/gn/distinfo b/devel/gn/distinfo index 5269f68d8c41..39b4b96fb71b 100644 --- a/devel/gn/distinfo +++ b/devel/gn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619271291 -SHA256 (cglogic-gn-v1897_GH0.tar.gz) = 94762fc85346bd0a2ed648852563554b173cc17ef16bc06972f5b3a7a9979235 -SIZE (cglogic-gn-v1897_GH0.tar.gz) = 1011867 +TIMESTAMP = 1639844136 +SHA256 (cglogic-gn-v1962_GH0.tar.gz) = cd7393695af1160e71b59ea6e6bc51de7bb0c54d03dd93a8e6046239366cd387 +SIZE (cglogic-gn-v1962_GH0.tar.gz) = 1025892 diff --git a/devel/gn/files/patch-build_gen.py b/devel/gn/files/patch-build_gen.py index 6cf53918e3c1..402cef5f9f7e 100644 --- a/devel/gn/files/patch-build_gen.py +++ b/devel/gn/files/patch-build_gen.py @@ -1,8 +1,8 @@ - .git/ is missing in archive, so use version from environment ---- build/gen.py.orig 2021-04-24 13:35:05 UTC +--- build/gen.py.orig 2021-12-18 16:25:54 UTC +++ build/gen.py -@@ -151,25 +151,16 @@ def main(argv): +@@ -213,25 +213,16 @@ def main(argv): def GenerateLastCommitPosition(host, header): diff --git a/devel/gn/files/patch-src_gn_args.cc b/devel/gn/files/patch-src_gn_args.cc index 6e7554c7fcc9..7e2fc6f9a3fc 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-04-06 17:41:35 UTC +--- src/gn/args.cc.orig 2021-12-17 12:22:18 UTC +++ src/gn/args.cc -@@ -357,7 +357,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const { +@@ -360,7 +360,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const { arch = kMips64; else if (os_arch == "s390x") arch = kS390X; diff --git a/devel/gn/files/patch-src_gn_version.h b/devel/gn/files/patch-src_gn_version.h deleted file mode 100644 index ca1c72f8979a..000000000000 --- a/devel/gn/files/patch-src_gn_version.h +++ /dev/null @@ -1,18 +0,0 @@ ---- src/gn/version.h.orig 2020-09-21 09:21:46 UTC -+++ src/gn/version.h -@@ -8,6 +8,15 @@ - #include <optional> - #include <string> - -+// Undefine major/minor from sys/types.h -+#ifdef major -+#undef major -+#endif -+ -+#ifdef minor -+#undef minor -+#endif -+ - // Represents a semantic version. - class Version { - public:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112200303.1BK33CZl060606>