notmuch: update to 0.32

This commit is contained in:
Leonid Pliushch 2021-05-05 13:53:28 +00:00
parent db3ef3db7a
commit cb647b6ca1
No known key found for this signature in database
GPG Key ID: 45F2964132545795
3 changed files with 23 additions and 24 deletions

View File

@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://notmuchmail.org
TERMUX_PKG_DESCRIPTION="Thread-based email index, search and tagging system" TERMUX_PKG_DESCRIPTION="Thread-based email index, search and tagging system"
TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.31.3 TERMUX_PKG_VERSION=0.32
TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=https://notmuchmail.org/releases/notmuch-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=484041aed08f88f3a528a5b82489b6cda4090764228813bca73678da3a753aca TERMUX_PKG_SHA256=e91e5706ffb615d5ebc5a47ce197d4ec2efca06eea77a0ddcb7af2e4c2543646
TERMUX_PKG_DEPENDS="glib, libc++, libgmime, libtalloc, libxapian, zlib" TERMUX_PKG_DEPENDS="glib, libc++, libgmime, libtalloc, libxapian, zlib"
TERMUX_PKG_BREAKS="notmuch-dev" TERMUX_PKG_BREAKS="notmuch-dev"
TERMUX_PKG_REPLACES="notmuch-dev" TERMUX_PKG_REPLACES="notmuch-dev"

View File

@ -0,0 +1,21 @@
diff -uNr notmuch-0.32/lib/config.cc notmuch-0.32.mod/lib/config.cc
--- notmuch-0.32/lib/config.cc 2021-05-02 10:05:44.000000000 +0000
+++ notmuch-0.32.mod/lib/config.cc 2021-05-05 14:32:33.893497609 +0000
@@ -473,6 +473,7 @@
pw_buf = (char *) talloc_zero_size (ctx, pw_buf_size);
}
+#if !defined(__ANDROID__) || defined(__LP64__)
if (e == 0) {
char *comma = strchr (passwd.pw_gecos, ',');
if (comma)
@@ -483,6 +484,9 @@
} else {
name = talloc_strdup (ctx, "");
}
+#else
+ name = talloc_strdup (ctx, "");
+#endif
talloc_free (pw_buf);

View File

@ -1,22 +0,0 @@
diff -u -r ../notmuch-0.24.1/notmuch-config.c ./notmuch-config.c
--- ../notmuch-0.24.1/notmuch-config.c 2017-04-01 14:29:38.000000000 +0200
+++ ./notmuch-config.c 2017-04-07 01:01:21.205661688 +0200
@@ -157,6 +157,8 @@
pw_buf = talloc_zero_size(ctx, pw_buf_size);
}
+#if !defined(__ANDROID__) || defined(__LP64__)
+ /* Only 64-bit Android has the pw_gecos field. */
if (e == 0) {
char *comma = strchr (passwd.pw_gecos, ',');
if (comma)
@@ -167,6 +169,9 @@
} else {
name = talloc_strdup (ctx, "");
}
+#else
+ name = talloc_strdup (ctx, "");
+#endif
talloc_free (pw_buf);