Attachment 211831 Details for Bug 244307 – Patch

[patch] Patch

gn_v1714.diff (text/plain), 2.34 KB, created by Oleh Hushchenkov on 2020-02-22 13:46:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleh Hushchenkov

Created: 2020-02-22 13:46:52 UTC

Size: 2.34 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 526744)
>+++ Makefile	(working copy)
>@@ -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 @@
> 
> 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 @@
> 
> 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
>Index: distinfo
>===================================================================
>--- distinfo	(revision 526744)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-build_gen.py
>===================================================================
>--- files/patch-build_gen.py	(revision 526744)
>+++ files/patch-build_gen.py	(working copy)
>@@ -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 = ''

Actions: View | Diff

Attachments on bug 244307: 211831