[PR PATCH] i3status-rust: update to 0.32.2.

[PR PATCH] i3status-rust: update to 0.32.2.

[pablomancera]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

There is a new pull request by pablomancera against master on the void-packages repository

https://github.com/pablomancera/void-packages i3status-rst
https://github.com/void-linux/void-packages/pull/46079

i3status-rust: update to 0.32.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64 (crossbuild)
  - armv6l (crossbuild)


A patch file from https://github.com/void-linux/void-packages/pull/46079.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i3status-rst-46079.patch --]
[-- Type: text/x-diff, Size: 2309 bytes --]

From 8b4de5c7c36c9046bc2c6a5205c5f9e7e501273f Mon Sep 17 00:00:00 2001
From: Pablo Alejandro Mancera <pablo.mancera@hotmail.com>
Date: Sat, 16 Sep 2023 00:23:27 -0500
Subject: [PATCH] i3status-rust: update to 0.32.2.

---
 srcpkgs/i3status-rust/template | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 07731701b738b..e043a14850636 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,23 +1,41 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.22.0
-revision=3
+version=0.32.2
+revision=1
 build_style=cargo
+configure_args="$(vopt_if notmuch '--features notmuch')"
 make_check_args="--bins"
-hostmakedepends="pkg-config"
-makedepends="dbus-devel pulseaudio-devel openssl-devel libsensors-devel"
+hostmakedepends="pkg-config $(vopt_if docs pandoc)"
+makedepends="pulseaudio-devel openssl-devel libsensors-devel
+	$(vopt_if notmuch libnotmuch-devel)"
 short_desc="Replacement for i3status, written in Rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/refs/tags/v${version}.tar.gz"
-checksum=cd28a90ccb2f9faaaef1e528619f1018981609d77f409abe4877350d810d3324
+checksum=8957424ecc0aad778784c3c1ac1051b8ceee22903ed1d292deed732a486130de
+
+build_options="notmuch docs"
+build_options_default="docs"
+desc_option_notmuch="Required for optional notmuch block"
+desc_option_docs="Generate manpage"
+
+if [ "$CROSS_BUILD" ] && [ "$build_option_docs" ]; then
+	hostmakedepends+=" pulseaudio-devel openssl-devel libsensors-devel"
+fi
+
+post_build() {
+	if [ "$build_option_docs" ]; then
+		env -i bash -c "source /etc/profile && cargo xtask generate-manpage"
+	fi
+}
 
 post_install() {
 	vmkdir usr/share/i3status-rust
-	vcopy ${wrksrc}/files/icons usr/share/i3status-rust/
-	vcopy ${wrksrc}/files/themes usr/share/i3status-rust/
+	vcopy ${wrksrc}/files/* usr/share/i3status-rust/
 
-	vman man/i3status-rs.1
+	if [ "$build_option_docs" ]; then
+		vman ${wrksrc}/man/i3status-rs.1
+	fi
 }

Re: i3status-rust: update to 0.32.2.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/46079#issuecomment-1732076533

Comment:
Why is generating man pages a build option?

Re: [PR REVIEW] i3status-rust: update to 0.32.2.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/46079#discussion_r1334846849

Comment:
wrksrc is the working directory, it doesn't need to be specified

Re: i3status-rust: update to 0.32.2.

[pablomancera]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

New comment by pablomancera on void-packages repository

https://github.com/void-linux/void-packages/pull/46079#issuecomment-1732106089

Comment:
> Why is generating man pages a build option?

Because it uses pandoc to generate them, so some architectures won't be able to build the package if they also have to generate the man pages.

Re: i3status-rust: update to 0.32.2.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/46079#issuecomment-1732111313

Comment:
But its enabled by default effectively removing the package for the architectures we cross compile pacakges for.
This should be set if cross compiling, but not sure if a build option is really required here, you could just add pandoc to hostmakedepends if not cross compiling.

Re: i3status-rust: update to 0.32.2.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/46079#issuecomment-1732111313

Comment:
But its enabled by default effectively removing the package for the architectures we cross compile pacakges for.
This should be set if cross compiling, but not sure if a build option is really required here, you could just add pandoc to hostmakedepends if not cross compiling.

Edit: I guess the only benefit of keeping it a build would be if someone natively builds pandoc and then cross compiles i3status-rust and wants to enable building the man pages.

Re: i3status-rust: update to 0.32.2.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 608 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/46079#issuecomment-1732111313

Comment:
But its enabled by default effectively removing the package for the architectures we cross compile pacakges for.
This should be set if cross compiling, but not sure if a build option is really required here, you could just add pandoc to hostmakedepends if not cross compiling.

Edit: I guess the only benefit of keeping it a build optiona would be if someone natively builds pandoc and then cross compiles i3status-rust and wants to enable building the man pages.

Re: i3status-rust: update to 0.32.2.

[pablomancera]

[-- Attachment #1: Type: text/plain, Size: 956 bytes --]

New comment by pablomancera on void-packages repository

https://github.com/void-linux/void-packages/pull/46079#issuecomment-1732124482

Comment:
The idea of the line

`env -i bash -c "source /etc/profile && cargo xtask generate-manpage"`

is that the void build servers (which I think are x86_64) generates the man page using the packages native to their architecture and bundle them in the package for every other architecture. It's the solution I came up with after the review I got at #44899 so every architecture can get the man pages. I'm not entirely sure it's the best though, but it worked in my tests (local building for x86_64 and cross building for aarch64). If there is a better way of doing this I would like to hear it.

On the other hand, if anyone wants to build the package on an architecture limited by the pandoc package, they can disable the docs build option and it'll be fine.

That's the reason I added a docs build option.

Re: [PR PATCH] [Updated] i3status-rust: update to 0.32.2.

[pablomancera]

[-- Attachment #1: Type: text/plain, Size: 672 bytes --]

There is an updated pull request by pablomancera against master on the void-packages repository

https://github.com/pablomancera/void-packages i3status-rst
https://github.com/void-linux/void-packages/pull/46079

i3status-rust: update to 0.32.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64 (crossbuild)
  - aarch64 (local)
  - armv6l (crossbuild)

Supersedes #44899

A patch file from https://github.com/void-linux/void-packages/pull/46079.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i3status-rst-46079.patch --]
[-- Type: text/x-diff, Size: 2289 bytes --]

From 5184372128ca6e9cea27fda36264a7ab42d09ed9 Mon Sep 17 00:00:00 2001
From: Pablo Alejandro Mancera <pablo.mancera@hotmail.com>
Date: Sat, 16 Sep 2023 00:23:27 -0500
Subject: [PATCH] i3status-rust: update to 0.32.2.

---
 srcpkgs/i3status-rust/template | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 07731701b738b..3b8955bfbdc14 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,23 +1,41 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.22.0
-revision=3
+version=0.32.2
+revision=1
 build_style=cargo
+configure_args="$(vopt_if notmuch '--features notmuch')"
 make_check_args="--bins"
-hostmakedepends="pkg-config"
-makedepends="dbus-devel pulseaudio-devel openssl-devel libsensors-devel"
+hostmakedepends="pkg-config $(vopt_if docs pandoc)"
+makedepends="pulseaudio-devel openssl-devel libsensors-devel
+	$(vopt_if notmuch libnotmuch-devel)"
 short_desc="Replacement for i3status, written in Rust"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/refs/tags/v${version}.tar.gz"
-checksum=cd28a90ccb2f9faaaef1e528619f1018981609d77f409abe4877350d810d3324
+checksum=8957424ecc0aad778784c3c1ac1051b8ceee22903ed1d292deed732a486130de
+
+build_options="notmuch docs"
+build_options_default="docs"
+desc_option_notmuch="Required for optional notmuch block"
+desc_option_docs="Generate manpage"
+
+if [ "$CROSS_BUILD" ] && [ "$build_option_docs" ]; then
+	hostmakedepends+=" pulseaudio-devel openssl-devel libsensors-devel"
+fi
+
+post_build() {
+	if [ "$build_option_docs" ]; then
+		env -i bash -c "source /etc/profile && cargo xtask generate-manpage"
+	fi
+}
 
 post_install() {
 	vmkdir usr/share/i3status-rust
-	vcopy ${wrksrc}/files/icons usr/share/i3status-rust/
-	vcopy ${wrksrc}/files/themes usr/share/i3status-rust/
+	vcopy files/* usr/share/i3status-rust/
 
-	vman man/i3status-rs.1
+	if [ "$build_option_docs" ]; then
+		vman man/i3status-rs.1
+	fi
 }

Re: [PR PATCH] [Closed]: i3status-rust: update to 0.32.2.

[pablomancera]

[-- Attachment #1: Type: text/plain, Size: 501 bytes --]

There's a closed pull request on the void-packages repository

i3status-rust: update to 0.32.2.
https://github.com/void-linux/void-packages/pull/46079

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64 (crossbuild)
  - aarch64 (local)
  - armv6l (crossbuild)

Supersedes #44899