diff options
Diffstat (limited to 'mail/balsa/files')
-rw-r--r-- | mail/balsa/files/patch-configure | 227 | ||||
-rw-r--r-- | mail/balsa/files/patch-libbalsa_imap_imap-handle.c | 10 | ||||
-rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_local.c | 33 | ||||
-rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_local.h | 11 | ||||
-rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_maildir.c | 89 | ||||
-rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_mbox.c | 19 | ||||
-rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_mh.c | 248 | ||||
-rw-r--r-- | mail/balsa/files/patch-src_threads.h | 10 |
8 files changed, 0 insertions, 647 deletions
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure deleted file mode 100644 index c18f9adcf..000000000 --- a/mail/balsa/files/patch-configure +++ /dev/null @@ -1,227 +0,0 @@ ---- configure.orig 2010-02-14 15:51:21.000000000 -0500 -+++ configure 2010-02-14 15:51:21.000000000 -0500 -@@ -8884,7 +8884,7 @@ if test "${ac_cv_lib_ldap_ldap_search+se - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lldap -llber -lresolv $LIBS" -+LIBS="-lldap -llber $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -8949,7 +8949,7 @@ cat >>confdefs.h <<\_ACEOF - #define ENABLE_LDAP 1 - _ACEOF - -- LIBS="-lldap -llber -lresolv $LIBS" -+ LIBS="-lldap -llber $LIBS" - else - { { $as_echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5 - $as_echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;} -@@ -11365,13 +11365,13 @@ _ACEOF - else - - --{ $as_echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5 --$as_echo_n "checking for new_pspell_manager in -lpspell... " >&6; } --if test "${ac_cv_lib_pspell_new_pspell_manager+set}" = set; then -+{ $as_echo "$as_me:$LINENO: checking for new_aspell_manager in -laspell" >&5 -+$as_echo_n "checking for new_aspell_manager in -laspell... " >&6; } -+if test "${ac_cv_lib_aspell_new_aspell_manager+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS" -+LIBS="-laspell -lstdc++ -laspell-modules $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -11385,11 +11385,11 @@ cat >>conftest.$ac_ext <<_ACEOF - #ifdef __cplusplus - extern "C" - #endif --char new_pspell_manager (); -+char new_aspell_manager (); - int - main () - { --return new_pspell_manager (); -+return new_aspell_manager (); - ; - return 0; - } -@@ -11415,12 +11415,12 @@ $as_echo "$ac_try_echo") >&5 - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_pspell_new_pspell_manager=yes -+ ac_cv_lib_aspell_new_aspell_manager=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_pspell_new_pspell_manager=no -+ ac_cv_lib_aspell_new_aspell_manager=no - fi - - rm -rf conftest.dSYM -@@ -11428,19 +11428,19 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pspell_new_pspell_manager" >&5 --$as_echo "$ac_cv_lib_pspell_new_pspell_manager" >&6; } --if test "x$ac_cv_lib_pspell_new_pspell_manager" = x""yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_manager" >&5 -+$as_echo "$ac_cv_lib_aspell_new_aspell_manager" >&6; } -+if test "x$ac_cv_lib_aspell_new_aspell_manager" = x""yes; then - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBPSPELL 1 - _ACEOF - -- LIBS="-lpspell $LIBS" -+ LIBS="-laspell $LIBS" - - else - -- { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5 --$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;} -+ { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5 -+$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;} - { (exit 1); exit 1; }; } - - fi -@@ -11448,18 +11448,18 @@ fi - - fi - -- if test "${ac_cv_header_pspell_pspell_h+set}" = set; then -- { $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5 --$as_echo_n "checking for pspell/pspell.h... " >&6; } --if test "${ac_cv_header_pspell_pspell_h+set}" = set; then -+ if test "${ac_cv_header_aspell_aspell_h+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5 -+$as_echo_n "checking for aspell/aspell.h... " >&6; } -+if test "${ac_cv_header_aspell_aspell_h+set}" = set; then - $as_echo_n "(cached) " >&6 - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5 --$as_echo "$ac_cv_header_pspell_pspell_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5 -+$as_echo "$ac_cv_header_aspell_aspell_h" >&6; } - else - # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h usability" >&5 --$as_echo_n "checking pspell/pspell.h usability... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h usability" >&5 -+$as_echo_n "checking aspell/aspell.h usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -11467,7 +11467,7 @@ cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --#include <pspell/pspell.h> -+#include <aspell/aspell.h> - _ACEOF - rm -f conftest.$ac_objext - if { (ac_try="$ac_compile" -@@ -11500,15 +11500,15 @@ rm -f core conftest.err conftest.$ac_obj - $as_echo "$ac_header_compiler" >&6; } - - # Is the header present? --{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h presence" >&5 --$as_echo_n "checking pspell/pspell.h presence... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h presence" >&5 -+$as_echo_n "checking aspell/aspell.h presence... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <pspell/pspell.h> -+#include <aspell/aspell.h> - _ACEOF - if { (ac_try="$ac_cpp conftest.$ac_ext" - case "(($ac_try" in -@@ -11542,44 +11542,44 @@ $as_echo "$ac_header_preproc" >&6; } - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: pspell/pspell.h: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: pspell/pspell.h: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: pspell/pspell.h: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: pspell/pspell.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: aspell/aspell.h: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: aspell/aspell.h: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: aspell/aspell.h: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: aspell/aspell.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&2;} - - ;; - esac --{ $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5 --$as_echo_n "checking for pspell/pspell.h... " >&6; } --if test "${ac_cv_header_pspell_pspell_h+set}" = set; then -+{ $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5 -+$as_echo_n "checking for aspell/aspell.h... " >&6; } -+if test "${ac_cv_header_aspell_aspell_h+set}" = set; then - $as_echo_n "(cached) " >&6 - else -- ac_cv_header_pspell_pspell_h=$ac_header_preproc -+ ac_cv_header_aspell_aspell_h=$ac_header_preproc - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5 --$as_echo "$ac_cv_header_pspell_pspell_h" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5 -+$as_echo "$ac_cv_header_aspell_aspell_h" >&6; } - - fi --if test "x$ac_cv_header_pspell_pspell_h" = x""yes; then -+if test "x$ac_cv_header_aspell_aspell_h" = x""yes; then - : - else -- { { $as_echo "$as_me:$LINENO: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5 --$as_echo "$as_me: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;} -+ { { $as_echo "$as_me:$LINENO: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5 -+$as_echo "$as_me: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -11882,7 +11882,7 @@ fi - - - cat >>confdefs.h <<\_ACEOF --#define _XOPEN_SOURCE 500 -+/*#define _XOPEN_SOURCE 500*/ - _ACEOF - - { $as_echo "$as_me:$LINENO: checking whether localtime_r is declared" >&5 diff --git a/mail/balsa/files/patch-libbalsa_imap_imap-handle.c b/mail/balsa/files/patch-libbalsa_imap_imap-handle.c deleted file mode 100644 index a7206c822..000000000 --- a/mail/balsa/files/patch-libbalsa_imap_imap-handle.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libbalsa/imap/imap-handle.c.orig Sun May 1 17:37:58 2005 -+++ libbalsa/imap/imap-handle.c Tue May 3 01:39:13 2005 -@@ -23,6 +23,7 @@ - - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <netdb.h> - #include <glib.h> - #include <glib-object.h> diff --git a/mail/balsa/files/patch-libbalsa_mailbox_local.c b/mail/balsa/files/patch-libbalsa_mailbox_local.c deleted file mode 100644 index ebe565329..000000000 --- a/mail/balsa/files/patch-libbalsa_mailbox_local.c +++ /dev/null @@ -1,33 +0,0 @@ ---- libbalsa/mailbox_local.c.orig 2009-05-23 03:02:12.000000000 -0400 -+++ libbalsa/mailbox_local.c 2009-12-25 12:39:52.000000000 -0500 -@@ -440,7 +440,7 @@ libbalsa_mailbox_local_load_config(LibBa - - typedef struct { - GArray * array; -- guint (*fileno)(LibBalsaMailboxLocal * local, guint msgno); -+ guint (*sti_fileno)(LibBalsaMailboxLocal * local, guint msgno); - LibBalsaMailboxLocal *local; - } LibBalsaMailboxLocalSaveTreeInfo; - -@@ -464,9 +464,9 @@ lbm_local_save_tree_item(guint msgno, gu - if (msgno == 0) { - info.msgno = msgno; - info.value.total = a; -- } else if (save_info->fileno) { -- info.msgno = save_info->fileno(save_info->local, msgno); -- info.value.parent = save_info->fileno(save_info->local, a); -+ } else if (save_info->sti_fileno) { -+ info.msgno = save_info->sti_fileno(save_info->local, msgno); -+ info.value.parent = save_info->sti_fileno(save_info->local, a); - } else { - info.msgno = msgno; - info.value.parent = a; -@@ -524,7 +524,7 @@ lbm_local_save_tree(LibBalsaMailboxLocal - return; - } - -- save_info.fileno = LIBBALSA_MAILBOX_LOCAL_GET_CLASS(local)->fileno; -+ save_info.sti_fileno = LIBBALSA_MAILBOX_LOCAL_GET_CLASS(local)->sti_fileno; - save_info.local = local; - save_info.array = - g_array_new(FALSE, FALSE, sizeof(LibBalsaMailboxLocalTreeInfo)); diff --git a/mail/balsa/files/patch-libbalsa_mailbox_local.h b/mail/balsa/files/patch-libbalsa_mailbox_local.h deleted file mode 100644 index 7006f7f42..000000000 --- a/mail/balsa/files/patch-libbalsa_mailbox_local.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libbalsa/mailbox_local.h.orig Sun May 6 13:57:53 2007 -+++ libbalsa/mailbox_local.h Thu May 31 01:04:10 2007 -@@ -79,7 +79,7 @@ struct _LibBalsaMailboxLocalClass { - gint (*check_files)(const gchar * path, gboolean create); - void (*set_path)(LibBalsaMailboxLocal * local, const gchar * path); - void (*remove_files)(LibBalsaMailboxLocal * local); -- guint (*fileno)(LibBalsaMailboxLocal * local, guint msgno); -+ guint (*sti_fileno)(LibBalsaMailboxLocal * local, guint msgno); - LibBalsaMailboxLocalMessageInfo *(*get_info)(LibBalsaMailboxLocal * local, - guint msgno); - }; diff --git a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c deleted file mode 100644 index 9d865279b..000000000 --- a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c +++ /dev/null @@ -1,89 +0,0 @@ ---- libbalsa/mailbox_maildir.c.orig 2008-04-13 06:16:40.000000000 -0400 -+++ libbalsa/mailbox_maildir.c 2008-07-04 16:27:21.000000000 -0400 -@@ -25,6 +25,8 @@ - #define _XOPEN_SOURCE 500 - #define _XOPEN_SOURCE_EXTENDED 1 - -+#include <sys/types.h> -+#include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> - #include <errno.h> -@@ -49,7 +51,7 @@ struct message_info { - /* The message's order when parsing; needed for saving the message - * tree in a form that will match the msgnos when the mailbox is - * reopened. */ -- guint fileno; -+ guint mi_fileno; - }; - #define REAL_FLAGS(flags) ((flags) & LIBBALSA_MESSAGE_FLAGS_REAL) - #define FLAGS_REALLY_DIFFER(orig_flags, flags) \ -@@ -175,7 +177,7 @@ libbalsa_mailbox_maildir_class_init(LibB - libbalsa_mailbox_local_class->check_files = lbm_maildir_check_files; - libbalsa_mailbox_local_class->set_path = lbm_maildir_set_path; - libbalsa_mailbox_local_class->remove_files = lbm_maildir_remove_files; -- libbalsa_mailbox_local_class->fileno = lbm_maildir_fileno; -+ libbalsa_mailbox_local_class->sti_fileno = lbm_maildir_fileno; - libbalsa_mailbox_local_class->get_info = lbm_maildir_get_info; - } - -@@ -390,7 +392,7 @@ static LibBalsaMessageFlag parse_filenam - } - - static void lbm_maildir_parse(LibBalsaMailboxMaildir * mdir, -- const gchar *subdir, guint * fileno) -+ const gchar *subdir, guint * md_fileno) - { - gchar *path; - GDir *dir; -@@ -443,12 +445,12 @@ static void lbm_maildir_parse(LibBalsaMa - msg_info->key=key; - msg_info->filename=g_strdup(filename); - msg_info->local_info.flags = msg_info->orig_flags = flags; -- msg_info->fileno = 0; -+ msg_info->mi_fileno = 0; - } - msg_info->subdir = subdir; -- if (!msg_info->fileno) -+ if (!msg_info->mi_fileno) - /* First time we saw this key. */ -- msg_info->fileno = ++*fileno; -+ msg_info->mi_fileno = ++*md_fileno; - } - g_dir_close(dir); - } -@@ -456,21 +458,21 @@ static void lbm_maildir_parse(LibBalsaMa - static void - lbm_maildir_parse_subdirs(LibBalsaMailboxMaildir * mdir) - { -- guint msgno, fileno = 0; -+ guint msgno, md_fileno = 0; - - for (msgno = mdir->msgno_2_msg_info->len; msgno > 0; --msgno) { - struct message_info *msg_info = - message_info_from_msgno(mdir, msgno); -- msg_info->fileno = 0; -+ msg_info->mi_fileno = 0; - } - -- lbm_maildir_parse(mdir, "cur", &fileno); -+ lbm_maildir_parse(mdir, "cur", &md_fileno); - /* We parse "new" after "cur", so that any recent messages will have - * higher msgnos than any current messages. That ensures that the - * message tree saved by LibBalsaMailboxLocal is still valid, and - * that the new messages will be inserted correctly into the tree by - * libbalsa_mailbox_local_add_messages. */ -- lbm_maildir_parse(mdir, "new", &fileno); -+ lbm_maildir_parse(mdir, "new", &md_fileno); - } - - static gboolean -@@ -871,7 +873,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal - msg_info = - message_info_from_msgno((LibBalsaMailboxMaildir *) local, msgno); - -- return msg_info->fileno; -+ return msg_info->mi_fileno; - } - - static LibBalsaMailboxLocalMessageInfo * diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mbox.c b/mail/balsa/files/patch-libbalsa_mailbox_mbox.c deleted file mode 100644 index 2511938ff..000000000 --- a/mail/balsa/files/patch-libbalsa_mailbox_mbox.c +++ /dev/null @@ -1,19 +0,0 @@ ---- libbalsa/mailbox_mbox.c.orig Tue Dec 27 14:54:34 2005 -+++ libbalsa/mailbox_mbox.c Thu Dec 29 01:44:01 2005 -@@ -26,6 +26,7 @@ - - #include <gmime/gmime-stream-fs.h> - -+#include <sys/stat.h> - #include <stdlib.h> - #include <unistd.h> - #include <fcntl.h> -@@ -214,7 +215,7 @@ lbm_mbox_check_files(const gchar * path, - } else if (create) { - gint fd; - -- if ((fd = creat(path, S_IRUSR | S_IWUSR)) == -1) { -+ if ((fd = open(path, O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR)) == -1) { - g_warning("An error:\n%s\n occurred while trying to " - "create the mailbox \"%s\"\n", - strerror(errno), path); diff --git a/mail/balsa/files/patch-libbalsa_mailbox_mh.c b/mail/balsa/files/patch-libbalsa_mailbox_mh.c deleted file mode 100644 index 36cd3b677..000000000 --- a/mail/balsa/files/patch-libbalsa_mailbox_mh.c +++ /dev/null @@ -1,248 +0,0 @@ ---- libbalsa/mailbox_mh.c.orig Wed May 16 13:49:05 2007 -+++ libbalsa/mailbox_mh.c Thu May 31 01:09:09 2007 -@@ -27,6 +27,8 @@ - /* to compile this on BSD/Darwin */ - #undef _POSIX_SOURCE - -+#include <sys/types.h> -+#include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> - #include <errno.h> -@@ -45,7 +47,7 @@ - struct message_info { - LibBalsaMailboxLocalMessageInfo local_info; - LibBalsaMessageFlag orig_flags; /* Has only real flags */ -- gint fileno; -+ gint mi_fileno; - }; - - #define REAL_FLAGS(flags) (flags & LIBBALSA_MESSAGE_FLAGS_REAL) -@@ -260,7 +262,7 @@ libbalsa_mailbox_mh_load_config(LibBalsa - - #define MH_BASENAME(msg_info) \ - g_strdup_printf((msg_info->orig_flags & LIBBALSA_MESSAGE_FLAG_DELETED) ? \ -- ",%d" : "%d", msg_info->fileno) -+ ",%d" : "%d", msg_info->mi_fileno) - - static GMimeStream * - libbalsa_mailbox_mh_get_message_stream(LibBalsaMailbox * mailbox, -@@ -335,7 +337,7 @@ static gint - lbm_mh_compare_fileno(const struct message_info ** a, - const struct message_info ** b) - { -- return (*a)->fileno - (*b)->fileno; -+ return (*a)->mi_fileno - (*b)->mi_fileno; - } - - static void -@@ -352,7 +354,7 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh * - - while ((filename = g_dir_read_name(dir)) != NULL) { - LibBalsaMessageFlag delete_flag = 0; -- guint fileno; -+ guint mh_fileno; - - if (filename[0] == ',') { - filename++; -@@ -361,22 +363,22 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh * - if (lbm_mh_check_filename(filename) == FALSE) - continue; - -- if (sscanf(filename, "%d", &fileno) != 1) -+ if (sscanf(filename, "%d", &mh_fileno) != 1) - break; /* FIXME report error? */ -- if (fileno > mh->last_fileno) -- mh->last_fileno = fileno; -+ if (mh_fileno > mh->last_fileno) -+ mh->last_fileno = mh_fileno; - - if (add_msg_info && mh->messages_info) { - struct message_info *msg_info = - g_hash_table_lookup(mh->messages_info, -- GINT_TO_POINTER(fileno)); -+ GINT_TO_POINTER(mh_fileno)); - if (!msg_info) { - msg_info = g_new0(struct message_info, 1); - msg_info->local_info.flags = INVALID_FLAG; - g_hash_table_insert(mh->messages_info, -- GINT_TO_POINTER(fileno), msg_info); -+ GINT_TO_POINTER(mh_fileno), msg_info); - g_ptr_array_add(mh->msgno_2_msg_info, msg_info); -- msg_info->fileno = fileno; -+ msg_info->mi_fileno = mh_fileno; - } - msg_info->orig_flags = delete_flag; - } -@@ -394,17 +396,17 @@ static const gchar *LibBalsaMailboxMhRep - static const gchar *LibBalsaMailboxMhRecent = "recent:"; - - static void --lbm_mh_set_flag(LibBalsaMailboxMh * mh, guint fileno, LibBalsaMessageFlag flag) -+lbm_mh_set_flag(LibBalsaMailboxMh * mh, guint mh_fileno, LibBalsaMessageFlag flag) - { - struct message_info *msg_info; - -- if (!fileno) -+ if (!mh_fileno) - return; - -- msg_info = g_hash_table_lookup(mh->messages_info, GINT_TO_POINTER(fileno)); -+ msg_info = g_hash_table_lookup(mh->messages_info, GINT_TO_POINTER(mh_fileno)); - - if (!msg_info) { -- g_print("MH sequence info for nonexistent message %d\n", fileno); -+ g_print("MH sequence info for nonexistent message %d\n", mh_fileno); - return; - } - -@@ -433,7 +435,7 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh - - for (seq = sequences; *seq; seq++) { - guint end = 0; -- guint fileno; -+ guint mh_fileno; - - if (!**seq) - continue; -@@ -444,11 +446,11 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh - if (sscanf(line, "%d", &end) != 1) - break; /* FIXME report error? */ - } -- if (sscanf(*seq, "%d", &fileno) != 1) -+ if (sscanf(*seq, "%d", &mh_fileno) != 1) - break; /* FIXME report error? */ - do -- lbm_mh_set_flag(mh, fileno, flag); -- while (++fileno <= end); -+ lbm_mh_set_flag(mh, mh_fileno, flag); -+ while (++mh_fileno <= end); - } - - g_strfreev(sequences); -@@ -580,7 +582,7 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con - sequences = g_strsplit(p, " ", 0); - for (seq = sequences; *seq; seq++) { - guint end = 0; -- guint fileno; -+ guint mh_fileno; - - if (!**seq) - continue; -@@ -591,15 +593,15 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con - if (sscanf(p, "%d", &end) != 1) - break; /* FIXME report error? */ - } -- if (sscanf(*seq, "%d", &fileno) != 1) -+ if (sscanf(*seq, "%d", &mh_fileno) != 1) - break; /* FIXME report error? */ - do { -- p = g_strdup_printf("%s/%d", path, fileno); -+ p = g_strdup_printf("%s/%d", path, mh_fileno); - if (access(p, F_OK) == 0) - retval = TRUE; - g_free(p); - /* One undeleted unread message is enough. */ -- } while (!retval && ++fileno <= end); -+ } while (!retval && ++mh_fileno <= end); - } - g_strfreev(sequences); - break; -@@ -686,7 +688,7 @@ libbalsa_mailbox_mh_check(LibBalsaMailbo - else { - g_ptr_array_remove(mh->msgno_2_msg_info, msg_info); - g_hash_table_remove(mh->messages_info, -- GINT_TO_POINTER(msg_info->fileno)); -+ GINT_TO_POINTER(msg_info->mi_fileno)); - libbalsa_mailbox_local_msgno_removed(mailbox, msgno); - if (renumber > msgno) - /* First message that needs renumbering. */ -@@ -763,11 +765,11 @@ lbm_mh_flag_line(struct message_info *ms - if (!(msg_info->local_info.flags & flag)) - return; - -- if (li->last < msg_info->fileno - 1) { -+ if (li->last < msg_info->mi_fileno - 1) { - lbm_mh_print_line(li); -- li->first = msg_info->fileno; -+ li->first = msg_info->mi_fileno; - } -- li->last = msg_info->fileno; -+ li->last = msg_info->mi_fileno; - } - - static gboolean -@@ -849,7 +851,7 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox - /* free old information */ - g_ptr_array_remove(mh->msgno_2_msg_info, msg_info); - g_hash_table_remove(mh->messages_info, -- GINT_TO_POINTER(msg_info->fileno)); -+ GINT_TO_POINTER(msg_info->mi_fileno)); - libbalsa_mailbox_local_msgno_removed(mailbox, msgno); - } else { - lbm_mh_flag_line(msg_info, LIBBALSA_MESSAGE_FLAG_NEW, &unseen); -@@ -1038,7 +1040,7 @@ libbalsa_mailbox_mh_fetch_message_struct - * we'll just add new lines and let the next sync merge them with any - * existing lines. */ - static void --lbm_mh_update_sequences(LibBalsaMailboxMh * mh, gint fileno, -+lbm_mh_update_sequences(LibBalsaMailboxMh * mh, gint mh_fileno, - LibBalsaMessageFlag flags) - { - FILE *fp; -@@ -1049,13 +1051,13 @@ lbm_mh_update_sequences(LibBalsaMailboxM - return; - - if (flags & LIBBALSA_MESSAGE_FLAG_NEW) -- fprintf(fp, "unseen: %d\n", fileno); -+ fprintf(fp, "unseen: %d\n", mh_fileno); - if (flags & LIBBALSA_MESSAGE_FLAG_FLAGGED) -- fprintf(fp, "flagged: %d\n", fileno); -+ fprintf(fp, "flagged: %d\n", mh_fileno); - if (flags & LIBBALSA_MESSAGE_FLAG_REPLIED) -- fprintf(fp, "replied: %d\n", fileno); -+ fprintf(fp, "replied: %d\n", mh_fileno); - if (flags & LIBBALSA_MESSAGE_FLAG_RECENT) -- fprintf(fp, "recent: %d\n", fileno); -+ fprintf(fp, "recent: %d\n", mh_fileno); - fclose(fp); - } - -@@ -1072,7 +1074,7 @@ libbalsa_mailbox_mh_add_message(LibBalsa - int fd; - GMimeStream *out_stream; - GMimeFilter *crlffilter; -- int fileno; -+ int mh_fileno; - int retries; - GMimeStream *in_stream; - -@@ -1115,14 +1117,14 @@ libbalsa_mailbox_mh_add_message(LibBalsa - libbalsa_mime_stream_shared_unlock(stream); - g_object_unref(in_stream); - -- fileno = mh->last_fileno; -+ mh_fileno = mh->last_fileno; - retries = 10; - do { - /* rename tempfile to message-number-name */ - char *new_filename; - gint rename_status; - -- new_filename = g_strdup_printf("%s/%d", path, ++fileno); -+ new_filename = g_strdup_printf("%s/%d", path, ++mh_fileno); - rename_status = libbalsa_safe_rename(tmp, new_filename); - g_free(new_filename); - if (rename_status != -1) -@@ -1145,9 +1147,9 @@ libbalsa_mailbox_mh_add_message(LibBalsa - "Too high activity?"); - return FALSE; - } -- mh->last_fileno = fileno; -+ mh->last_fileno = mh_fileno; - -- lbm_mh_update_sequences(mh, fileno, -+ lbm_mh_update_sequences(mh, mh_fileno, - flags | LIBBALSA_MESSAGE_FLAG_RECENT); - - return TRUE; diff --git a/mail/balsa/files/patch-src_threads.h b/mail/balsa/files/patch-src_threads.h deleted file mode 100644 index 585d798ba..000000000 --- a/mail/balsa/files/patch-src_threads.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/threads.h.orig 2009-08-30 05:03:26.000000000 -0400 -+++ src/threads.h 2009-12-25 12:41:53.000000000 -0500 -@@ -23,6 +23,7 @@ - #define __THREADS_H__ - - #include <unistd.h> -+#include <pthread.h> - - /* FIXME: mailbox_lock is really an internal libbalsa mutex. */ - extern pthread_mutex_t mailbox_lock; |