Github messages for voidlinux
 help / color / mirror / Atom feed
From: dataCobra <dataCobra@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] neomutt: update to 20241002.
Date: Fri, 25 Oct 2024 11:51:16 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-52774@inbox.vuxu.org> (raw)

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

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

https://github.com/dataCobra/void-packages neomutt
https://github.com/void-linux/void-packages/pull/52774

neomutt: update to 20241002.
#### 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-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross)
  - aarch64-musl (cross)
  - armv7l (cross)

Patch copied from alpine package.

@Vaelatern please take a look. I've also added pcre2 and zstd features to the update.


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

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

From 65d32315e54a0b318daae8c48511856df1e2902b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 25 Oct 2024 11:44:53 +0200
Subject: [PATCH] neomutt: update to 20241002.

---
 .../patches/disable-failing-test.patch        | 40 +++++++++++++++++++
 srcpkgs/neomutt/template                      | 11 ++---
 2 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/neomutt/patches/disable-failing-test.patch

diff --git a/srcpkgs/neomutt/patches/disable-failing-test.patch b/srcpkgs/neomutt/patches/disable-failing-test.patch
new file mode 100644
index 00000000000000..6d5fe81de6e00c
--- /dev/null
+++ b/srcpkgs/neomutt/patches/disable-failing-test.patch
@@ -0,0 +1,40 @@
+mutt_path_to_absolute.c:102: Check test_check_str_eq... failed
+
+--- a/test/Makefile.autosetup
++++ b/test/Makefile.autosetup
+@@ -88,7 +88,6 @@
+ 		  test/buffer/buf_new.o \
+ 		  test/buffer/buf_printf.o \
+ 		  test/buffer/buf_reset.o \
+-		  test/buffer/buf_rfind.o \
+ 		  test/buffer/buf_seek.o \
+ 		  test/buffer/buf_startswith.o \
+ 		  test/buffer/buf_strcpy.o \
+@@ -507,8 +506,7 @@
+ 		  test/path/mutt_path_tidy.o \
+ 		  test/path/mutt_path_tidy_dotdot.o \
+ 		  test/path/mutt_path_tidy_slash.o \
+-		  test/path/mutt_path_tilde.o \
+-		  test/path/mutt_path_to_absolute.o
++		  test/path/mutt_path_tilde.o
+ 
+ PATTERN_OBJS	= pattern/pattern.o \
+ 		  test/pattern/comp.o \
+--- a/test/main.c
++++ b/test/main.c
+@@ -131,7 +131,6 @@
+   NEOMUTT_TEST_ITEM(test_buf_pool_release)                                     \
+   NEOMUTT_TEST_ITEM(test_buf_printf)                                           \
+   NEOMUTT_TEST_ITEM(test_buf_reset)                                            \
+-  NEOMUTT_TEST_ITEM(test_buf_rfind)                                            \
+   NEOMUTT_TEST_ITEM(test_buf_seek)                                             \
+   NEOMUTT_TEST_ITEM(test_buf_startswith)                                       \
+   NEOMUTT_TEST_ITEM(test_buf_strcpy)                                           \
+@@ -555,7 +554,6 @@
+   NEOMUTT_TEST_ITEM(test_mutt_path_tidy_dotdot)                                \
+   NEOMUTT_TEST_ITEM(test_mutt_path_tidy_slash)                                 \
+   NEOMUTT_TEST_ITEM(test_mutt_path_tilde)                                      \
+-  NEOMUTT_TEST_ITEM(test_mutt_path_to_absolute)                                \
+                                                                                \
+   /* pattern */                                                                \
+   NEOMUTT_TEST_ITEM(test_mutt_pattern_comp)                                    \
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 4139264ca5a789..0e70aa33ebb37a 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,19 +1,20 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20240425
+version=20241002
 revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
 build_style=configure
 configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl --zlib --tdb
- --rocksdb --autocrypt --sqlite"
+ --rocksdb --autocrypt --sqlite --pcre2 --zstd"
 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
  rocksdb-devel tdb-devel ncurses-devel libidn2-devel libnotmuch-devel
- openssl-devel libsasl-devel lua54-devel zlib-devel sqlite-devel"
+ openssl-devel libsasl-devel lua54-devel zlib-devel sqlite-devel libzstd-devel
+ pcre2-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -22,9 +23,9 @@ homepage="https://neomutt.org/"
 _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="a5aed0a0f506260997821c23cb148bc5ca4938fd613e0e8b89556f397ffc17f7
+checksum="8d5673d9cc4b239adcf4bc718d372c8c85d0b53248ecd628358625c877a53064
  2865e258034a72e498fdd1810071d9ab7559297a5f67203ea163cfdc4192dea4"
-python_version=3
+patch_args="-Np1 -d ${build_wrksrc}"
 
 # fix:
 if [ "${XBPS_CROSS_BASE}" ]; then

             reply	other threads:[~2024-10-25  9:51 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-25  9:51 dataCobra [this message]
2024-10-25 21:13 ` AnInternetTroll
2024-10-27 19:47 ` Vaelatern
2024-10-27 19:47 ` [PR PATCH] [Merged]: " Vaelatern

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-52774@inbox.vuxu.org \
    --to=datacobra@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).