Updated to 1.28.0

1 files changed, 25 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 58ca3d98d667..1d30eba54b97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: pingplug <pingplug@foxmail.com>
 
 _pkgname=rust
+_cargo=0.29.0
 
 pkgname=mingw-w64-rust-bin
-pkgver=1.27.2
+pkgver=1.28.0
 pkgrel=1
 pkgdesc="Systems programming language focused on safety, speed and concurrency (official build, mingw-w64)"
 arch=('x86_64')
@@ -19,14 +20,20 @@ provides=("mingw-w64-rust=${pkgver}")
 conflicts=('mingw-w64-rust')
 options=('!strip' 'staticlibs' '!buildflags')
 
-source=("https://static.rust-lang.org/dist/rust-${pkgver}-x86_64-unknown-linux-gnu.tar.xz"{,.asc}
+source=("https://static.rust-lang.org/dist/cargo-${_cargo}-x86_64-unknown-linux-gnu.tar.xz"{,.asc}
+        "https://static.rust-lang.org/dist/rustc-${pkgver}-x86_64-unknown-linux-gnu.tar.xz"{,.asc}
+        "https://static.rust-lang.org/dist/rust-std-${pkgver}-x86_64-unknown-linux-gnu.tar.xz"{,.asc}
         "https://static.rust-lang.org/dist/rust-std-${pkgver}-i686-pc-windows-gnu.tar.xz"{,.asc}
         "https://static.rust-lang.org/dist/rust-std-${pkgver}-x86_64-pc-windows-gnu.tar.xz"{,.asc})
-sha256sums=('090a3bfc536b7211ae84f6667c941c861eddfdcadb5e472a32e72d074f793dd4'
+sha256sums=('2e62f91aab9ea496209a060e7ec62f088f5081b568a28b88f3c8ea7073db9829'
             'SKIP'
-            '29cb54b97dde3f9d1382d341c6bdc526fc1bd19f5c7df6bd8a55c49feb29dfcf'
+            '193f5e18e15152c26d1b09b97ee72f334a0e9ef8f0ba05187a3f20dc02443c4f'
             'SKIP'
-            '562897ca637ce9bf3c1c5df156c23b6f05343daf1bfe4b2b1eeca65814b9617d'
+            '80aca8c46aa724c91f7cb7fc038c8c94e6648e73156e9f35e1f73bc5dd5b0249'
+            'SKIP'
+            '47288679bea8e81c9413fb530378b9f4a9bb47f46de5517de48f0ba210020b9b'
+            'SKIP'
+            '685102a86203938af8935c792fe4818c02ff4705cf76bcaf5abde7da415a04fb'
             'SKIP')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
 
@@ -35,11 +42,21 @@ PKGEXT=".pkg.tar.gz"
 
 prepare() {
   cd ${srcdir}
-  rm -rf "rust-${pkgver}-x86_64-unknown-linux-gnu/rust-std-i686-pc-windows-gnu"
+  mkdir -p "rust-${pkgver}-x86_64-unknown-linux-gnu"
+  cp "cargo-${_cargo}-x86_64-unknown-linux-gnu/install.sh" "rust-${pkgver}-x86_64-unknown-linux-gnu"
+
+  mv "cargo-${_cargo}-x86_64-unknown-linux-gnu/cargo" "rust-${pkgver}-x86_64-unknown-linux-gnu"
+  cat "cargo-${_cargo}-x86_64-unknown-linux-gnu/components" >> "rust-${pkgver}-x86_64-unknown-linux-gnu/components"
+
+  mv "rustc-${pkgver}-x86_64-unknown-linux-gnu/rustc" "rust-${pkgver}-x86_64-unknown-linux-gnu"
+  cat "rustc-${pkgver}-x86_64-unknown-linux-gnu/components" >> "rust-${pkgver}-x86_64-unknown-linux-gnu/components"
+
+  mv "rust-std-${pkgver}-x86_64-unknown-linux-gnu/rust-std-x86_64-unknown-linux-gnu" "rust-${pkgver}-x86_64-unknown-linux-gnu"
+  cat "rust-std-${pkgver}-x86_64-unknown-linux-gnu/components" >> "rust-${pkgver}-x86_64-unknown-linux-gnu/components"
+
   mv "rust-std-${pkgver}-i686-pc-windows-gnu/rust-std-i686-pc-windows-gnu" "rust-${pkgver}-x86_64-unknown-linux-gnu"
   cat "rust-std-${pkgver}-i686-pc-windows-gnu/components" >> "rust-${pkgver}-x86_64-unknown-linux-gnu/components"
 
-  rm -rf "rust-${pkgver}-x86_64-unknown-linux-gnu/rust-std-x86_64-pc-windows-gnu"
   mv "rust-std-${pkgver}-x86_64-pc-windows-gnu/rust-std-x86_64-pc-windows-gnu" "rust-${pkgver}-x86_64-unknown-linux-gnu"
   cat "rust-std-${pkgver}-x86_64-pc-windows-gnu/components" >> "rust-${pkgver}-x86_64-unknown-linux-gnu/components"
 }
@@ -61,7 +78,7 @@ package() {
   # remove unused files
   rm -r "${pkgdir}/opt/${_pkgname}/"{etc,share}
   rm "${pkgdir}/opt/${_pkgname}/lib/rustlib/"{manifest-*,install.log,uninstall.sh,components,rust-installer-version}
-  rm "${pkgdir}/opt/${_pkgname}/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_trans-emscripten.so"
+  rm "${pkgdir}/opt/${_pkgname}/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-emscripten.so"
   rm "${pkgdir}/opt/${_pkgname}/lib/rustlib/i686-pc-windows-gnu/lib/"{arena,fmt_macros,graphviz,proc_macro,rustc,serialize,syntax}*.dll
   rm "${pkgdir}/opt/${_pkgname}/lib/rustlib/x86_64-pc-windows-gnu/lib/"{arena,fmt_macros,graphviz,proc_macro,rustc,serialize,syntax}*.dll