Date: Friday, April 12, 2019 @ 21:54:30 Author: demize Revision: 350688
upgpkg: rust 1:1.34.0-1 Modified: rust/trunk/PKGBUILD Deleted: rust/trunk/0001-Backport-deprecation-fixes-from-commit-b7f030e.patch rust/trunk/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch -----------------------------------------------------------------+ 0001-Backport-deprecation-fixes-from-commit-b7f030e.patch | 57 ---------- 0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch | 30 ----- PKGBUILD | 20 +-- 3 files changed, 7 insertions(+), 100 deletions(-) Deleted: 0001-Backport-deprecation-fixes-from-commit-b7f030e.patch =================================================================== --- 0001-Backport-deprecation-fixes-from-commit-b7f030e.patch 2019-04-12 19:42:29 UTC (rev 350687) +++ 0001-Backport-deprecation-fixes-from-commit-b7f030e.patch 2019-04-12 21:54:30 UTC (rev 350688) @@ -1,57 +0,0 @@ -From 55030c7543d8e877ec7a6b577a51422c38f01259 Mon Sep 17 00:00:00 2001 -From: Josh Stone <jist...@redhat.com> -Date: Fri, 1 Mar 2019 09:27:45 -0800 -Subject: [PATCH] Backport deprecation fixes from commit b7f030e - ---- - src/tools/linkchecker/main.rs | 6 +++--- - src/tools/tidy/src/features.rs | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs -index 59662be349dc..2cf0fcfd34cd 100644 ---- a/src/tools/linkchecker/main.rs -+++ b/src/tools/linkchecker/main.rs -@@ -78,7 +78,7 @@ impl FileEntry { - fn parse_ids(&mut self, file: &Path, contents: &str, errors: &mut bool) { - if self.ids.is_empty() { - with_attrs_in_source(contents, " id", |fragment, i, _| { -- let frag = fragment.trim_left_matches("#").to_owned(); -+ let frag = fragment.trim_start_matches("#").to_owned(); - let encoded = small_url_encode(&frag); - if !self.ids.insert(frag) { - *errors = true; -@@ -343,7 +343,7 @@ fn with_attrs_in_source<F: FnMut(&str, usize, &str)>(contents: &str, attr: &str, - Some(i) => i, - None => continue, - }; -- if rest[..pos_equals].trim_left_matches(" ") != "" { -+ if rest[..pos_equals].trim_start_matches(" ") != "" { - continue; - } - -@@ -355,7 +355,7 @@ fn with_attrs_in_source<F: FnMut(&str, usize, &str)>(contents: &str, attr: &str, - }; - let quote_delim = rest.as_bytes()[pos_quote] as char; - -- if rest[..pos_quote].trim_left_matches(" ") != "" { -+ if rest[..pos_quote].trim_start_matches(" ") != "" { - continue; - } - let rest = &rest[pos_quote + 1..]; -diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs -index 2435a0cfd4e3..bf2cfbf32fc7 100644 ---- a/src/tools/tidy/src/features.rs -+++ b/src/tools/tidy/src/features.rs -@@ -188,7 +188,7 @@ pub fn collect_lang_features(base_src_path: &Path, bad: &mut bool) -> Features { - } - - let mut parts = line.split(','); -- let level = match parts.next().map(|l| l.trim().trim_left_matches('(')) { -+ let level = match parts.next().map(|l| l.trim().trim_start_matches('(')) { - Some("active") => Status::Unstable, - Some("removed") => Status::Removed, - Some("accepted") => Status::Stable, --- -2.20.1 - Deleted: 0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch =================================================================== --- 0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch 2019-04-12 19:42:29 UTC (rev 350687) +++ 0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch 2019-04-12 21:54:30 UTC (rev 350688) @@ -1,30 +0,0 @@ -From c5f42fa1207dc6df476b55a9cdda439d8cfcba05 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@kyriasis.com> -Date: Thu, 14 Mar 2019 20:35:52 +0100 -Subject: [PATCH] Revert 1c95f5a34c14f08d65cdd198827e3a2fcb63cf39 + - 9452a8dfa3ba3575d5cf090a4e2305ee106d259e -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Johannes Löthberg <johan...@kyriasis.com> ---- - src/librustc_codegen_llvm/debuginfo/metadata.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs -index 9f63038c36..553b952b56 100644 ---- a/src/librustc_codegen_llvm/debuginfo/metadata.rs -+++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs -@@ -1167,7 +1167,7 @@ fn use_enum_fallback(cx: &CodegenCx) -> bool { - // LLVM version 7 did not release with an important bug fix; - // but the required patch is in the LLVM 8. Rust LLVM reports - // 8 as well. -- || llvm_util::get_major_version() < 8; -+ || llvm_util::get_major_version() < 7; - } - - // Describes the members of an enum value: An enum is described as a union of --- -2.20.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-04-12 19:42:29 UTC (rev 350687) +++ PKGBUILD 2019-04-12 21:54:30 UTC (rev 350688) @@ -7,8 +7,8 @@ pkgname=('rust' 'rust-docs') epoch=1 -pkgver=1.33.0 -pkgrel=2 +pkgver=1.34.0 +pkgrel=1 pkgdesc='Systems programming language focused on safety, speed and concurrency' url='https://www.rust-lang.org/' @@ -15,21 +15,17 @@ arch=('x86_64') license=('MIT' 'Apache') -makedepends=('rust' 'llvm7' 'libffi' 'perl' 'python2' 'curl' 'cmake') +makedepends=('rust' 'llvm' 'libffi' 'perl' 'python2' 'curl' 'cmake') checkdepends=('procps-ng' 'gdb') options=('!emptydirs') source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} - config.toml - 0001-Backport-deprecation-fixes-from-commit-b7f030e.patch - 0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch) + config.toml) -sha256sums=('5a01a8d7e65126f6079042831385e77485fa5c014bf217e9f3e4aff36a485d94' +sha256sums=('7ac85acffd79dd3a7c44305d9eaabd1f1e7116e2e6e11e770e4bf5f92c0f1f59' 'SKIP' - 'ce1c2648e70a14362d33d0cbbd3e35846ea9d43a8d0abc36071563fc087b82d5' - 'd2fdd8ec0196e87b930f49a9ffa9fe7fe4995af54cfa8ee5638c7dc2170f5f8c' - 'cf04a3c8ac0b4f5d786532e6e07a2f52cea2216d899be8d7c0b087aab78a2b68') + 'ce1c2648e70a14362d33d0cbbd3e35846ea9d43a8d0abc36071563fc087b82d5') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-...@rust-lang.org> prepare() { @@ -36,8 +32,6 @@ cd "rustc-$pkgver-src" cp "$srcdir"/config.toml config.toml - patch -p1 <"$srcdir"/0001-Backport-deprecation-fixes-from-commit-b7f030e.patch - patch -p1 <"$srcdir"/0001-Revert-1c95f5a34c14f08d65cdd198827e3a2fcb63cf39-9452.patch } build() { @@ -47,7 +41,7 @@ } package_rust() { - depends=('gcc-libs' 'llvm7-libs' 'curl' 'libssh2') + depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2') provides=('cargo' 'rustfmt') conflicts=('cargo' 'rustfmt') replaces=('cargo' 'rustfmt')