From 5bb9c868bb3cf1414a2e5ddbb03af4bee385b364 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Mon, 13 Sep 2021 16:38:16 +0200 Subject: [PATCH] rust: Update to 1.55.0 --- mingw-w64-rust/0006-Update-cc.patch | 14 -------------- mingw-w64-rust/PKGBUILD | 12 +++--------- mingw-w64-rust/fix-jemalloc.patch | 20 -------------------- mingw-w64-rust/force-curl-cargo.patch | 24 ------------------------ mingw-w64-rust/force-curl-rust.patch | 19 ------------------- 5 files changed, 3 insertions(+), 86 deletions(-) delete mode 100644 mingw-w64-rust/0006-Update-cc.patch delete mode 100644 mingw-w64-rust/fix-jemalloc.patch delete mode 100644 mingw-w64-rust/force-curl-cargo.patch delete mode 100644 mingw-w64-rust/force-curl-rust.patch diff --git a/mingw-w64-rust/0006-Update-cc.patch b/mingw-w64-rust/0006-Update-cc.patch deleted file mode 100644 index 88c9cdb76a..0000000000 --- a/mingw-w64-rust/0006-Update-cc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- rustc-1.48.0-src/Cargo.lock.orig 2020-11-22 19:35:49.593000000 +0100 -+++ rustc-1.48.0-src/Cargo.lock 2020-11-22 19:34:54.392628500 +0100 -@@ -450,9 +450,9 @@ - - [[package]] - name = "cc" --version = "1.0.60" -+version = "1.0.65" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c" -+checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15" - dependencies = [ - "jobserver", - ] diff --git a/mingw-w64-rust/PKGBUILD b/mingw-w64-rust/PKGBUILD index 1a66b4e446..61323c2326 100644 --- a/mingw-w64-rust/PKGBUILD +++ b/mingw-w64-rust/PKGBUILD @@ -7,8 +7,8 @@ _bootstrapping=yes pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-rust-docs") -pkgver=1.53.0 -pkgrel=3 +pkgver=1.55.0 +pkgrel=1 pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -31,19 +31,15 @@ makedepends=("bison" options=('staticlibs') #install=rust.install source=("https://static.rust-lang.org/dist/${_realname}c-${pkgver}-src.tar.gz" - "force-curl-rust.patch" "0001-add-missing-libs.patch" "0004-unbundle-gcc.patch" "0005-win32-config.patch" - "0006-Update-cc.patch" "0007-clang-subsystem.patch" "0008-disable-self-contained.patch") -sha256sums=('5cf7ca39a10f6bf4e0b0bd15e3b9a61ce721f301e12d148262e5ba968ab825b9' - 'bd63b990d2c1626acb87d5ea534c3d82fc4daddb5f784a83053be7b162327445' +sha256sums=('b2379ac710f5f876ee3c3e03122fe33098d6765d371cac6c31b1b6fc8e43821e' 'c706841ace2ef76fd1004b9c0486ea9ef7d99073c5ce2884e4c97fa4a7beab25' '6cc3234644768e24824e455d6304585c717ae25aa53ebf9cf1f1dea87bf869b7' 'c4e5ffeef84296d39c3e3e8f807fc8b33ce786b1e4edb21eef26b053586aca27' - 'dd8f785138a78398c486fe60237833d1c6a84be5128ad6b3210c135dda258497' '9e2e2eb9c0684f329b1ce6598fcb66727abf84121087b24670a9cfc44a514888' '29f84cb8e05ce304e102e28912a3b4464add406a8ec37a6c6d717b9b7d81b67b') #validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) @@ -54,11 +50,9 @@ prepare() { tar -xzf ${srcdir}/${_realname}c-${pkgver}-src.tar.gz -C ${srcdir} || true cd ${srcdir}/${_realname}c-${pkgver}-src - patch -p1 -i "${srcdir}/force-curl-rust.patch" patch -p1 -i "${srcdir}/0001-add-missing-libs.patch" patch -p1 -i "${srcdir}/0004-unbundle-gcc.patch" patch -p1 -i "${srcdir}/0005-win32-config.patch" - patch -p1 -i "${srcdir}/0006-Update-cc.patch" patch -p1 -i "${srcdir}/0008-disable-self-contained.patch" if [[ $MINGW_PACKAGE_PREFIX == *-clang-* ]]; then diff --git a/mingw-w64-rust/fix-jemalloc.patch b/mingw-w64-rust/fix-jemalloc.patch deleted file mode 100644 index da9433224d..0000000000 --- a/mingw-w64-rust/fix-jemalloc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- rustc-1.29.1-src/src/bootstrap/configure.py.orig 2017-03-10 23:55:21 +0100 -+++ rustc-1.29.1-src/src/bootstrap/configure.py 2017-03-23 22:51:46 +0100 -@@ -95,7 +95,7 @@ - - v("llvm-root", None, "set LLVM root") - v("python", "build.python", "set path to python") --v("jemalloc-root", None, "set directory where libjemalloc_pic.a is located") -+v("jemalloc-root", None, "set directory where libjemalloc.a is located") - v("android-cross-path", "target.arm-linux-androideabi.android-ndk", - "Android NDK standalone path (deprecated)") - v("i686-linux-android-ndk", "target.i686-linux-android.android-ndk", -@@ -323,7 +323,7 @@ - elif option.name == 'llvm-root': - set('target.{}.llvm-config'.format(build()), value + '/bin/llvm-config') - elif option.name == 'jemalloc-root': -- set('target.{}.jemalloc'.format(build()), value + '/libjemalloc_pic.a') -+ set('target.{}.jemalloc'.format(build()), value + '/libjemalloc.a') - elif option.name == 'tools': - set('build.tools', value.split(',')) - elif option.name == 'host': \ No newline at end of file diff --git a/mingw-w64-rust/force-curl-cargo.patch b/mingw-w64-rust/force-curl-cargo.patch deleted file mode 100644 index 413e714aea..0000000000 --- a/mingw-w64-rust/force-curl-cargo.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 7be5e15a12b89168e4d096348848eaa9a9534858 -Author: Zion Nimchuk -Date: Fri Oct 14 22:45:53 2016 -0700 - - Force download to use curl, not powershell - -diff --git a/src/etc/download.py b/src/etc/download.py -index 5ef0df3..9374262 100644 ---- a/src/etc/download.py -+++ b/src/etc/download.py -@@ -7,12 +7,7 @@ import tarfile - - def get(url, path, quiet=False): - # see http://serverfault.com/questions/301128/how-to-download -- if sys.platform == 'win32': -- run(["PowerShell.exe", "/nologo", "-Command", -- "(New-Object System.Net.WebClient).DownloadFile('" + url + -- "', '" + path + "')"], quiet=quiet) -- else: -- run(["curl", "-o", path, url], quiet=quiet) -+ run(["curl", "-o", path, url], quiet=quiet) - - - def unpack(tarball, dst, quiet=False, strip=0): diff --git a/mingw-w64-rust/force-curl-rust.patch b/mingw-w64-rust/force-curl-rust.patch deleted file mode 100644 index 3aff300d2f..0000000000 --- a/mingw-w64-rust/force-curl-rust.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py -index 17a7c9c..4e3ca0d 100644 ---- a/src/bootstrap/bootstrap.py -+++ b/src/bootstrap/bootstrap.py -@@ -77,14 +77,6 @@ - def _download(path, url, probably_big, verbose, exception): - if probably_big or verbose: - print("downloading {}".format(url)) -- # see http://serverfault.com/questions/301128/how-to-download -- if sys.platform == 'win32': -- run(["PowerShell.exe", "/nologo", "-Command", -- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;", -- "(New-Object System.Net.WebClient).DownloadFile('{}', '{}')".format(url, path)], -- verbose=verbose, -- exception=exception) -- else: - if probably_big or verbose: - option = "-#" - else: