From 85137ba379e4922682ddab2513b8e5b35a64a1db Mon Sep 17 00:00:00 2001 From: Luca Matei Pintilie Date: Fri, 13 Oct 2023 23:31:03 +0200 Subject: [PATCH] neomutt: update to 20231006 --- srcpkgs/neomutt/patches/fix-32bit-overflow.patch | 13 +++++++++++++ srcpkgs/neomutt/template | 12 +++++------- 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/neomutt/patches/fix-32bit-overflow.patch diff --git a/srcpkgs/neomutt/patches/fix-32bit-overflow.patch b/srcpkgs/neomutt/patches/fix-32bit-overflow.patch new file mode 100644 index 0000000000000..ead7883d27177 --- /dev/null +++ b/srcpkgs/neomutt/patches/fix-32bit-overflow.patch @@ -0,0 +1,13 @@ +diff --git a/mutt/date.c b/mutt/date.c +index f6af7de325..f1691a7a4b 100644 +--- a/mutt/date.c ++++ b/mutt/date.c +@@ -458,7 +458,7 @@ uint64_t mutt_date_now_ms(void) + gettimeofday(&tv, NULL); + /* We assume that gettimeofday doesn't modify its first argument on failure. + * We also kind of assume that gettimeofday does not fail. */ +- return (uint64_t) (tv.tv_sec * 1000) + (tv.tv_usec / 1000); ++ return ((uint64_t) tv.tv_sec * 1000) + (tv.tv_usec / 1000); + } + + /** diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index fdded9095d74d..95d98b38526e8 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,7 +1,7 @@ # Template file for 'neomutt' pkgname=neomutt -version=20230517 -revision=2 +version=20231006 +revision=1 create_wrksrc=true build_wrksrc="${pkgname}-${version}" build_style=configure @@ -19,11 +19,11 @@ short_desc="Mutt with misc fixes and feature patches" maintainer="Toyam Cox " 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="94b9d5d8f927f8ceb4661549f5a490dc057af2e7f11de41e68dbc227dbf8a015 + 2865e258034a72e498fdd1810071d9ab7559297a5f67203ea163cfdc4192dea4" python_version=3 # fix: @@ -35,8 +35,6 @@ 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)