From cbcbb4924c2dc2bc734f46df25e231c0c4b3f62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Apestegu=C3=ADa?= Date: Sun, 23 Feb 2020 19:22:49 +0000 Subject: [PATCH] devel/gn: update to version 1714. Full changelog: https://github.com/cglogic/gn/compare/v1600...v1714 Changelog highlights: * Rust compilation tool and toolchain support * Teach gn to handle systems with > 64 processors * Switch to C++17 * Support for RISC-V * Improve support for frameworks in gn * Speed up source file set operations PR: 244307 Submitted by: o.hushchenkov@gmail.com (maintainer) --- devel/gn/Makefile | 7 +++---- devel/gn/distinfo | 6 +++--- devel/gn/files/patch-build_gen.py | 9 +++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/devel/gn/Makefile b/devel/gn/Makefile index 21d581e068b1..33b107911346 100644 --- a/devel/gn/Makefile +++ b/devel/gn/Makefile @@ -2,8 +2,7 @@ PORTNAME= gn DISTVERSIONPREFIX= v -DISTVERSION= 1600 -PORTREVISION= 1 +DISTVERSION= 1714 CATEGORIES= devel MAINTAINER= o.hushchenkov@gmail.com @@ -14,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= chromium-gn -USES= alias compiler:c++14-lang ninja python:build shebangfix +USES= alias compiler:c++17-lang ninja python:build shebangfix USE_GITHUB= yes GH_ACCOUNT= cglogic # mirror SHEBANG_FILES= ${CONFIGURE_SCRIPT} @@ -29,7 +28,7 @@ PLIST_FILES= bin/${PORTNAME} post-patch: @${REINPLACE_CMD} 's/"python"/"${PYTHON_CMD:T}"/' \ - ${WRKSRC}/tools/gn/exec_process_unittest.cc + ${WRKSRC}/src/gn/exec_process_unittest.cc do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/devel/gn/distinfo b/devel/gn/distinfo index f85c435b71b2..d036fe633397 100644 --- a/devel/gn/distinfo +++ b/devel/gn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560866156 -SHA256 (cglogic-gn-v1600_GH0.tar.gz) = c821d57848a7b7b6ee33333db827abb34545fd939ab7bc3b27f1a64e0a8e1da2 -SIZE (cglogic-gn-v1600_GH0.tar.gz) = 942568 +TIMESTAMP = 1582365298 +SHA256 (cglogic-gn-v1714_GH0.tar.gz) = 6b98b752ef16ab50c45123deb5893ddef6598a5ebac6191efba162c9689ef20c +SIZE (cglogic-gn-v1714_GH0.tar.gz) = 941711 diff --git a/devel/gn/files/patch-build_gen.py b/devel/gn/files/patch-build_gen.py index c7936dd11be1..2ed69274e8e1 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 2019-05-30 09:42:43 UTC +--- build/gen.py.orig 2020-02-22 10:07:32 UTC +++ build/gen.py -@@ -117,24 +117,15 @@ def main(argv): +@@ -124,25 +124,16 @@ def main(argv): def GenerateLastCommitPosition(host, header): @@ -20,12 +20,13 @@ #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ + #define LAST_COMMIT_POSITION_NUM %s -#define LAST_COMMIT_POSITION "%s (%s)" +#define LAST_COMMIT_POSITION "%s" #endif // OUT_LAST_COMMIT_POSITION_H_ --''' % (mo.group(1), mo.group(2)) -+''' % (os.environ['GN_VERSION']) +-''' % (mo.group(1), mo.group(1), mo.group(2)) ++''' % (os.environ['GN_VERSION'], os.environ['GN_VERSION']) # Only write/touch this file if the commit position has changed. old_contents = ''