diff --git a/alpine-gcc44.diff b/alpine-gcc44.diff new file mode 100644 index 0000000..78dd423 --- /dev/null +++ b/alpine-gcc44.diff @@ -0,0 +1,40 @@ +--- ./imap/src/osdep/unix/dummy.c 2009/06/02 09:53:30 1.1 ++++ ./imap/src/osdep/unix/dummy.c 2009/06/02 10:04:31 +@@ -723,6 +723,17 @@ + return NIL; + } + ++static MAILSTREAM *dummy_rewrite_code(MAILSTREAM *ts) ++{ ++ if (ts) ++ return ts; ++ ++ ts = default_proto (NIL); ++ if (!(*ts->dtb->create)(ts,"INBOX")) ++ return NIL; ++ ++ return ts; ++} + + /* Dummy append message string + * Accepts: mail stream +@@ -742,8 +753,7 @@ + /* append to INBOX? */ + if (!compare_cstring (mailbox,"INBOX")) { + /* yes, if no empty proto try creating */ +- if (!ts && !(*(ts = default_proto (NIL))->dtb->create) (ts,"INBOX")) +- ts = NIL; ++ ts = dummy_rewrite_code(ts); + } + else if (dummy_file (tmp,mailbox) && ((fd = open (tmp,O_RDONLY,NIL)) < 0)) { + if ((e = errno) == ENOENT) /* failed, was it no such file? */ +--- pith/send.c 2009/06/02 10:04:13 1.11 ++++ pith/send.c 2009/06/02 10:04:31 +@@ -1569,6 +1569,7 @@ + pf->textbuf = cpystr(value); + } + } ++ return 0; + } + + diff --git a/alpine.changes b/alpine.changes index 56f5ebf..d1374c2 100644 --- a/alpine.changes +++ b/alpine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 2 12:06:56 CEST 2009 - coolo@suse.de + +- fix compilation with gcc44 + ------------------------------------------------------------------- Wed Oct 15 09:33:07 CEST 2008 - max@suse.de diff --git a/alpine.spec b/alpine.spec index 327c0aa..93e7450 100644 --- a/alpine.spec +++ b/alpine.spec @@ -1,7 +1,7 @@ # # spec file for package alpine (Version 2.00) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,7 +50,7 @@ Conflicts: pine4 %endif # Version: 2.00 -Release: 3 +Release: 4 License: The Apache Software License Group: Productivity/Networking/Email/Clients AutoReqProv: on @@ -63,6 +63,7 @@ Patch1: pine-nonvoid-function.patch Patch2: make-use-of-strncat-safer.diff Patch3: operation-may-be-undefined-warning.diff Patch4: fix-implicit.patch +Patch5: alpine-gcc44.diff Patch10: pico-fix-spurious-undef-warnings.diff Patch20: pine-expression-warnings.diff Patch40: pico-stripwhitespace.diff @@ -100,7 +101,7 @@ when operations take a long time. %package -n pico -License: Any permissive +License: The Apache Software License Summary: A small, easy to use editor Group: Productivity/Editors/Other AutoReqProv: on @@ -114,7 +115,7 @@ Characters are inserted into the text as they are typed. %package -n pilot -License: Any permissive +License: The Apache Software License Summary: Simple file system browser Group: Productivity/File utilities AutoReqProv: on @@ -157,6 +158,7 @@ fi %patch2 -p1 %patch3 -p1 %patch4 -p0 +%patch5 -p0 %patch10 -p1 %patch20 -p1 %patch40 -p1 @@ -346,6 +348,8 @@ rm -rf %buildroot %endif %changelog +* Tue Jun 02 2009 coolo@suse.de +- fix compilation with gcc44 * Wed Oct 15 2008 max@suse.de - lzma is no longer needed for building. * Thu Oct 09 2008 meissner@suse.de