From 223f4586ae8e81d710157f087beababceb900d84 Mon Sep 17 00:00:00 2001
From: LucasTavaresA <tavares.lassuncao@gmail.com>
Date: Sun, 9 Apr 2023 17:10:03 -0300
Subject: [PATCH] tofi: update to 0.9.1

---
 srcpkgs/tofi/patches/fix-32bit-tests.patch | 84 ++++++++++++++++++++++
 srcpkgs/tofi/template                      |  4 +-
 2 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/tofi/patches/fix-32bit-tests.patch

diff --git a/srcpkgs/tofi/patches/fix-32bit-tests.patch b/srcpkgs/tofi/patches/fix-32bit-tests.patch
new file mode 100644
index 0000000000000..3a853408335bf
--- /dev/null
+++ b/srcpkgs/tofi/patches/fix-32bit-tests.patch
@@ -0,0 +1,84 @@
+From 667075f0920da3c2b353fbce54b6430c195ef031 Mon Sep 17 00:00:00 2001
+From: Phil Jones <philj56@gmail.com>
+Date: Sun, 30 Apr 2023 20:08:57 +0100
+Subject: [PATCH] Replace `strto[u]l` with `strto[u]ll`.
+
+On 32-bit systems, using `strtoul` was causing negative values for
+unsigned options to be treated as valid, as the value was being parsed
+as a 32-bit unsigned int, then cast to a 64-bit signed int, which
+remained positive.
+---
+ src/color.c  | 8 ++++----
+ src/config.c | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/color.c b/src/color.c
+index 4b6b356..b1d5e90 100644
+--- a/src/color.c
++++ b/src/color.c
+@@ -22,7 +22,7 @@ struct color hex_to_color(const char *hex)
+ 			hex[2], hex[2],
+ 			'\0'};
+ 		char *endptr;
+-		tmp = strtol(str, &endptr, 16);
++		tmp = strtoll(str, &endptr, 16);
+ 		if (errno || *endptr != '\0' || tmp < 0) {
+ 			return (struct color) { -1, -1, -1, -1 };
+ 		}
+@@ -37,14 +37,14 @@ struct color hex_to_color(const char *hex)
+ 			hex[3], hex[3],
+ 			'\0'};
+ 		char *endptr;
+-		tmp = strtol(str, &endptr, 16);
++		tmp = strtoll(str, &endptr, 16);
+ 		if (errno || *endptr != '\0' || tmp < 0) {
+ 			return (struct color) { -1, -1, -1, -1 };
+ 		}
+ 		val = tmp;
+ 	} else if (len == 6) {
+ 		char *endptr;
+-		tmp = strtol(hex, &endptr, 16);
++		tmp = strtoll(hex, &endptr, 16);
+ 		if (errno || *endptr != '\0' || tmp < 0) {
+ 			return (struct color) { -1, -1, -1, -1 };
+ 		}
+@@ -53,7 +53,7 @@ struct color hex_to_color(const char *hex)
+ 		val |= 0xFFu;
+ 	} else if (len == 8) {
+ 		char *endptr;
+-		tmp = strtol(hex, &endptr, 16);
++		tmp = strtoll(hex, &endptr, 16);
+ 		if (errno || *endptr != '\0' || tmp < 0) {
+ 			return (struct color) { -1, -1, -1, -1 };
+ 		}
+diff --git a/src/config.c b/src/config.c
+index 2b85028..556199d 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -1027,7 +1027,7 @@ uint32_t parse_uint32(const char *filename, size_t lineno, const char *str, bool
+ {
+ 	errno = 0;
+ 	char *endptr;
+-	int64_t ret = strtoul(str, &endptr, 0);
++	int64_t ret = strtoull(str, &endptr, 0);
+ 	if (endptr == str || *endptr != '\0') {
+ 		PARSE_ERROR(filename, lineno, "Failed to parse \"%s\" as unsigned int.\n", str);
+ 		if (err) {
+@@ -1046,7 +1046,7 @@ int32_t parse_int32(const char *filename, size_t lineno, const char *str, bool *
+ {
+ 	errno = 0;
+ 	char *endptr;
+-	int64_t ret = strtol(str, &endptr, 0);
++	int64_t ret = strtoll(str, &endptr, 0);
+ 	if (endptr == str || *endptr != '\0') {
+ 		PARSE_ERROR(filename, lineno, "Failed to parse \"%s\" as int.\n", str);
+ 		if (err) {
+@@ -1065,7 +1065,7 @@ struct uint32_percent parse_uint32_percent(const char *filename, size_t lineno,
+ {
+ 	errno = 0;
+ 	char *endptr;
+-	int64_t val = strtoul(str, &endptr, 0);
++	int64_t val = strtoull(str, &endptr, 0);
+ 	bool percent = false;
+ 	if (endptr == str || (*endptr != '\0' && *endptr != '%')) {
+ 		PARSE_ERROR(filename, lineno, "Failed to parse \"%s\" as unsigned int.\n", str);
diff --git a/srcpkgs/tofi/template b/srcpkgs/tofi/template
index 813356a0b1db7..1704b4db3822b 100644
--- a/srcpkgs/tofi/template
+++ b/srcpkgs/tofi/template
@@ -1,6 +1,6 @@
 # Template file for 'tofi'
 pkgname=tofi
-version=0.8.1
+version=0.9.1
 revision=1
 build_style=meson
 hostmakedepends="scdoc pkg-config wayland-devel wayland-protocols"
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/philj56/tofi"
 changelog="https://raw.githubusercontent.com/philj56/tofi/master/CHANGELOG.md"
 distfiles="https://github.com/philj56/tofi/archive/refs/tags/v${version}.tar.gz"
-checksum=0a700f8b0291ef08b3544cd589157393101d52bbd1e7e6aeee8484f9d520a338
+checksum=dd55347b509af786f133def64f3a86f1db258b5e196de80e53d62827bdcc37bc
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-fts-devel"