[arch-commits] Commit in mailutils/trunk (PKGBUILD fix-build-mb-len-max.patch)

[Evangelos Foutras]

    Date: Thursday, June 28, 2018 @ 21:17:15
  Author: foutrelis
Revision: 347693

upgpkg: mailutils 3.4-3

gdbm 1.15 rebuild

Added:
  mailutils/trunk/fix-build-mb-len-max.patch
Modified:
  mailutils/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   15 ++++++++++++---
 fix-build-mb-len-max.patch |   14 ++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-28 21:13:56 UTC (rev 347692)
+++ PKGBUILD	2018-06-28 21:17:15 UTC (rev 347693)
@@ -4,7 +4,7 @@
 
 pkgname=mailutils
 pkgver=3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="MUA command line tool (mailx)"
 arch=(x86_64)
 url="http://www.gnu.org/software/mailutils/"
@@ -13,10 +13,19 @@
 makedepends=('emacs')
 options=(!emptydirs)
 validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732')
-source=(https://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2{,.sig})
+source=(https://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2{,.sig}
+        fix-build-mb-len-max.patch)
 sha512sums=('3c674f272bf7275bd781f7069d859dc133d3f103a433a407736df7aecf31a5b0912bd3ebfa4a41095449219f2fdcf6277b6722e9e45dd14f8e26cc7270f863d7'
-            'SKIP')
+            'SKIP'
+            '48248bfae1cc3b80c3decfcb99f803b65fd0d068f6c09625eb5e3763b3184090d7bd97fa3bc916b3e2e8c737b2bd501aa25482a96aceb555c08307b54c2a24a8')
 
+prepare() {
+  cd "$srcdir/mailutils-$pkgver"
+  # Include limits.h in frm/frm.h so it doesn't misdefine MB_LEN_MAX to 4
+  # (patch from github.com/NixOS/nixpkgs)
+  patch -Np1 -i ../fix-build-mb-len-max.patch
+}
+
 build() {
   cd "$srcdir/mailutils-$pkgver"
   ./configure \

Added: fix-build-mb-len-max.patch
===================================================================
--- fix-build-mb-len-max.patch	                        (rev 0)
+++ fix-build-mb-len-max.patch	2018-06-28 21:17:15 UTC (rev 347693)
@@ -0,0 +1,14 @@
+diff --git a/frm/frm.h b/frm/frm.h
+index 178b87d54..7931faada 100644
+--- a/frm/frm.h
++++ b/frm/frm.h
+@@ -34,6 +34,9 @@
+ #ifdef HAVE_ICONV_H
+ # include <iconv.h>
+ #endif
++#ifdef HAVE_LIMITS_H
++# include <limits.h>
++#endif
+ #ifndef MB_LEN_MAX
+ # define MB_LEN_MAX 4
+ #endif