Re: [PR PATCH] [Updated] neomutt: update to 202310065

[AnInternetTroll <AnInternetTroll@users.noreply.github.com>]

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

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

https://github.com/AnInternetTroll/void-packages user/luca/neomutt-20231006
https://github.com/void-linux/void-packages/pull/46668

neomutt: update to 202310065
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, (x86-glibc)


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-user/luca/neomutt-20231006-46668.patch --]
[-- Type: text/x-diff, Size: 3050 bytes --]

From edea5fef4c6cbdbbffe4ce35856cc017aad72fcb Mon Sep 17 00:00:00 2001
From: Luca Matei Pintilie <luca@lucamatei.com>
Date: Fri, 13 Oct 2023 23:31:03 +0200
Subject: [PATCH] neomutt: update to 20231103

---
 .../patches/fix-test_attr_colors.patch        | 25 +++++++++++++++++++
 srcpkgs/neomutt/template                      | 19 +++++++-------
 2 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/neomutt/patches/fix-test_attr_colors.patch

diff --git a/srcpkgs/neomutt/patches/fix-test_attr_colors.patch b/srcpkgs/neomutt/patches/fix-test_attr_colors.patch
new file mode 100644
index 0000000000000..bcf876f1c5a0e
--- /dev/null
+++ b/srcpkgs/neomutt/patches/fix-test_attr_colors.patch
@@ -0,0 +1,25 @@
+commit 24f8644c28e602206a63fae53c4eb3d32426ce0c
+Author: наб (@nabijaczleweli) <nabijaczleweli@nabijaczleweli.xyz>
+Date:   Fri Nov 3 19:37:44 2023 +0000
+
+    color: fix attr_color_copy()
+
+diff --git a/color/attr.c b/color/attr.c
+index 7846209..c389c37 100644
+--- a/color/attr.c
++++ b/color/attr.c
+@@ -166,11 +166,10 @@ struct AttrColor *attr_color_list_find(struct AttrColorList *acl, color_t fg,
+  */
+ struct AttrColor attr_color_copy(const struct AttrColor *ac)
+ {
+-  struct AttrColor copy = { 0 };
+   if (ac)
+-    copy = *ac;
+-
+-  return copy;
++    return *ac;
++  else
++    return (struct AttrColor){ 0 };
+ }
+ 
+ /**
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index fdded9095d74d..4182b5bc63681 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20230517
-revision=2
+version=20231103
+revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
 build_style=configure
@@ -19,11 +19,12 @@ short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://neomutt.org/"
-_test_files_hash=34f79ee9d91863a97f6e18700aea51157b8610cf
+_test_files_hash=00efc8388110208e77e6ed9d8294dfc333753d54
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="4ac277b40e7ed5d67ba516338e2b26cc6810aa37564f6e9a2d45eb15b3a9213e
- 4507e70e7c8512c993d9188cf320aea601580345ae9fb0c399ed1402d4e39b1f"
+checksum="d8712c8f852f1cae4d5f53d8f7db3d2cc7ce7a11f54df3fc6e5417995d02bae8
+ 2865e258034a72e498fdd1810071d9ab7559297a5f67203ea163cfdc4192dea4"
+patch_args="-Np1 -d ${build_wrksrc}"
 python_version=3
 
 # fix:
@@ -35,13 +36,11 @@ fi
 
 case "${XBPS_TARGET_MACHINE}" in
 	x86_64-musl)
-		# FIXME: error: variable 'fp' has initializer but incomplete type
-		make_check=no # https://github.com/neomutt/neomutt/issues/3865
 		CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
 		;;
-	*-musl)
-		make_check=no # Same as in the x86_64-musl condition
-		;;
+	# *-musl)
+	# 	make_check=no # Same as in the x86_64-musl condition
+	# 	;;
 	# Inquiry: Do we have largefile support on everywhere?
 esac