Re: 1.3.28: still not possible to compile without iconv

2002-03-18 Thread David T-G

Shawn --

...and then Shawn McMahon said...
% 
% begin  quoting what Claus Assmann said on Sun, Mar 17, 2002 at 04:02:53PM -0800:
% > I asked about this when 1.3.25 came out and got the answer that
% > "this should be fixed" / "will be looking into it".  However, 1.3.28
% > still can't be configured without iconv.  Any chance for a change?
% 
% Pardon my ignorance, but why would you want to?

It's not that he wants to; it's that it has the problem.  He does not
have iconv and thus can't get his mutt to play.


:-D
-- 
David T-G  * It's easier to fight for one's principles
(play) [EMAIL PROTECTED] * than to live up to them. -- fortune cookie
(work) [EMAIL PROTECTED]
http://www.justpickone.org/davidtg/Shpx gur Pbzzhavpngvbaf Qrprapl Npg!




msg25675/pgp0.pgp
Description: PGP signature


Re: 1.3.28: still not possible to compile without iconv

2002-03-18 Thread Shawn McMahon

begin  quoting what Claus Assmann said on Sun, Mar 17, 2002 at 04:02:53PM -0800:
> I asked about this when 1.3.25 came out and got the answer that
> "this should be fixed" / "will be looking into it".  However, 1.3.28
> still can't be configured without iconv.  Any chance for a change?

Pardon my ignorance, but why would you want to?




msg25672/pgp0.pgp
Description: PGP signature


Re: 1.3.28: still not possible to compile without iconv

2002-03-17 Thread David Champion

* On 2002.03.17, in <[EMAIL PROTECTED]>,
*   "Claus Assmann" <[EMAIL PROTECTED]> wrote:
> 
> (sorry, I don't read mutt-dev anymore, I'm getting more than 500
> mails a day (obviously I can only skim through the subjects and
> read only a subset...))

Lars doesn't read mutt-users anymore for the same kind of reason, so
that makes a problem. :)

-- 
 -D.[EMAIL PROTECTED]NSITUniversity of Chicago



Re: 1.3.28: still not possible to compile without iconv

2002-03-17 Thread Claus Assmann

On Sun, Mar 17, 2002, David Champion wrote:
> * On 2002.03.17, in <[EMAIL PROTECTED]>,
> * "Claus Assmann"  wrote:
> > I asked about this when 1.3.25 came out and got the answer that
> > "this should be fixed" / "will be looking into it".  However, 1.3.28
> > still can't be configured without iconv.  Any chance for a change?
> 
> Lars Hecking posted a patch to mutt-dev over a month ago. It's still
> awaiting testers before it can be merged into the tree for 1.4. It seems
> to work for him, but very few truly iconv-less people have tried it and
> reported back.
> 
> See
>   http://groups.yahoo.com/group/mutt-dev/message/13851

Thanks, I found the message in a different archive
(groups.yahoo.com wants cookies...)

Feedback: it compiles fine on my machine (OpenBSD 2.8)
and it seems to work (only basic testing).

So please merge it before 1.4. Thanks!

(sorry, I don't read mutt-dev anymore, I'm getting more than 500
mails a day (obviously I can only skim through the subjects and
read only a subset...))



Re: 1.3.28: still not possible to compile without iconv

2002-03-17 Thread David Champion

* On 2002.03.17, in <[EMAIL PROTECTED]>,
*   "Claus Assmann" <[EMAIL PROTECTED]> wrote:
> I asked about this when 1.3.25 came out and got the answer that
> "this should be fixed" / "will be looking into it".  However, 1.3.28
> still can't be configured without iconv.  Any chance for a change?

Lars Hecking posted a patch to mutt-dev over a month ago. It's still
awaiting testers before it can be merged into the tree for 1.4. It seems
to work for him, but very few truly iconv-less people have tried it and
reported back.

See
http://groups.yahoo.com/group/mutt-dev/message/13851

-- 
 -D.[EMAIL PROTECTED]NSITUniversity of Chicago



1.3.28: still not possible to compile without iconv

2002-03-17 Thread Claus Assmann

I asked about this when 1.3.25 came out and got the answer that
"this should be fixed" / "will be looking into it".  However, 1.3.28
still can't be configured without iconv.  Any chance for a change?

I've attached a patch that seems to work. It's a bit of hack, a
clean solution would be to have an iconv.h substitute that defines
the prototypes of the replacement functions which are in charset.c
and also defines iconv_t and EILSEQ. This would "localize" the
changes instead of spreading them out over many files.



diff -c -r mutt-1.3.28/charset.c mutt-1.3.28-/charset.c
*** mutt-1.3.28/charset.c   Tue Jan 22 17:02:39 2002
--- mutt-1.3.28-/charset.c  Sun Mar 17 15:53:57 2002
***
*** 31,37 
--- 31,39 
  #include 
  #include 
  
+ #ifdef HAVE_ICONV
  #include 
+ #endif
  
  #include "mutt.h"
  #include "charset.h"
diff -c -r mutt-1.3.28/charset.h mutt-1.3.28-/charset.h
*** mutt-1.3.28/charset.h   Tue Feb 13 14:06:14 2001
--- mutt-1.3.28-/charset.h  Sun Mar 17 15:46:58 2002
***
*** 19,25 
--- 19,29 
  #ifndef _CHARSET_H
  #define _CHARSET_H
  
+ #if HAVE_ICONV
  #include 
+ #else
+ #define iconv_t int
+ #endif
  
  int mutt_convert_string (char **, const char *, const char *, int);
  
diff -c -r mutt-1.3.28/gnupgparse.c mutt-1.3.28-/gnupgparse.c
*** mutt-1.3.28/gnupgparse.cWed Aug  1 07:06:58 2001
--- mutt-1.3.28-/gnupgparse.c   Sun Mar 17 15:54:48 2002
***
*** 44,50 
--- 44,52 
  #include "mutt.h"
  #include "pgp.h"
  #include "charset.h"
+ #ifdef HAVE_ICONV
  #include "iconv.h"
+ #endif
  
  /* for hexval */
  #include "mime.h"
diff -c -r mutt-1.3.28/rfc2047.c mutt-1.3.28-/rfc2047.c
*** mutt-1.3.28/rfc2047.c   Mon Oct 15 13:18:32 2001
--- mutt-1.3.28-/rfc2047.c  Sun Mar 17 15:50:10 2002
***
*** 24,30 
--- 24,32 
  
  #include 
  #include 
+ #if HAVE_ICONV
  #include 
+ #endif
  #include 
  #include 
  #include 
diff -c -r mutt-1.3.28/sendlib.c mutt-1.3.28-/sendlib.c
*** mutt-1.3.28/sendlib.c   Wed Nov  7 02:51:29 2001
--- mutt-1.3.28-/sendlib.c  Sun Mar 17 15:53:39 2002
***
*** 649,654 
--- 649,657 
  }
  
  /* Define as 1 if iconv sometimes returns -1(EILSEQ) instead of transcribing. */
+ #ifndef EILSEQ
+ # define EILSEQ EINVAL
+ #endif
  #define BUGGY_ICONV 1
  
  /*