From 1f45f00d70cffa940cd4c8d3c732c0ad372140c8 Mon Sep 17 00:00:00 2001
From: Philippe Renon <philippe_renon@yahoo.fr>
Date: Fri, 12 Aug 2022 12:16:18 +0200
Subject: [PATCH] rust: Update to 1.63.0

---
 mingw-w64-rust/0007-clang-subsystem.patch | 16 ++++++++--------
 mingw-w64-rust/PKGBUILD                   |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mingw-w64-rust/0007-clang-subsystem.patch b/mingw-w64-rust/0007-clang-subsystem.patch
index fe992bdc50..22f6b32168 100644
--- a/mingw-w64-rust/0007-clang-subsystem.patch
+++ b/mingw-w64-rust/0007-clang-subsystem.patch
@@ -64,11 +64,11 @@
          late_link_args_dynamic,
          late_link_args_static,
          abi_return_struct_as_int: true,
-diff -urN rustc-1.53.0-src/src/bootstrap/bootstrap.py.orig rustc-1.53.0-src/src/bootstrap/bootstrap.py
---- rustc-1.53.0-src/src/bootstrap/bootstrap.py.orig    2021-07-03 13:57:23.756296000 +0200
-+++ rustc-1.53.0-src/src/bootstrap/bootstrap.py 2021-07-03 13:58:41.037817900 +0200
-@@ -425,6 +425,12 @@
-             with output(self.rustc_stamp(stage0)) as rust_stamp:
+diff -urN rustc-1.63.0-src/src/bootstrap/bootstrap.py.orig  rustc-1.63.0-src/src/bootstrap/bootstrap.py
+--- rustc-1.63.0-src/src/bootstrap/bootstrap.py.orig    2022-08-12 19:32:07.547564900 +0200
++++ rustc-1.63.0-src/src/bootstrap/bootstrap.py 2022-08-12 19:51:33.210101800 +0200
+@@ -482,6 +482,12 @@
+             with output(self.rustc_stamp()) as rust_stamp:
                  rust_stamp.write(key)
 
 +            gcc_libs_hack = os.environ.get('GCC_LIBS_HACK')
@@ -77,9 +77,9 @@ diff -urN rustc-1.53.0-src/src/bootstrap/bootstrap.py.orig rustc-1.53.0-src/src/
 +            shutil.copy(gcc_libs_hack + '/libgcc_eh.a', gcc_libs_hack_dest)
 +            shutil.copy(gcc_libs_hack + '/libgcc_s.a', gcc_libs_hack_dest)
 +
-         if self.rustfmt() and self.rustfmt().startswith(bin_root) and (
-             not os.path.exists(self.rustfmt())
-             or self.program_out_of_date(self.rustfmt_stamp(), self.rustfmt_channel)
+     def _download_component_helper(
+         self, filename, pattern, tarball_suffix,
+     ):
 --- rustc-1.61.0-src/compiler/rustc_target/src/spec/i686_pc_windows_gnu.rs.orig	2022-05-22 16:08:33.258876100 +0200
 +++ rustc-1.61.0-src/compiler/rustc_target/src/spec/i686_pc_windows_gnu.rs	2022-05-22 16:13:31.577741200 +0200
 @@ -7,7 +7,7 @@
diff --git a/mingw-w64-rust/PKGBUILD b/mingw-w64-rust/PKGBUILD
index e554ee6671..53c8aac53a 100644
--- a/mingw-w64-rust/PKGBUILD
+++ b/mingw-w64-rust/PKGBUILD
@@ -7,7 +7,7 @@ _bootstrapping=yes
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-rust-docs")
-pkgver=1.62.1
+pkgver=1.63.0
 pkgrel=1
 pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
 arch=('any')
@@ -36,12 +36,12 @@ source=("https://static.rust-lang.org/dist/${_realname}c-${pkgver}-src.tar.gz"{,
         "0005-win32-config.patch"
         "0007-clang-subsystem.patch"
         "0008-disable-self-contained.patch")
-sha256sums=('72acbe6ffcd94f598382a7430b0d85ee8f679e6d0b27f3f566ed1c16c978133f'
+sha256sums=('1f9580295642ef5da7e475a8da2397d65153d3f2cb92849dbd08ed0effca99d0'
             'SKIP'
             '7cb1773c288ffb1c1e751edc49b1890c84bf9c362742bc5225d19d474edb73a0'
             '36c531c73a2c12b3e66aa22526a404c3f770f1ab7e0e76c55af6fcc1a17e46fe'
             'c4e5ffeef84296d39c3e3e8f807fc8b33ce786b1e4edb21eef26b053586aca27'
-            '4a5801c7d5169a68541d5af9accb311624764ef29c853a31c48909179ab208de'
+            '701767f36af582502b3697826c047211117cb6b1fbc122630898da6e983fd9eb'
             '29f84cb8e05ce304e102e28912a3b4464add406a8ec37a6c6d717b9b7d81b67b')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>