From 9839b90a9f5c84e87932d1e7b27845174f533781 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Mar 29 2008 04:19:05 +0000 Subject: - Add compilation patch for GCC 4.3; add proper C++ #includes --- diff --git a/cone-gcc43.patch b/cone-gcc43.patch new file mode 100644 index 0000000..939e9d1 --- /dev/null +++ b/cone-gcc43.patch @@ -0,0 +1,218 @@ +diff -up cone-0.74/cone/nntpcommand.C.gcc43 cone-0.74/cone/nntpcommand.C +--- cone-0.74/cone/nntpcommand.C.gcc43 2008-03-28 23:58:51.000000000 -0400 ++++ cone-0.74/cone/nntpcommand.C 2008-03-28 23:59:10.000000000 -0400 +@@ -9,9 +9,10 @@ + #include "nntpcommand.H" + #include "libmail/addmessage.H" + #include "gettext.H" +-#include +-#include ++#include ++#include + #include ++#include + + #include + #if HAVE_UNISTD_H +diff -up cone-0.74/cone/tags.C.gcc43 cone-0.74/cone/tags.C +--- cone-0.74/cone/tags.C.gcc43 2008-03-28 23:59:32.000000000 -0400 ++++ cone-0.74/cone/tags.C 2008-03-28 23:59:44.000000000 -0400 +@@ -9,6 +9,7 @@ + #include "tags.H" + #include "gettext.H" + #include ++#include + + using namespace std; + +diff -up cone-0.74/cone/spellcheckerAspell.C.gcc43 cone-0.74/cone/spellcheckerAspell.C +--- cone-0.74/cone/spellcheckerAspell.C.gcc43 2008-03-29 00:00:31.000000000 -0400 ++++ cone-0.74/cone/spellcheckerAspell.C 2008-03-29 00:00:49.000000000 -0400 +@@ -9,7 +9,8 @@ + #include "spellcheckerAspell.H" + #include "libmail/mail.H" + +-#include ++#include ++#include + + #if HAVE_ASPELL_CONFIG_HH + #include "aspell/suggest.hh" +diff -up cone-0.74/cone/gettext.C.gcc43 cone-0.74/cone/gettext.C +--- cone-0.74/cone/gettext.C.gcc43 2008-03-28 23:57:20.000000000 -0400 ++++ cone-0.74/cone/gettext.C 2008-03-28 23:57:49.000000000 -0400 +@@ -6,14 +6,15 @@ + */ + + #include "gettext.H" +-#include +-#include ++#include ++#include + #include + #include + #include + #include "unicode/unicode.h" + #include "libmail/mail.H" +-#include ++#include ++#include + + #if HAVE_LANGINFO_H + #include +diff -up cone-0.74/cone/spellcheckerPspell.C.gcc43 cone-0.74/cone/spellcheckerPspell.C +--- cone-0.74/cone/spellcheckerPspell.C.gcc43 2008-03-29 00:00:00.000000000 -0400 ++++ cone-0.74/cone/spellcheckerPspell.C 2008-03-29 00:00:15.000000000 -0400 +@@ -9,7 +9,8 @@ + #include "spellcheckerPspell.H" + #include "libmail/mail.H" + +-#include ++#include ++#include + + using namespace std; + +diff -up cone-0.74/libmail/attachments.C.gcc43 cone-0.74/libmail/attachments.C +--- cone-0.74/libmail/attachments.C.gcc43 2008-03-28 23:46:09.000000000 -0400 ++++ cone-0.74/libmail/attachments.C 2008-03-29 00:02:57.000000000 -0400 +@@ -11,10 +11,11 @@ + #include "rfc2045/rfc2045charset.h" + #include + #include "attachments.H" +-#include +-#include ++#include ++#include ++#include + #include +-#include ++#include + #include + #include + +diff -up cone-0.74/libmail/fd.C.gcc43 cone-0.74/libmail/fd.C +--- cone-0.74/libmail/fd.C.gcc43 2008-03-28 23:47:28.000000000 -0400 ++++ cone-0.74/libmail/fd.C 2008-03-28 23:47:57.000000000 -0400 +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + using namespace std; + +diff -up cone-0.74/libmail/mimetypes.C.gcc43 cone-0.74/libmail/mimetypes.C +--- cone-0.74/libmail/mimetypes.C.gcc43 2008-03-28 23:50:35.000000000 -0400 ++++ cone-0.74/libmail/mimetypes.C 2008-03-28 23:51:28.000000000 -0400 +@@ -8,7 +8,8 @@ + #include "mimetypes.H" + #include "namespace.H" + #include +-#include ++#include ++#include + + using namespace std; + +diff -up cone-0.74/libmail/addmessageimport.C.gcc43 cone-0.74/libmail/addmessageimport.C +--- cone-0.74/libmail/addmessageimport.C.gcc43 2008-03-28 23:43:31.000000000 -0400 ++++ cone-0.74/libmail/addmessageimport.C 2008-03-29 00:03:19.000000000 -0400 +@@ -7,7 +7,8 @@ + #include "libmail_config.h" + #include "addmessage.H" + #include "attachments.H" +-#include ++#include ++#include + + using namespace std; + +diff -up cone-0.74/libmail/addressbookadd.C.gcc43 cone-0.74/libmail/addressbookadd.C +--- cone-0.74/libmail/addressbookadd.C.gcc43 2008-03-28 23:45:33.000000000 -0400 ++++ cone-0.74/libmail/addressbookadd.C 2008-03-29 00:04:00.000000000 -0400 +@@ -13,9 +13,10 @@ + #include "rfcaddr.H" + #include "misc.H" + #include "unicode/unicode.h" +-#include ++#include + #include +-#include ++#include ++#include + + using namespace std; + +diff -up cone-0.74/libmail/rfc2047decode.C.gcc43 cone-0.74/libmail/rfc2047decode.C +--- cone-0.74/libmail/rfc2047decode.C.gcc43 2008-03-28 23:52:50.000000000 -0400 ++++ cone-0.74/libmail/rfc2047decode.C 2008-03-28 23:53:00.000000000 -0400 +@@ -9,6 +9,7 @@ + #include "rfc2047decode.H" + #include "rfc822/rfc2047.h" + #include "mail.H" ++#include + + using namespace std; + +diff -up cone-0.74/libmail/addmessageremoveattachments.C.gcc43 cone-0.74/libmail/addmessageremoveattachments.C +--- cone-0.74/libmail/addmessageremoveattachments.C.gcc43 2008-03-28 23:44:28.000000000 -0400 ++++ cone-0.74/libmail/addmessageremoveattachments.C 2008-03-29 00:04:43.000000000 -0400 +@@ -8,7 +8,8 @@ + #include "addmessage.H" + #include "attachments.H" + #include "headers.H" +-#include ++#include ++#include + #include + + using namespace std; +diff -up cone-0.74/libmail/sortfolders.C.gcc43 cone-0.74/libmail/sortfolders.C +--- cone-0.74/libmail/sortfolders.C.gcc43 2008-03-28 23:55:00.000000000 -0400 ++++ cone-0.74/libmail/sortfolders.C 2008-03-28 23:55:11.000000000 -0400 +@@ -6,6 +6,7 @@ + */ + #include "libmail_config.h" + #include "mail.H" ++#include + + mail::folder::sort::sort(bool foldersFirstArg) // TRUE: sort folders first + : foldersFirst(foldersFirstArg) +diff -up cone-0.74/libmail/addressbook.C.gcc43 cone-0.74/libmail/addressbook.C +--- cone-0.74/libmail/addressbook.C.gcc43 2008-03-28 23:45:00.000000000 -0400 ++++ cone-0.74/libmail/addressbook.C 2008-03-29 00:05:01.000000000 -0400 +@@ -13,7 +13,8 @@ + #include "addressbooksearch.H" + #include "rfc2047decode.H" + #include "misc.H" +-#include ++#include ++#include + + using namespace std; + +diff -up cone-0.74/libmail/fdtls.C.gcc43 cone-0.74/libmail/fdtls.C +--- cone-0.74/libmail/fdtls.C.gcc43 2008-03-28 23:48:21.000000000 -0400 ++++ cone-0.74/libmail/fdtls.C 2008-03-28 23:48:32.000000000 -0400 +@@ -6,6 +6,7 @@ + */ + #include "libmail_config.h" + #include "fdtls.H" ++#include + + #if HAVE_LIBCOURIERTLS + +diff -up cone-0.74/libmail/addmessage.C.gcc43 cone-0.74/libmail/addmessage.C +--- cone-0.74/libmail/addmessage.C.gcc43 2004-06-22 20:55:25.000000000 -0400 ++++ cone-0.74/libmail/addmessage.C 2008-03-29 00:05:15.000000000 -0400 +@@ -7,7 +7,8 @@ + #include "libmail_config.h" + #include "addmessage.H" + #include "attachments.H" +-#include ++#include ++#include + + // Default method implementation. + diff --git a/cone.spec b/cone.spec index f3abd65..dd0c9a6 100644 --- a/cone.spec +++ b/cone.spec @@ -3,7 +3,7 @@ Summary: CONE mail reader Name: cone Version: 0.74 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.courier-mta.org/cone/ Source0: http://dl.sf.net/courier/%{name}-%{version}.tar.bz2 @@ -23,6 +23,8 @@ BuildRequires: procps Requires(post): %{__perl} +Patch1: cone-gcc43.patch + %description CONE is a simple, text-based E-mail reader and writer. @@ -45,6 +47,7 @@ contains a large amount of documentation for CONE. %prep %setup -q +%patch1 -p1 -b .gcc43 %build CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}" @@ -104,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %doc cone/html %changelog +* Sat Mar 29 2008 Christopher Aillon - 0.74-3 +- Add compilation patch for GCC 4.3; add proper C++ #includes + * Tue Feb 19 2008 Fedora Release Engineering - 0.74-2 - Autorebuild for GCC 4.3