commit 17b78164aa34963cb6cee273f17c3b73a7a52519 Author: Tim Biermann <tbier@posteo.de> Date: Sun Jun 7 13:59:11 2020 +0200 i3status-rust: 0.13.1 -> 0.14.0 diff --git a/i3status-rust/.signature b/i3status-rust/.signature index d8351a1c7..c1e00bf72 100644 --- a/i3status-rust/.signature +++ b/i3status-rust/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30u6l3pUNlKXALDdT4USAbyUY3w4dVwlJe/rQVoAQLktWaM06XtoC7CBCdcpOr9LwJiUNOnxyiB+PytOTG5P3QQ= -SHA256 (Pkgfile) = b4baa52bd34b243f6ff6250159eba4cdebd2a466472ddaf1fd2b617522832455 +RWSagIOpLGJF31uwOxx6VjIixhsybM+cX0cHI5oKu/doY1NEsc31lf4AQ2TOLY6lcwWMDLKaoOrI57cPiO6qdBJOabhrZm+omAw= +SHA256 (Pkgfile) = 4318241cd8ef687ded4cb6f053835bd236ef899025f5b7f573b88ad3a8449195 SHA256 (.footprint) = 46e38c743630719fc5db8383d793d119a83726afb7568114366b2b9c2d3ed80b -SHA256 (i3status-rust-0.13.1.tar.gz) = 28b9fce67d845f1dbf9c781a90e338f92d574ddb63e02528797959cc015c00f9 -SHA256 (561.patch) = 1772f757fcbe595ecbf0bc07908a142997ef36741f9debfb818eb7411b07fe17 +SHA256 (i3status-rust-0.14.0.tar.gz) = d850ecd82dc9b517923a518ba1ef7e1b51a94340aba17e5d6837a80e48035909 diff --git a/i3status-rust/561.patch b/i3status-rust/561.patch deleted file mode 100644 index 81bdbe514..000000000 --- a/i3status-rust/561.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c644cb4e61f5519bfb50e45efed4db9e765ed425 Mon Sep 17 00:00:00 2001 -From: Riey <creeper844@gmail.com> -Date: Mon, 10 Feb 2020 14:38:48 +0900 -Subject: [PATCH] Fix artist parsing from metadata - ---- - src/blocks/music.rs | 34 +++++++++++++++------------------- - 1 file changed, 15 insertions(+), 19 deletions(-) - -diff --git a/src/blocks/music.rs b/src/blocks/music.rs -index 1be56517..3c951d2b 100644 ---- a/src/blocks/music.rs -+++ b/src/blocks/music.rs -@@ -318,6 +318,20 @@ impl Block for Music { - } - } - -+fn extract_artist_from_value(value: &dyn arg::RefArg) -> Result<&str> { -+ if let Some(artist) = value.as_str() { -+ Ok(artist) -+ } else { -+ extract_artist_from_value( -+ value -+ .as_iter() -+ .block_error("music", "failed to extract artist")? -+ .next() -+ .block_error("music", "failed to extract artist")?, -+ ) -+ } -+} -+ - fn extract_from_metadata(metadata: &Box<dyn arg::RefArg>) -> Result<(String, String)> { - let mut title = String::new(); - let mut artist = String::new(); -@@ -334,25 +348,7 @@ fn extract_from_metadata(metadata: &Box<dyn arg::RefArg>) -> Result<(String, Str - .as_str() - .block_error("music", "failed to extract metadata")? - { -- "xesam:artist" => { -- artist = String::from( -- value -- .as_iter() -- .block_error("music", "failed to extract metadata")? -- .nth(0) -- .block_error("music", "failed to extract metadata")? -- .as_iter() -- .block_error("music", "failed to extract metadata")? -- .nth(0) -- .block_error("music", "failed to extract metadata")? -- .as_iter() -- .block_error("music", "failed to extract metadata")? -- .nth(0) -- .block_error("music", "failed to extract metadata")? -- .as_str() -- .block_error("music", "failed to extract metadata")?, -- ) -- } -+ "xesam:artist" => artist = String::from(extract_artist_from_value(value)?), - "xesam:title" => { - title = String::from( - value diff --git a/i3status-rust/Pkgfile b/i3status-rust/Pkgfile index 4fd54ff53..b4d1c7ad0 100644 --- a/i3status-rust/Pkgfile +++ b/i3status-rust/Pkgfile @@ -4,17 +4,15 @@ # Depends on: dbus pulseaudio rust name=i3status-rust -version=0.13.1 -release=2 -source=(https://github.com/greshake/i3status-rust/archive/v$version/$name-$version.t... - 561.patch) +version=0.14.0 +release=1 +source=(https://github.com/greshake/i3status-rust/archive/v$version/$name-$version.t...) build() { cd $name-$version prt-get isinst sccache && export RUSTC_WRAPPER=/usr/bin/sccache mkdir "$PKGMK_SOURCE_DIR/rust" || true export CARGO_HOME="$PKGMK_SOURCE_DIR/rust" - patch -Np1 -i $SRC/561.patch cargo fetch cargo build --release install -Dt $PKG/usr/bin target/release/i3status-rs