eww-git: fix patch, license directory; update cargo deps

3 files changed, 9 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 739b464c718a..826c2e8b4f53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = eww-git
 	pkgdesc = ElKowar's wacky widgets
 	pkgver = 0.4.0.r34.g25e50ed
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/elkowar/eww
 	install = eww-git.install
 	arch = x86_64
@@ -17,7 +17,7 @@ pkgbase = eww-git
 	validpgpkeys = 94E8F34BCE4F4BA8ED9B29BD50E76B4711E4C3E4
 	validpgpkeys = 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23
 	b2sums = SKIP
-	b2sums = fafbf79bd0c74780e53887784102102758e2d3a411c2c95fb77b5cb75b4c9bb53cda92b9b80e463704a38edb5161187f86c5c57dcb32bd768fd56addc2df937b
+	b2sums = 1696d841f15794b4a0a5af350f46a958d4230b89c1560ba8a9b7139507f145751c288f9e696227948c1e9fb235961d1bca1e29004c8d5e9f3c5b4ef6b58e1970
 
 pkgname = eww-x11-git
 	pkgdesc = ElKowar's wacky widgets (X11 backend)
diff --git a/0001-comply-with-rust-lang-rfcs-2140.patch b/0001-comply-with-rust-lang-rfcs-2140.patch
index 320ac5a9c5f5..4b5f6909bca9 100644
--- a/0001-comply-with-rust-lang-rfcs-2140.patch
+++ b/0001-comply-with-rust-lang-rfcs-2140.patch
@@ -1,4 +1,4 @@
-From 2bb7084425994bf70a69ee52f5917dd3fa1185ba Mon Sep 17 00:00:00 2001
+From fc2db6fa2310dbb4971a9d9ad4df553081a4ea05 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=A9clairevoyant?=
  <848000+eclairevoyant@users.noreply.github.com>
 Date: Fri, 23 Jun 2023 09:21:29 -0400
@@ -11,7 +11,7 @@ Subject: [PATCH] comply with rust-lang/rfcs#2140
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/crates/eww/src/error_handling_ctx.rs b/crates/eww/src/error_handling_ctx.rs
-index 3273200..8a57e35 100644
+index 3273200..05af272 100644
 --- a/crates/eww/src/error_handling_ctx.rs
 +++ b/crates/eww/src/error_handling_ctx.rs
 @@ -53,7 +53,7 @@ pub fn anyhow_err_to_diagnostic(err: &anyhow::Error) -> Option<Diagnostic<usize>
@@ -19,7 +19,7 @@ index 3273200..8a57e35 100644
  
  pub fn stringify_diagnostic(mut diagnostic: codespan_reporting::diagnostic::Diagnostic<usize>) -> anyhow::Result<String> {
 -    diagnostic.labels.drain_filter(|label| Span(label.range.start, label.range.end, label.file_id).is_dummy());
-+    diagnostic.labels.extract_if(|label| Span(label.range.start, label.range.end, label.file_id).is_dummy());
++    diagnostic.labels.retain(|label| !Span(label.range.start, label.range.end, label.file_id).is_dummy());
  
      let mut config = term::Config::default();
      let mut chars = Chars::box_drawing();
diff --git a/PKGBUILD b/PKGBUILD
index c41a3e7f5761..8988f2caaad9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=eww
 pkgbase="$_pkgname-git"
 pkgname=($_pkgname-{x11,wayland}-git)
 pkgver=0.4.0.r34.g25e50ed
-pkgrel=1
+pkgrel=2
 pkgdesc="ElKowar's wacky widgets"
 arch=(x86_64)
 url="https://github.com/elkowar/$_pkgname"
@@ -18,7 +18,7 @@ install=$pkgbase.install
 source=("git+$url.git?signed"
         0001-comply-with-rust-lang-rfcs-2140.patch)
 b2sums=('SKIP'
-        'fafbf79bd0c74780e53887784102102758e2d3a411c2c95fb77b5cb75b4c9bb53cda92b9b80e463704a38edb5161187f86c5c57dcb32bd768fd56addc2df937b')
+        '1696d841f15794b4a0a5af350f46a958d4230b89c1560ba8a9b7139507f145751c288f9e696227948c1e9fb235961d1bca1e29004c8d5e9f3c5b4ef6b58e1970')
 validpgpkeys=(
 	'94E8F34BCE4F4BA8ED9B29BD50E76B4711E4C3E4' # Leon Kowarschick <5300871+elkowar@users.noreply.github.com>
 	'5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23' # GitHub (web-flow commit signing) <noreply@github.com>
@@ -30,6 +30,7 @@ prepare() {
 	patch -Np1 -i "$srcdir/0001-comply-with-rust-lang-rfcs-2140.patch"
 
 	export RUSTUP_TOOLCHAIN=nightly
+	cargo update
 	cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
@@ -50,7 +51,7 @@ build() {
 
 _pkg() {
 	cd $_pkgname
-	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$_pkgname/"
+	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 	install -d "$pkgdir/etc/xdg/$_pkgname/"
 	cp -r examples/eww-bar "$pkgdir/etc/xdg/$_pkgname/"
 }