pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/mail/neomutt
Module Name: pkgsrc
Committed By: wiz
Date: Thu Sep 8 21:56:49 UTC 2016
Modified Files:
pkgsrc/mail/neomutt: distinfo
Added Files:
pkgsrc/mail/neomutt/patches: patch-handler.c patch-pattern.c
Log Message:
Add two patches to fix build on NetBSD 7.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/neomutt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/neomutt/patches/patch-handler.c \
pkgsrc/mail/neomutt/patches/patch-pattern.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/mail/neomutt/distinfo
diff -u pkgsrc/mail/neomutt/distinfo:1.5 pkgsrc/mail/neomutt/distinfo:1.6
--- pkgsrc/mail/neomutt/distinfo:1.5 Sun Sep 4 20:53:05 2016
+++ pkgsrc/mail/neomutt/distinfo Thu Sep 8 21:56:49 2016
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2016/09/04 20:53:05 wiz Exp $
+$NetBSD: distinfo,v 1.6 2016/09/08 21:56:49 wiz Exp $
SHA1 (neomutt-20160827.tar.gz) = 12964dc21b55ff84c0e4987a15d86c2f2c4c5b4a
RMD160 (neomutt-20160827.tar.gz) = 62268ba46965a9684820d407d4ba15e76fbc31ca
SHA512 (neomutt-20160827.tar.gz) = e7c654febe48c31441280ce28b121a9363869dd3dce966f47f1d9faa4557c86cfb350fa48d71b1a00eeab19d4c0f72d43e32b3008e25f863c9c1d795d8f7ec94
Size (neomutt-20160827.tar.gz) = 2629013 bytes
+SHA1 (patch-handler.c) = 79ccd9cb11fa78a22091ca67d7e77e00f87730a1
+SHA1 (patch-pattern.c) = f3dd6591d24a5b7bc89aa9c045552d44013e0921
Added files:
Index: pkgsrc/mail/neomutt/patches/patch-handler.c
diff -u /dev/null pkgsrc/mail/neomutt/patches/patch-handler.c:1.1
--- /dev/null Thu Sep 8 21:56:49 2016
+++ pkgsrc/mail/neomutt/patches/patch-handler.c Thu Sep 8 21:56:49 2016
@@ -0,0 +1,49 @@
+$NetBSD: patch-handler.c,v 1.1 2016/09/08 21:56:49 wiz Exp $
+
+--- handler.c.orig 2016-08-27 00:03:28.000000000 +0000
++++ handler.c
+@@ -1596,7 +1596,7 @@ static int run_decode_and_handler (BODY
+ int origType;
+ char *savePrefix = NULL;
+ FILE *fp = NULL;
+-#ifndef USE_FMEMOPEN
++#ifndef HAVE_OPEN_MEMSTREAM
+ char tempfile[_POSIX_PATH_MAX];
+ #endif
+ size_t tmplength = 0;
+@@ -1606,7 +1606,7 @@ static int run_decode_and_handler (BODY
+
+ fseeko (s->fpin, b->offset, 0);
+
+-#ifdef USE_FMEMOPEN
++#ifdef HAVE_OPEN_MEMSTREAM
+ char *temp;
+ size_t tempsize;
+ #endif
+@@ -1626,7 +1626,7 @@ static int run_decode_and_handler (BODY
+ {
+ /* decode to a tempfile, saving the original destination */
+ fp = s->fpout;
+-#ifdef USE_FMEMOPEN
++#ifdef HAVE_OPEN_MEMSTREAM
+ s->fpout = open_memstream (&temp, &tempsize);
+ if (!s->fpout) {
+ mutt_error _("Unable to open memory stream!");
+@@ -1670,7 +1670,7 @@ static int run_decode_and_handler (BODY
+ /* restore final destination and substitute the tempfile for input */
+ s->fpout = fp;
+ fp = s->fpin;
+-#ifdef USE_FMEMOPEN
++#ifdef HAVE_OPEN_MEMSTREAM
+ if (tempsize) {
+ s->fpin = fmemopen (temp, tempsize, "r");
+ } else { /* fmemopen cannot handle zero-length buffers */
+@@ -1708,7 +1708,7 @@ static int run_decode_and_handler (BODY
+
+ /* restore the original source stream */
+ safe_fclose (&s->fpin);
+-#ifdef USE_FMEMOPEN
++#ifdef HAVE_OPEN_MEMSTREAM
+ if (tempsize)
+ FREE(&temp);
+ #endif
Index: pkgsrc/mail/neomutt/patches/patch-pattern.c
diff -u /dev/null pkgsrc/mail/neomutt/patches/patch-pattern.c:1.1
--- /dev/null Thu Sep 8 21:56:49 2016
+++ pkgsrc/mail/neomutt/patches/patch-pattern.c Thu Sep 8 21:56:49 2016
@@ -0,0 +1,49 @@
+$NetBSD: patch-pattern.c,v 1.1 2016/09/08 21:56:49 wiz Exp $
+
+--- pattern.c.orig 2016-08-27 00:03:28.000000000 +0000
++++ pattern.c
+@@ -162,7 +162,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
+ HEADER *h = ctx->hdrs[msgno];
+ char *buf;
+ size_t blen;
+-#ifdef USE_FMEMOPEN
++#ifdef HAVE_OPEN_MEMSTREAM
+ char *temp;
+ size_t tempsize;
+ #else
+@@ -178,7 +178,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
+ memset (&s, 0, sizeof (s));
+ s.fpin = msg->fp;
+ s.flags = MUTT_CHARCONV;
+-#ifdef USE_FMEMOPEN
++#ifdef HAVE_OPEN_MEMSTREAM
+ s.fpout = open_memstream (&temp, &tempsize);
+ if (!s.fpout) {
+ mutt_perror ("Error opening memstream");
+@@ -207,7 +207,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
+ if (s.fpout)
+ {
+ safe_fclose (&s.fpout);
+-#ifdef USE_FMEMOPEN
++#ifdef HAVE_OPEN_MEMSTREAM
+ FREE(&temp);
+ #else
+ unlink (tempfile);
+@@ -220,7 +220,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
+ mutt_body_handler (h->content, &s);
+ }
+
+-#ifdef USE_FMEMOPEN
++#ifdef HAVE_OPEN_MEMSTREAM
+ fclose (s.fpout);
+ lng = tempsize;
+
+@@ -290,7 +290,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
+ if (option (OPTTHOROUGHSRC))
+ {
+ safe_fclose (&fp);
+-#ifdef USE_FMEMOPEN
++#ifdef HAVE_OPEN_MEMSTREAM
+ if (tempsize)
+ FREE(&temp);
+ #else
Home |
Main Index |
Thread Index |
Old Index