From 44aa6b779539e7de5b4fff4304bbc0d4a9245f67 Mon Sep 17 00:00:00 2001 From: Luca Matei Pintilie Date: Wed, 17 May 2023 23:10:27 +0000 Subject: [PATCH 1/2] neomutt: update to 20230517 --- srcpkgs/neomutt/template | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 39927bb48fbb..f9951f434d77 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,7 +1,7 @@ # Template file for 'neomutt' pkgname=neomutt -version=20220429 -revision=3 +version=20230517 +revision=1 create_wrksrc=true build_wrksrc="${pkgname}-${version}" build_style=configure @@ -10,20 +10,20 @@ configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl --zlib --tdb make_check_target=test conf_files="/etc/neomuttrc" # neomutt needs either w3m/lynx/elinks to build manual.html -hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m" +hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m pkg-config" makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel rocksdb-devel tdb-devel ncurses-devel - libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel" + libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel libidn2-devel" depends="mime-types" 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=dc9fb32a701eb9dce4fda93c27da1d9b5be23231 +_test_files_hash=34f79ee9d91863a97f6e18700aea51157b8610cf distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz" -checksum="45496542897ba8de6bc7cce3f5951d9033ed1c49e5d6f1353adaeefe795d9043 - bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947" +checksum="4ac277b40e7ed5d67ba516338e2b26cc6810aa37564f6e9a2d45eb15b3a9213e + 4507e70e7c8512c993d9188cf320aea601580345ae9fb0c399ed1402d4e39b1f" python_version=3 # fix: @@ -34,15 +34,15 @@ if [ "${XBPS_CROSS_BASE}" ]; then fi case "${XBPS_TARGET_MACHINE}" in - x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";; + # FIXME: error: variable 'fp' has initializer but incomplete type + # https://github.com/neomutt/neomutt/issues/3865 + x86_64-musl) + make_check=no + CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1" + ;; # Inquiry: Do we have largefile support on everywhere? esac -post_install() { - # move dist to examples dir - vsconf contrib/samples/gpg.rc Muttrc.gpg.dist -} - pre_check() { ( cd ${wrksrc}/neomutt-test-files-${_test_files_hash}/ From f9fe97893221b0c344ecc3dc89d6b765c8245e27 Mon Sep 17 00:00:00 2001 From: Luca Matei Pintilie Date: Tue, 23 May 2023 18:56:21 +0200 Subject: [PATCH 2/2] Remove libidn-devel dependency and vsconf contrib/ files --- srcpkgs/neomutt/template | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index f9951f434d77..22467d023a5c 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -11,7 +11,7 @@ make_check_target=test conf_files="/etc/neomuttrc" # neomutt needs either w3m/lynx/elinks to build manual.html hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m pkg-config" -makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel +makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel rocksdb-devel tdb-devel ncurses-devel libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel libidn2-devel" depends="mime-types" @@ -43,6 +43,13 @@ case "${XBPS_TARGET_MACHINE}" in # Inquiry: Do we have largefile support on everywhere? esac +post_install() { + # move dist to examples dir + vsconf contrib/oauth2/mutt_oauth2.py Muttrc.mutt_oauth2.dist + vsconf contrib/vim-keys/vim-keys.rc Muttrc.vim-keys.dist + vsconf contrib/smime_keys Muttrc.smime_keys.dist +} + pre_check() { ( cd ${wrksrc}/neomutt-test-files-${_test_files_hash}/