[tor-commits] [tor-browser-build/master] Bug 40006: Adapt cbindgen for Firefox 78 ESR

[sysrqb at torproject.org]

commit f232e5d23544a7fbfa4b8f619a49315d370aca2b
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Jun 14 11:12:40 2020 +0000

    Bug 40006: Adapt cbindgen for Firefox 78 ESR
---
 projects/cbindgen/build  | 2 +-
 projects/cbindgen/config | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/projects/cbindgen/build b/projects/cbindgen/build
index 429f567..2a1c9e0 100644
--- a/projects/cbindgen/build
+++ b/projects/cbindgen/build
@@ -11,7 +11,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 # Now prepare the offline build
 # Move the directory for hardcoding the path in .cargo/config
 mv /var/tmp/build/[% project %]-[% c('version') %] $builddir
-tar -C $builddir -xjf cbindgen-vendor.tar.bz2
+tar -C $builddir -xjf cbindgen-vendor-[% c('version') %].tar.bz2
 cd $builddir
 mkdir .cargo
 cat > .cargo/config << 'EOF'
diff --git a/projects/cbindgen/config b/projects/cbindgen/config
index ddfb9f9..3dd94f6 100644
--- a/projects/cbindgen/config
+++ b/projects/cbindgen/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
-version: '[% c("abbrev") %]'
+version: 0.14.1
 git_url: https://github.com/eqrion/cbindgen
-git_hash: 23a991a5b21e89aa1dcdc70f1371be20c93ece8e #v0.8.7
+git_hash: 0761b9bbe48d01ded1bbec45bbeea5544b3b1002 # v0.14.1
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -12,5 +12,5 @@ input_files:
   - name: rust
     project: rust
   # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources.
-  - URL: https://people.torproject.org/~boklm/mirrors/sources/cbindgen-vendor.tar.bz2
-    sha256sum: f4cde3d56df893b543b35b7e4a6e295a275dbb3cee8e8eae549efe679db50ab9
+  - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2
+    sha256sum: 1c500bc1b8de4eb400f90a528c4b5c6b2c7357e401a95c5354469a18fd365dbc