Date: Monday, July 11, 2022 @ 17:39:17 Author: foutrelis Revision: 450874
archrelease: copy trunk to extra-x86_64 Added: gn/repos/extra-x86_64/PKGBUILD (from rev 450873, gn/trunk/PKGBUILD) gn/repos/extra-x86_64/chromium-gn-version.sh (from rev 450873, gn/trunk/chromium-gn-version.sh) gn/repos/extra-x86_64/repro.patch (from rev 450873, gn/trunk/repro.patch) Deleted: gn/repos/extra-x86_64/PKGBUILD gn/repos/extra-x86_64/chromium-gn-version.sh gn/repos/extra-x86_64/repro.patch ------------------------+ PKGBUILD | 96 +++++++++++++++++++++-------------------------- chromium-gn-version.sh | 42 ++++++++++---------- repro.patch | 58 ++++++++++++++-------------- 3 files changed, 94 insertions(+), 102 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-07-11 17:39:12 UTC (rev 450873) +++ PKGBUILD 2022-07-11 17:39:17 UTC (rev 450874) @@ -1,52 +0,0 @@ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> - -pkgname=gn -pkgver=0.2042.2ecd43a1 -_commit=2ecd43a10266bd091c98e6dcde507c64f6a0dad3 -pkgrel=2 -pkgdesc="Meta-build system that generates build files for Ninja" -arch=('x86_64') -url="https://gn.googlesource.com/gn/" -license=('BSD') -depends=('gcc-libs') -makedepends=('clang' 'ninja' 'python' 'git') -source=(git+https://gn.googlesource.com/gn#commit=$_commit - repro.patch) -sha256sums=('SKIP' - '4f87532d0785ded35a9452bb762635c36c8e2c8e5181c4b991dab258f895e27e') - -pkgver() { - cd $pkgname - echo 0.$(git rev-list --count initial-commit..).$(git rev-parse --short=8 HEAD) -} - -prepare() { - cd $pkgname - # https://gn-review.googlesource.com/c/gn/+/14260 - patch -Np1 -i ../repro.patch -} - -build() { - cd $pkgname - ./build/gen.py - ninja -C out -} - -check() { - cd $pkgname - ./out/gn_unittests -} - -package() { - cd $pkgname - install -D out/gn "$pkgdir/usr/bin/gn" - install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" docs/* - install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE - - mkdir -p "$pkgdir/usr/share/vim/vimfiles" - cp -r misc/vim/{autoload,ftdetect,ftplugin,syntax} \ - "$pkgdir/usr/share/vim/vimfiles/" - install -Dm644 -t "$pkgdir/usr/share/emacs/site-lisp" misc/emacs/gn-mode.el -} - -# vim:set ts=2 sw=2 et: Copied: gn/repos/extra-x86_64/PKGBUILD (from rev 450873, gn/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-07-11 17:39:17 UTC (rev 450874) @@ -0,0 +1,44 @@ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> + +pkgname=gn +pkgver=0.2050.9ef32177 +_commit=9ef321772ecc161937db69acb346397e0ccc484d +pkgrel=1 +pkgdesc="Meta-build system that generates build files for Ninja" +arch=('x86_64') +url="https://gn.googlesource.com/gn/" +license=('BSD') +depends=('gcc-libs') +makedepends=('clang' 'ninja' 'python' 'git') +source=(git+https://gn.googlesource.com/gn#commit=$_commit) +sha256sums=('SKIP') + +pkgver() { + cd $pkgname + echo 0.$(git rev-list --count initial-commit..).$(git rev-parse --short=8 HEAD) +} + +build() { + cd $pkgname + ./build/gen.py + ninja -C out +} + +check() { + cd $pkgname + ./out/gn_unittests +} + +package() { + cd $pkgname + install -D out/gn "$pkgdir/usr/bin/gn" + install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" docs/* + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE + + mkdir -p "$pkgdir/usr/share/vim/vimfiles" + cp -r misc/vim/{autoload,ftdetect,ftplugin,syntax} \ + "$pkgdir/usr/share/vim/vimfiles/" + install -Dm644 -t "$pkgdir/usr/share/emacs/site-lisp" misc/emacs/gn-mode.el +} + +# vim:set ts=2 sw=2 et: Deleted: chromium-gn-version.sh =================================================================== --- chromium-gn-version.sh 2022-07-11 17:39:12 UTC (rev 450873) +++ chromium-gn-version.sh 2022-07-11 17:39:17 UTC (rev 450874) @@ -1,21 +0,0 @@ -#!/bin/bash - -set -eo pipefail - -readonly CURL='curl -s --compressed' - -gn_revision_from_chrome_version() { - $CURL "https://chromium.googlesource.com/chromium/src/+/$1/DEPS?format=TEXT" \ - | base64 -d | grep -Po "'gn_version': 'git_revision:\K[^']*" -} - -{ - echo channel version gn_revision - echo ------- ------- ----------- - while read -r channel version; do - echo "$channel $version $(gn_revision_from_chrome_version "$version")" - done < <( - $CURL https://omahaproxy.appspot.com/json \ - | jq -r '.[] | select ( .os == "linux" ) | .versions | .[] | "\(.channel) \(.version)"' - ) -} | column -t Copied: gn/repos/extra-x86_64/chromium-gn-version.sh (from rev 450873, gn/trunk/chromium-gn-version.sh) =================================================================== --- chromium-gn-version.sh (rev 0) +++ chromium-gn-version.sh 2022-07-11 17:39:17 UTC (rev 450874) @@ -0,0 +1,21 @@ +#!/bin/bash + +set -eo pipefail + +readonly CURL='curl -s --compressed' + +gn_revision_from_chrome_version() { + $CURL "https://chromium.googlesource.com/chromium/src/+/$1/DEPS?format=TEXT" \ + | base64 -d | grep -Po "'gn_version': 'git_revision:\K[^']*" +} + +{ + echo channel version gn_revision + echo ------- ------- ----------- + while read -r channel version; do + echo "$channel $version $(gn_revision_from_chrome_version "$version")" + done < <( + $CURL https://omahaproxy.appspot.com/json \ + | jq -r '.[] | select ( .os == "linux" ) | .versions | .[] | "\(.channel) \(.version)"' + ) +} | column -t Deleted: repro.patch =================================================================== --- repro.patch 2022-07-11 17:39:12 UTC (rev 450873) +++ repro.patch 2022-07-11 17:39:17 UTC (rev 450874) @@ -1,29 +0,0 @@ -From 102a161c76f8d4c8157390b7087ae6e65ec9d7cf Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evange...@foutrelis.com> -Date: Thu, 7 Jul 2022 06:18:12 +0300 -Subject: [PATCH] build/gen.py: Make LAST_COMMIT_POSITION reproducible - -Abbreviated hashes can vary in length depending on the number of objects -in the Git repository. This frequently breaks reproducibility for distro -packages. Address this by adding --abbrev=12 to the 'git describe' call. - -Change-Id: I2fff11ff5a8e54e437a2186ea1f7c0ec17924437 ---- - build/gen.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/gen.py b/build/gen.py -index fe56186b..f877cc24 100755 ---- a/build/gen.py -+++ b/build/gen.py -@@ -218,8 +218,8 @@ 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( Copied: gn/repos/extra-x86_64/repro.patch (from rev 450873, gn/trunk/repro.patch) =================================================================== --- repro.patch (rev 0) +++ repro.patch 2022-07-11 17:39:17 UTC (rev 450874) @@ -0,0 +1,29 @@ +From 102a161c76f8d4c8157390b7087ae6e65ec9d7cf Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evange...@foutrelis.com> +Date: Thu, 7 Jul 2022 06:18:12 +0300 +Subject: [PATCH] build/gen.py: Make LAST_COMMIT_POSITION reproducible + +Abbreviated hashes can vary in length depending on the number of objects +in the Git repository. This frequently breaks reproducibility for distro +packages. Address this by adding --abbrev=12 to the 'git describe' call. + +Change-Id: I2fff11ff5a8e54e437a2186ea1f7c0ec17924437 +--- + build/gen.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/gen.py b/build/gen.py +index fe56186b..f877cc24 100755 +--- a/build/gen.py ++++ b/build/gen.py +@@ -218,8 +218,8 @@ 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(