eww-git: remove install file and merged patch

5 files changed, 6 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 826c2e8b4f53..16f00d30d557 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = eww-git
 	pkgdesc = ElKowar's wacky widgets
-	pkgver = 0.4.0.r34.g25e50ed
-	pkgrel = 2
+	pkgver = 0.4.0.r36.g4a9455b
+	pkgrel = 1
 	url = https://github.com/elkowar/eww
-	install = eww-git.install
 	arch = x86_64
 	license = MIT
 	makedepends = cargo-nightly
@@ -13,11 +12,9 @@ pkgbase = eww-git
 	provides = eww
 	conflicts = eww
 	source = git+https://github.com/elkowar/eww.git?signed
-	source = 0001-comply-with-rust-lang-rfcs-2140.patch
 	validpgpkeys = 94E8F34BCE4F4BA8ED9B29BD50E76B4711E4C3E4
 	validpgpkeys = 5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23
 	b2sums = SKIP
-	b2sums = 1696d841f15794b4a0a5af350f46a958d4230b89c1560ba8a9b7139507f145751c288f9e696227948c1e9fb235961d1bca1e29004c8d5e9f3c5b4ef6b58e1970
 
 pkgname = eww-x11-git
 	pkgdesc = ElKowar's wacky widgets (X11 backend)
diff --git a/.gitignore b/.gitignore
index 8ab73c8e4fcd..713f6f80aff8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,3 @@
 !/.gitignore
 !/.SRCINFO
 !/PKGBUILD
-!/eww-git.install
-!/0001-comply-with-rust-lang-rfcs-2140.patch
diff --git a/0001-comply-with-rust-lang-rfcs-2140.patch b/0001-comply-with-rust-lang-rfcs-2140.patch
deleted file mode 100644
index 4b5f6909bca9..000000000000
--- a/0001-comply-with-rust-lang-rfcs-2140.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
-Subject: [PATCH] comply with rust-lang/rfcs#2140
-
----
- crates/eww/src/error_handling_ctx.rs         | 2 +-
- crates/eww/src/main.rs                       | 4 ++--
- crates/eww/src/widgets/widget_definitions.rs | 2 +-
- 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..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>
- }
- 
- 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.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/crates/eww/src/main.rs b/crates/eww/src/main.rs
-index 1e61c3b..9211d03 100644
---- a/crates/eww/src/main.rs
-+++ b/crates/eww/src/main.rs
-@@ -1,9 +1,9 @@
- #![feature(trace_macros)]
--#![feature(drain_filter)]
-+#![feature(extract_if)]
- #![feature(box_patterns)]
- #![feature(slice_concat_trait)]
- #![feature(try_blocks)]
--#![feature(hash_drain_filter)]
-+#![feature(hash_extract_if)]
- #![allow(rustdoc::private_intra_doc_links)]
- 
- extern crate gtk;
-diff --git a/crates/eww/src/widgets/widget_definitions.rs b/crates/eww/src/widgets/widget_definitions.rs
-index 2cdc907..a142940 100644
---- a/crates/eww/src/widgets/widget_definitions.rs
-+++ b/crates/eww/src/widgets/widget_definitions.rs
-@@ -127,7 +127,7 @@ static DEPRECATED_ATTRS: Lazy<HashSet<&str>> =
- /// @desc these properties apply to _all_ widgets, and can be used anywhere!
- pub(super) fn resolve_widget_attrs(bargs: &mut BuilderArgs, gtk_widget: &gtk::Widget) -> Result<()> {
-     let deprecated: HashSet<_> = DEPRECATED_ATTRS.to_owned();
--    let contained_deprecated: Vec<_> = bargs.unhandled_attrs.drain_filter(|a, _| deprecated.contains(&a.0 as &str)).collect();
-+    let contained_deprecated: Vec<_> = bargs.unhandled_attrs.extract_if(|a, _| deprecated.contains(&a.0 as &str)).collect();
-     if !contained_deprecated.is_empty() {
-         let diag = error_handling_ctx::stringify_diagnostic(gen_diagnostic! {
-             kind =  Severity::Error,
--- 
-2.41.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 8988f2caaad9..e74927578842 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 _pkgname=eww
 pkgbase="$_pkgname-git"
 pkgname=($_pkgname-{x11,wayland}-git)
-pkgver=0.4.0.r34.g25e50ed
-pkgrel=2
+pkgver=0.4.0.r36.g4a9455b
+pkgrel=1
 pkgdesc="ElKowar's wacky widgets"
 arch=(x86_64)
 url="https://github.com/elkowar/$_pkgname"
@@ -14,11 +14,8 @@ depends=(gtk3 gtk-layer-shell)
 makedepends=(cargo-nightly git)
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-install=$pkgbase.install
-source=("git+$url.git?signed"
-        0001-comply-with-rust-lang-rfcs-2140.patch)
-b2sums=('SKIP'
-        '1696d841f15794b4a0a5af350f46a958d4230b89c1560ba8a9b7139507f145751c288f9e696227948c1e9fb235961d1bca1e29004c8d5e9f3c5b4ef6b58e1970')
+source=("git+$url.git?signed")
+b2sums=('SKIP')
 validpgpkeys=(
 	'94E8F34BCE4F4BA8ED9B29BD50E76B4711E4C3E4' # Leon Kowarschick <5300871+elkowar@users.noreply.github.com>
 	'5DE3E0509C47EA3CF04A42D34AEE18F83AFDEB23' # GitHub (web-flow commit signing) <noreply@github.com>
@@ -27,8 +24,6 @@ validpgpkeys=(
 prepare() {
 	cd $_pkgname
 
-	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"
diff --git a/eww-git.install b/eww-git.install
deleted file mode 100644
index 3d55ba90bd60..000000000000
--- a/eww-git.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    echo "\
-_____________________________________________________________________
-|                                                                   |
-| The example config can be found in /etc/xdg/eww                   |
-|                                                                   |
-| For better experience, please write your own config.              |
-| WIKI: https://elkowar.github.io/eww/configuration.html            |
-|                                                                   |
-|___________________________________________________________________|"
-}