summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin>2017-06-30 11:07:26 +0000
committerjperkin <jperkin>2017-06-30 11:07:26 +0000
commitb7533fc645fc7a9963bc05b0ec7ae26912e77900 (patch)
tree52eaade2a1d367fedba5b4892bd9ef3e29bbdbc3
parent5035ed2afd5ecc3b1fe8f2ab9dd71bae3e76cef3 (diff)
downloadpkgsrc-b7533fc645fc7a9963bc05b0ec7ae26912e77900.tar.gz
Add a couple more patches to work around upstream breakage after they
ran include-what-you-use. Package now builds on SunOS and with sasl.
-rw-r--r--mail/neomutt/distinfo4
-rw-r--r--mail/neomutt/patches/patch-mutt__sasl.h18
-rw-r--r--mail/neomutt/patches/patch-resize.c14
3 files changed, 35 insertions, 1 deletions
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index 07f1bdb957e..f1ef0a9a8be 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2017/06/30 10:58:18 wiz Exp $
+$NetBSD: distinfo,v 1.24 2017/06/30 11:07:26 jperkin Exp $
SHA1 (neomutt-20170609.tar.gz) = fd0e07e95c4a5dc6b21df02ea1c0355acf1fcc17
RMD160 (neomutt-20170609.tar.gz) = 3b2b696bd48e6a0b846c20b6621fe92dd996d6b3
@@ -6,3 +6,5 @@ SHA512 (neomutt-20170609.tar.gz) = e5ced8e2d5890e828a1603a0c1c8072bbb84499e87b45
Size (neomutt-20170609.tar.gz) = 2637349 bytes
SHA1 (patch-configure.ac) = e11fc46e1baad716022954e08556c213544201f5
SHA1 (patch-m4_gssapi.m4) = 9198e221e8dbed2633fcd45a53167cd19547ad65
+SHA1 (patch-mutt__sasl.h) = e41ebdd0e2f64811da61ef4530dd44d67bc836f2
+SHA1 (patch-resize.c) = d8cf215e23b20ba46361b1edd3fbcc316abb1516
diff --git a/mail/neomutt/patches/patch-mutt__sasl.h b/mail/neomutt/patches/patch-mutt__sasl.h
new file mode 100644
index 00000000000..adb9b2545e7
--- /dev/null
+++ b/mail/neomutt/patches/patch-mutt__sasl.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-mutt__sasl.h,v 1.1 2017/06/30 11:07:26 jperkin Exp $
+
+Handle include-what-you-use breakage.
+
+--- mutt_sasl.h.orig 2017-06-09 10:52:07.000000000 +0000
++++ mutt_sasl.h
+@@ -23,9 +23,11 @@
+ #include <stddef.h>
+ #include <sasl/sasl.h>
+
++#ifdef HOW_ON_EARTH_IS_THIS_SUPPOSED_TO_WORK_AT_ALL
+ typedef struct sasl_conn sasl_conn_t;
+ typedef struct sasl_interact sasl_interact_t;
+ typedef unsigned sasl_ssf_t;
++#endif
+ struct Connection;
+
+ int mutt_sasl_client_new(struct Connection *conn, sasl_conn_t **saslconn);
diff --git a/mail/neomutt/patches/patch-resize.c b/mail/neomutt/patches/patch-resize.c
new file mode 100644
index 00000000000..263c4aa3382
--- /dev/null
+++ b/mail/neomutt/patches/patch-resize.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-resize.c,v 1.1 2017/06/30 11:07:26 jperkin Exp $
+
+Handle include-what-you-use breakage.
+
+--- resize.c.orig 2017-06-09 10:52:07.000000000 +0000
++++ resize.c
+@@ -19,6 +19,7 @@
+ #include <fcntl.h>
+ #include <stdbool.h>
+ #include <stdlib.h>
++#include <termios.h>
+ #include <unistd.h>
+ #include "lib.h"
+ #include "mutt_curses.h"