Date: Sat, 10 Jun 2023 16:28:50 GMT From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4c1fbd8d521c - main - mail/balsa: Update to 2.6.4 Message-ID: <202306101628.35AGSoVX001095@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c1fbd8d521ce8ba8556514dce583dfd770c3066 commit 4c1fbd8d521ce8ba8556514dce583dfd770c3066 Author: Rodrigo Osorio <rodrigo@FreeBSD.org> AuthorDate: 2023-01-15 20:17:08 +0000 Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> CommitDate: 2023-06-10 16:16:25 +0000 mail/balsa: Update to 2.6.4 Port changes: * Fix build * Add license * Make linters happy again Changelog: https://github.com/GNOME/balsa/blob/master/NEWS PR: 268734 Reported by: <thomholwerda@osnews.com> --- mail/balsa/Makefile | 51 +-- mail/balsa/distinfo | 5 +- mail/balsa/files/patch-configure | 52 +-- mail/balsa/files/patch-libbalsa_imap_imap-handle.c | 10 - mail/balsa/files/patch-libbalsa_mailbox_local.c | 6 +- mail/balsa/files/patch-libbalsa_mailbox_local.h | 4 +- mail/balsa/files/patch-libbalsa_mailbox_maildir.c | 36 +- mail/balsa/files/patch-libbalsa_mailbox_mbox.c | 19 -- mail/balsa/files/patch-libbalsa_mailbox_mh.c | 248 -------------- mail/balsa/files/patch-src_main-window.h | 11 - mail/balsa/files/patch-src_threads.h | 10 - mail/balsa/pkg-plist | 366 ++++++++++++++++----- 12 files changed, 363 insertions(+), 455 deletions(-) diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index a28c081548c0..c830bd5215bf 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -1,6 +1,5 @@ PORTNAME= balsa -PORTVERSION= 2.5.1 -PORTREVISION= 8 +PORTVERSION= 2.6.4 CATEGORIES= mail gnome MASTER_SITES= http://pawsa.fedorapeople.org/balsa/ @@ -8,47 +7,53 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Mail reader for the GNOME desktop WWW= https://pawsa.fedorapeople.org/balsa/ +LICENSE= GPLv2 + BUILD_DEPENDS= gnome-keyring:security/gnome-keyring \ itstool:textproc/itstool \ yelp-tools>=0:textproc/yelp-tools LIB_DEPENDS= libpcre.so:devel/pcre \ libesmtp.so:mail/libesmtp \ - libgmime-2.6.so:mail/gmime26 \ - libcanberra-gtk3.so:audio/libcanberra-gtk3 + libgmime-3.0.so:mail/gmime30 \ + libcanberra-gtk3.so:audio/libcanberra-gtk3 \ + libical.so:devel/libical \ + libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ + libgnutls.so:security/gnutls \ + libfribidi.so:converters/fribidi \ + libsoup-2.4.so:devel/libsoup \ + libgpgme.so:security/gpgme \ + libcanberra.so:audio/libcanberra \ + libharfbuzz.so:print/harfbuzz \ + libsecret-1.so:security/libsecret \ + libenchant-2.so:textproc/enchant2 RUN_DEPENDS= gnome-keyring:security/gnome-keyring -# Depends on gtkhtml4 (which is being abandonend). When our webkitgtk3 -# in ports gets updated to > 1.10.x, balsa should depend on it. -USES= cpe desktop-file-utils gettext gmake gnome iconv pathfix perl5 \ - pkgconfig ssl tar:bzip2 -USE_GNOME= gnomeprefix gtkhtml4 intlhack libxslt +USES= cpe desktop-file-utils gettext gmake gnome iconv libtool pathfix perl5 \ + pkgconfig tar:xz CPE_VENDOR= gnome +USE_GNOME= cairo gdkpixbuf2 gnomeprefix intlhack libxslt gtksourceview4 +USE_XORG= x11 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-threads \ - --disable-more-warnings \ - --with-ssl \ - --without-nm \ - --with-html-widget=gtkhtml4 \ - --with-gmime=2.6 \ - --with-canberra +CONFIGURE_ARGS= --with-canberra \ + --with-gtksourceview CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -OPTIONS_SUB= yes OPTIONS_DEFINE= LDAP GTKSPELL GTKSV NOTIFY GPG OPTIONS_DEFAULT=LDAP GTKSPELL GTKSV NOTIFY +OPTIONS_SUB= yes +GPG_DESC= GnuPG support GTKSPELL_DESC= Spell checking support GTKSV_DESC= GtkSourceview support -GPG_DESC= GnuPG support -GPG_CONFIGURE_WITH= gpgme GPG_LIB_DEPENDS= libgpgme.so:security/gpgme -LDAP_USES= ldap -LDAP_CONFIGURE_WITH= ldap -GTKSPELL_CONFIGURE_WITH= gtkspell +GPG_CONFIGURE_WITH= gpgme GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 +GTKSPELL_CONFIGURE_WITH= gtkspell GTKSV_USE= GNOME=gtksourceview3 GTKSV_CONFIGURE_WITH= gtksourceview -NOTIFY_CONFIGURE_WITH= libnotify +LDAP_USES= ldap +LDAP_CONFIGURE_WITH= ldap NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify +NOTIFY_CONFIGURE_WITH= libnotify .include <bsd.port.mk> diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo index 87e725b75071..62312451a696 100644 --- a/mail/balsa/distinfo +++ b/mail/balsa/distinfo @@ -1,2 +1,3 @@ -SHA256 (balsa-2.5.1.tar.bz2) = 52ce445dca86eb42e2e402a5b76616a1a522b89acbb631215079022ef80a7a10 -SIZE (balsa-2.5.1.tar.bz2) = 3898061 +TIMESTAMP = 1672764797 +SHA256 (balsa-2.6.4.tar.xz) = befa5984511db33d41f2b1ecbfc99e22a15d45d08efe5d737b5174a1a6ac8fc1 +SIZE (balsa-2.6.4.tar.xz) = 3710272 diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure index 92a98f1fa52b..2f9854a63192 100644 --- a/mail/balsa/files/patch-configure +++ b/mail/balsa/files/patch-configure @@ -1,47 +1,29 @@ ---- configure.orig 2014-04-30 13:56:20.982115758 +0000 -+++ configure 2014-04-30 13:56:44.128114528 +0000 -@@ -15038,7 +15038,7 @@ - conftest$ac_exeext conftest.$ac_ext - if test $have_res_init = no ; then - save_LIBS=$LIBS -- LIBS="$LIBS -lresolv" -+ LIBS="$LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <resolv.h> -@@ -16088,7 +16088,7 @@ - $as_echo_n "(cached) " >&6 - else +--- configure.orig 2023-06-10 11:48:17 UTC ++++ configure +@@ -16081,7 +16081,7 @@ + fi + BALSA_WEB_EXTENSIONS="${libdir}/${PACKAGE}" + +- CPPFLAGS="$CPPFLAGS -DBALSA_WEB_EXTENSIONS=\\\"$BALSA_WEB_EXTENSIONS\\\"" ++ CPPFLAGS="$CPPFLAGS -DBALSA_WEB_EXTENSIONS=\\\"$BALSA_WEB_EXTENSIONS\\\"" + for ac_prog in python-html2text \ + html2markdown \ + html2markdown.py2 \ +@@ -16501,7 +16501,7 @@ + printf %s "(cached) " >&6 + else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap -llber -lresolv $LIBS" +LIBS="-lldap -llber $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -16122,7 +16122,7 @@ +@@ -16534,7 +16534,7 @@ - $as_echo "#define ENABLE_LDAP 1" >>confdefs.h + printf "%s\n" "#define ENABLE_LDAP 1" >>confdefs.h - LIBS="-lldap -llber -lresolv $LIBS" + LIBS="-lldap -llber $LIBS" - else + else $as_nop as_fn_error $? "*** You enabled LDAP but ldap library is not found." "$LINENO" 5 fi -@@ -18071,8 +18071,6 @@ - - - --$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h -- - ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h> - " - if test "x$ac_cv_have_decl_localtime_r" = xyes; then : -@@ -18339,7 +18337,7 @@ - INSTALL_MIME_ICONS_FALSE= - fi - --HICOLOR_ICON_DIR=`$PKG_CONFIG --variable=prefix gtk+-3.0`/share/icons/hicolor -+HICOLOR_ICON_DIR=/usr/local/share/icons/hicolor - - - 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 a7206c8229b7..000000000000 --- 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 index ebe5653298ec..0ca91556c26d 100644 --- a/mail/balsa/files/patch-libbalsa_mailbox_local.c +++ b/mail/balsa/files/patch-libbalsa_mailbox_local.c @@ -1,6 +1,6 @@ ---- 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 +--- libbalsa/mailbox_local.c.orig 2009-05-23 03:02:12 UTC ++++ libbalsa/mailbox_local.c +@@ -468,7 +468,7 @@ typedef struct { GArray * array; diff --git a/mail/balsa/files/patch-libbalsa_mailbox_local.h b/mail/balsa/files/patch-libbalsa_mailbox_local.h index 7006f7f42b9f..a9e8958b9f13 100644 --- a/mail/balsa/files/patch-libbalsa_mailbox_local.h +++ b/mail/balsa/files/patch-libbalsa_mailbox_local.h @@ -1,5 +1,5 @@ ---- libbalsa/mailbox_local.h.orig Sun May 6 13:57:53 2007 -+++ libbalsa/mailbox_local.h Thu May 31 01:04:10 2007 +--- libbalsa/mailbox_local.h.orig Sun May 6 13:57:53 UTC ++++ libbalsa/mailbox_local.h @@ -79,7 +79,7 @@ struct _LibBalsaMailboxLocalClass { gint (*check_files)(const gchar * path, gboolean create); void (*set_path)(LibBalsaMailboxLocal * local, const gchar * path); diff --git a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c index 9d865279b4c7..646e0a158883 100644 --- a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c +++ b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c @@ -1,15 +1,15 @@ ---- 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 +--- libbalsa/mailbox_maildir.c.orig 2023-01-06 18:47:11 UTC ++++ libbalsa/mailbox_maildir.c +@@ -23,6 +23,8 @@ + #endif /* HAVE_CONFIG_H */ + +#include <sys/types.h> +#include <sys/stat.h> #include <unistd.h> #include <fcntl.h> #include <errno.h> -@@ -49,7 +51,7 @@ struct message_info { +@@ -52,7 +54,7 @@ /* 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. */ @@ -18,25 +18,25 @@ }; #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 +@@ -152,7 +154,7 @@ 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; + libbalsa_mailbox_local_class->add_message = lbm_maildir_add_message; } - -@@ -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) +@@ -369,7 +371,7 @@ + static void + lbm_maildir_parse(LibBalsaMailboxMaildir *mdir, + const gchar *subdir, +- guint *fileno) ++ guint *md_fileno) { + const gchar *local_path; gchar *path; - GDir *dir; -@@ -443,12 +445,12 @@ static void lbm_maildir_parse(LibBalsaMa +@@ -420,12 +422,12 @@ msg_info->key=key; msg_info->filename=g_strdup(filename); msg_info->local_info.flags = msg_info->orig_flags = flags; @@ -52,7 +52,7 @@ } g_dir_close(dir); } -@@ -456,21 +458,21 @@ static void lbm_maildir_parse(LibBalsaMa +@@ -433,21 +435,21 @@ static void lbm_maildir_parse_subdirs(LibBalsaMailboxMaildir * mdir) { @@ -78,7 +78,7 @@ } static gboolean -@@ -871,7 +873,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal +@@ -849,7 +851,7 @@ msg_info = message_info_from_msgno((LibBalsaMailboxMaildir *) local, msgno); 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 2511938ff5de..000000000000 --- 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 2caca699b920..000000000000 --- a/mail/balsa/files/patch-libbalsa_mailbox_mh.c +++ /dev/null @@ -1,248 +0,0 @@ ---- libbalsa/mailbox_mh.c.orig 2013-03-04 19:36:37.000000000 +0000 -+++ libbalsa/mailbox_mh.c 2014-04-30 13:49:32.084143219 +0000 -@@ -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) -@@ -261,7 +263,7 @@ - - #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, -@@ -336,7 +338,7 @@ - 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 -@@ -353,7 +355,7 @@ - - while ((filename = g_dir_read_name(dir)) != NULL) { - LibBalsaMessageFlag delete_flag = 0; -- guint fileno; -+ guint mh_fileno; - - if (filename[0] == ',') { - filename++; -@@ -362,22 +364,22 @@ - if (lbm_mh_check_filename(filename) == FALSE) - continue; - -- if (sscanf(filename, "%10d", &fileno) != 1) -+ if (sscanf(filename, "%10d", &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; - } -@@ -395,17 +397,17 @@ - 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; - } - -@@ -434,7 +436,7 @@ - - for (seq = sequences; *seq; seq++) { - guint end = 0; -- guint fileno; -+ guint mh_fileno; - - if (!**seq) - continue; -@@ -445,11 +447,11 @@ - if (sscanf(line, "%10d", &end) != 1) - break; /* FIXME report error? */ - } -- if (sscanf(*seq, "%10d", &fileno) != 1) -+ if (sscanf(*seq, "%10d", &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); -@@ -581,7 +583,7 @@ - sequences = g_strsplit(p, " ", 0); - for (seq = sequences; *seq; seq++) { - guint end = 0; -- guint fileno; -+ guint mh_fileno; - - if (!**seq) - continue; -@@ -592,15 +594,15 @@ - if (sscanf(p, "%10d", &end) != 1) - break; /* FIXME report error? */ - } -- if (sscanf(*seq, "%10d", &fileno) != 1) -+ if (sscanf(*seq, "%10d", &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; -@@ -687,7 +689,7 @@ - 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. */ -@@ -764,11 +766,11 @@ - 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 -@@ -850,7 +852,7 @@ - /* 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); -@@ -1039,7 +1041,7 @@ - * 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; -@@ -1050,13 +1052,13 @@ - 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); - } - -@@ -1073,7 +1075,7 @@ - int fd; - GMimeStream *out_stream; - GMimeFilter *crlffilter; -- int fileno; -+ int mh_fileno; - int retries; - GMimeStream *in_stream; - -@@ -1116,14 +1118,14 @@ - 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) -@@ -1146,9 +1148,9 @@ - "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_main-window.h b/mail/balsa/files/patch-src_main-window.h deleted file mode 100644 index c46acf3aa41b..000000000000 --- a/mail/balsa/files/patch-src_main-window.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/main-window.h.orig 2014-04-30 17:56:08.057123807 +0000 -+++ src/main-window.h 2014-04-30 17:56:29.581127225 +0000 -@@ -28,6 +28,8 @@ - #include <libnotify/notify.h> - #endif - -+#include <glib.h> -+ - #if GLIB_CHECK_VERSION(2, 32, 0) - #include <gio/gio.h> - #elif defined(HAVE_LIBNM_GLIB) diff --git a/mail/balsa/files/patch-src_threads.h b/mail/balsa/files/patch-src_threads.h deleted file mode 100644 index 585d798ba6f9..000000000000 --- 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; diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist index 72a5d011d9bd..4e7c0847b234 100644 --- a/mail/balsa/pkg-plist +++ b/mail/balsa/pkg-plist @@ -1,71 +1,92 @@ bin/balsa bin/balsa-ab etc/sound/events/balsa.soundlist +lib/balsa/libhtmlfilter.a +lib/balsa/libhtmlfilter.so man/man1/balsa.1.gz share/applications/balsa-mailto-handler.desktop -share/applications/balsa.desktop -%%GTKSV%%share/balsa/gtksourceview-2.0/balsa-mail-style.xml -%%GTKSV%%share/balsa/gtksourceview-2.0/balsa-mail.lang -share/balsa/hicolor/16x16/apps/balsa-drop-down.png -share/balsa/hicolor/16x16/apps/balsa-encrypted.png -share/balsa/hicolor/16x16/apps/balsa-mark-all.png -share/balsa/hicolor/16x16/apps/balsa-mbox-draft.png -share/balsa/hicolor/16x16/apps/balsa-mbox-sent.png -share/balsa/hicolor/16x16/apps/balsa-mbox-tray-empty.png -share/balsa/hicolor/16x16/apps/balsa-mbox-tray-full.png -share/balsa/hicolor/16x16/apps/balsa-next-flagged.png -share/balsa/hicolor/16x16/apps/balsa-next-part.png -share/balsa/hicolor/16x16/apps/balsa-next-unread.png -share/balsa/hicolor/16x16/apps/balsa-next.png -share/balsa/hicolor/16x16/apps/balsa-postpone.png -share/balsa/hicolor/16x16/apps/balsa-previous-part.png -share/balsa/hicolor/16x16/apps/balsa-previous.png -share/balsa/hicolor/16x16/apps/balsa-reply-all.png -share/balsa/hicolor/16x16/apps/balsa-signature-bad.png -share/balsa/hicolor/16x16/apps/balsa-signature-good.png -share/balsa/hicolor/16x16/apps/balsa-signature-notrust.png -share/balsa/hicolor/16x16/apps/balsa-signature-unknown.png -share/balsa/hicolor/16x16/apps/mail-inbox.png -share/balsa/hicolor/16x16/apps/mail-outbox.png -share/balsa/hicolor/16x16/apps/stock_book_open.png -share/balsa/hicolor/16x16/apps/stock_book_red.png -share/balsa/hicolor/16x16/apps/stock_contact.png -share/balsa/hicolor/16x16/apps/stock_mail-receive.png -share/balsa/hicolor/16x16/apps/stock_mail.png -share/balsa/hicolor/22x22 -share/balsa/hicolor/24x24/apps/balsa-crypt-check.png -share/balsa/hicolor/24x24/apps/balsa-encrypt.png -share/balsa/hicolor/24x24/apps/balsa-encrypted.png -share/balsa/hicolor/24x24/apps/balsa-mark-all.png -share/balsa/hicolor/24x24/apps/balsa-marked-new.png -share/balsa/hicolor/24x24/apps/balsa-next-flagged.png -share/balsa/hicolor/24x24/apps/balsa-next-part.png -share/balsa/hicolor/24x24/apps/balsa-next-unread.png -share/balsa/hicolor/24x24/apps/balsa-next.png -share/balsa/hicolor/24x24/apps/balsa-postpone.png -share/balsa/hicolor/24x24/apps/balsa-preview.png -share/balsa/hicolor/24x24/apps/balsa-previous-part.png -share/balsa/hicolor/24x24/apps/balsa-previous.png -share/balsa/hicolor/24x24/apps/balsa-reply-all.png -share/balsa/hicolor/24x24/apps/balsa-sign.png -share/balsa/hicolor/24x24/apps/balsa-signature-bad.png -share/balsa/hicolor/24x24/apps/balsa-signature-good.png -share/balsa/hicolor/24x24/apps/balsa-signature-notrust.png -share/balsa/hicolor/24x24/apps/balsa-signature-unknown.png -share/balsa/hicolor/24x24/apps/balsa-trash-empty.png -share/balsa/hicolor/24x24/apps/stock_book_blue.png -share/balsa/hicolor/24x24/apps/stock_book_green.png -share/balsa/hicolor/24x24/apps/stock_book_open.png -share/balsa/hicolor/24x24/apps/stock_book_red.png -share/balsa/hicolor/24x24/apps/stock_book_yellow.png -share/balsa/hicolor/24x24/apps/stock_contact.png -share/balsa/hicolor/24x24/apps/stock_mail-receive.png -share/balsa/hicolor/24x24/apps/stock_mail.png -share/balsa/hicolor/24x24/apps/stock_view-fields.png -share/balsa/pixmaps/attachment.png -share/balsa/pixmaps/balsa-top.png -share/balsa/pixmaps/balsa_icon.png -share/balsa/pixmaps/balsa_logo.png +share/applications/org.desktop.Balsa.desktop +%%DATADIR%%/gtksourceview-3.0/balsa-mail-style.xml +%%DATADIR%%/gtksourceview-3.0/balsa-mail.lang +%%DATADIR%%/hicolor/16x16/apps/balsa-encrypted.png +%%DATADIR%%/hicolor/16x16/apps/balsa-mark-all.png +%%DATADIR%%/hicolor/16x16/apps/balsa-mbox-draft.png +%%DATADIR%%/hicolor/16x16/apps/balsa-mbox-sent.png +%%DATADIR%%/hicolor/16x16/apps/balsa-mbox-tray-empty.png +%%DATADIR%%/hicolor/16x16/apps/balsa-mbox-tray-full.png +%%DATADIR%%/hicolor/16x16/apps/balsa-next-flagged.png +%%DATADIR%%/hicolor/16x16/apps/balsa-next-part.png +%%DATADIR%%/hicolor/16x16/apps/balsa-next-unread.png +%%DATADIR%%/hicolor/16x16/apps/balsa-next.png +%%DATADIR%%/hicolor/16x16/apps/balsa-postpone.png +%%DATADIR%%/hicolor/16x16/apps/balsa-previous-part.png +%%DATADIR%%/hicolor/16x16/apps/balsa-previous.png +%%DATADIR%%/hicolor/16x16/apps/balsa-reply-all.png +%%DATADIR%%/hicolor/16x16/apps/balsa-send-queued.png +%%DATADIR%%/hicolor/16x16/apps/balsa-signature-bad.png +%%DATADIR%%/hicolor/16x16/apps/balsa-signature-good.png +%%DATADIR%%/hicolor/16x16/apps/balsa-signature-notrust.png +%%DATADIR%%/hicolor/16x16/apps/balsa-signature-unknown.png +%%DATADIR%%/hicolor/16x16/apps/mail-inbox.png +%%DATADIR%%/hicolor/16x16/apps/mail-outbox.png +%%DATADIR%%/hicolor/16x16/apps/mail-queue.png +%%DATADIR%%/hicolor/16x16/apps/stock_book_open.png +%%DATADIR%%/hicolor/16x16/apps/stock_book_red.png +%%DATADIR%%/hicolor/16x16/apps/stock_contact.png +%%DATADIR%%/hicolor/16x16/apps/stock_mail-receive.png +%%DATADIR%%/hicolor/16x16/apps/stock_mail.png +%%DATADIR%%/hicolor/24x24/apps/balsa-crypt-check.png +%%DATADIR%%/hicolor/24x24/apps/balsa-encrypt.png +%%DATADIR%%/hicolor/24x24/apps/balsa-encrypted.png +%%DATADIR%%/hicolor/24x24/apps/balsa-mark-all.png +%%DATADIR%%/hicolor/24x24/apps/balsa-marked-new.png +%%DATADIR%%/hicolor/24x24/apps/balsa-next-flagged.png +%%DATADIR%%/hicolor/24x24/apps/balsa-next-part.png +%%DATADIR%%/hicolor/24x24/apps/balsa-next-unread.png +%%DATADIR%%/hicolor/24x24/apps/balsa-next.png +%%DATADIR%%/hicolor/24x24/apps/balsa-postpone.png +%%DATADIR%%/hicolor/24x24/apps/balsa-preview.png +%%DATADIR%%/hicolor/24x24/apps/balsa-previous-part.png +%%DATADIR%%/hicolor/24x24/apps/balsa-previous.png +%%DATADIR%%/hicolor/24x24/apps/balsa-reply-all.png +%%DATADIR%%/hicolor/24x24/apps/balsa-send-queued.png +%%DATADIR%%/hicolor/24x24/apps/balsa-sign.png +%%DATADIR%%/hicolor/24x24/apps/balsa-signature-bad.png +%%DATADIR%%/hicolor/24x24/apps/balsa-signature-good.png +%%DATADIR%%/hicolor/24x24/apps/balsa-signature-notrust.png +%%DATADIR%%/hicolor/24x24/apps/balsa-signature-unknown.png +%%DATADIR%%/hicolor/24x24/apps/balsa-trash-empty.png +%%DATADIR%%/hicolor/24x24/apps/mail-queue.png +%%DATADIR%%/hicolor/24x24/apps/stock_book_blue.png +%%DATADIR%%/hicolor/24x24/apps/stock_book_green.png +%%DATADIR%%/hicolor/24x24/apps/stock_book_open.png +%%DATADIR%%/hicolor/24x24/apps/stock_book_red.png +%%DATADIR%%/hicolor/24x24/apps/stock_book_yellow.png +%%DATADIR%%/hicolor/24x24/apps/stock_contact.png +%%DATADIR%%/hicolor/24x24/apps/stock_mail-receive.png +%%DATADIR%%/hicolor/24x24/apps/stock_mail.png +%%DATADIR%%/hicolor/24x24/apps/stock_view-fields.png +%%DATADIR%%/hicolor/48x48/mimetypes/application-pgp-signature.png +%%DATADIR%%/hicolor/48x48/mimetypes/application-pkcs7-mime.png +%%DATADIR%%/hicolor/48x48/mimetypes/application-pkcs7-signature.png +%%DATADIR%%/hicolor/48x48/mimetypes/application-x-pkcs7-signature.png +%%DATADIR%%/hicolor/48x48/mimetypes/message-disposition-notification.png +%%DATADIR%%/hicolor/48x48/mimetypes/message-external-body.png +%%DATADIR%%/hicolor/48x48/mimetypes/message.png +%%DATADIR%%/hicolor/48x48/mimetypes/multipart-alternative.png +%%DATADIR%%/hicolor/48x48/mimetypes/multipart-encrypted.png +%%DATADIR%%/hicolor/48x48/mimetypes/multipart-signed.png +%%DATADIR%%/hicolor/48x48/mimetypes/multipart.png +%%DATADIR%%/icon-theme.cache +%%DATADIR%%/pixmaps/attachment.png +%%DATADIR%%/pixmaps/balsa-top.png +%%DATADIR%%/pixmaps/balsa_attention.png +%%DATADIR%%/pixmaps/balsa_icon.png +%%DATADIR%%/pixmaps/balsa_logo.png +share/help/C/balsa/ab-conf.page +share/help/C/balsa/authors.page +share/help/C/balsa/balsa.entities +share/help/C/balsa/common-tasks.page share/help/C/balsa/figures/address-book-ldap.png share/help/C/balsa/figures/address-book-modify.png share/help/C/balsa/figures/address-book-vcard.png @@ -83,6 +104,73 @@ share/help/C/balsa/figures/newmsg-window-toolbar.png share/help/C/balsa/figures/newmsg-window.png share/help/C/balsa/figures/preferences-window.png share/help/C/balsa/figures/spell-check.png +share/help/C/balsa/folder-config.page +share/help/C/balsa/getting-started.page +share/help/C/balsa/glossary.page +share/help/C/balsa/identities.page +share/help/C/balsa/index.page +share/help/C/balsa/introduction.page +share/help/C/balsa/its-not-working.page +share/help/C/balsa/mbox-formats.page +share/help/C/balsa/preferences-address-books.page +share/help/C/balsa/preferences-display-options.page +share/help/C/balsa/preferences-mail-options.page +share/help/C/balsa/preferences-miscellaneous.page +share/help/C/balsa/preferences-spelling.page +share/help/C/balsa/preferences-startup.page +share/help/C/balsa/preferences.page +share/help/C/balsa/toolbar-prefs.page +share/help/C/balsa/win-composer.page +share/help/C/balsa/win-filters.page +share/help/C/balsa/win-main.page +share/help/C/balsa/win-message.page +share/help/C/balsa/win-run-filters.page +share/help/C/balsa/win-search.page +share/help/cs/balsa/ab-conf.page +share/help/cs/balsa/authors.page +share/help/cs/balsa/common-tasks.page +share/help/cs/balsa/figures/address-book-ldap.png +share/help/cs/balsa/figures/address-book-modify.png +share/help/cs/balsa/figures/address-book-vcard.png +share/help/cs/balsa/figures/address-book.png +share/help/cs/balsa/figures/balsa_logo.png +share/help/cs/balsa/figures/druid-start.png +share/help/cs/balsa/figures/example-alias.png +share/help/cs/balsa/figures/figuresdobaaddress-book-modify.png +share/help/cs/balsa/figures/main-window-toolbar.png +share/help/cs/balsa/figures/main-window.png +share/help/cs/balsa/figures/message-window.png +share/help/cs/balsa/figures/msg-part-select.png +share/help/cs/balsa/figures/newmsg-window-attachments.png +share/help/cs/balsa/figures/newmsg-window-toolbar.png +share/help/cs/balsa/figures/newmsg-window.png +share/help/cs/balsa/figures/preferences-window.png +share/help/cs/balsa/figures/spell-check.png +share/help/cs/balsa/folder-config.page +share/help/cs/balsa/getting-started.page +share/help/cs/balsa/glossary.page +share/help/cs/balsa/identities.page +share/help/cs/balsa/index.page +share/help/cs/balsa/introduction.page +share/help/cs/balsa/its-not-working.page +share/help/cs/balsa/mbox-formats.page +share/help/cs/balsa/preferences-address-books.page +share/help/cs/balsa/preferences-display-options.page +share/help/cs/balsa/preferences-mail-options.page +share/help/cs/balsa/preferences-miscellaneous.page +share/help/cs/balsa/preferences-spelling.page +share/help/cs/balsa/preferences-startup.page +share/help/cs/balsa/preferences.page +share/help/cs/balsa/toolbar-prefs.page +share/help/cs/balsa/win-composer.page +share/help/cs/balsa/win-filters.page +share/help/cs/balsa/win-main.page +share/help/cs/balsa/win-message.page +share/help/cs/balsa/win-run-filters.page +share/help/cs/balsa/win-search.page +share/help/de/balsa/ab-conf.page +share/help/de/balsa/authors.page +share/help/de/balsa/common-tasks.page share/help/de/balsa/figures/address-book-ldap.png share/help/de/balsa/figures/address-book-modify.png share/help/de/balsa/figures/address-book-vcard.png @@ -100,6 +188,73 @@ share/help/de/balsa/figures/newmsg-window-toolbar.png share/help/de/balsa/figures/newmsg-window.png share/help/de/balsa/figures/preferences-window.png share/help/de/balsa/figures/spell-check.png +share/help/de/balsa/folder-config.page +share/help/de/balsa/getting-started.page +share/help/de/balsa/glossary.page +share/help/de/balsa/identities.page +share/help/de/balsa/index.page +share/help/de/balsa/introduction.page +share/help/de/balsa/its-not-working.page +share/help/de/balsa/mbox-formats.page +share/help/de/balsa/preferences-address-books.page +share/help/de/balsa/preferences-display-options.page +share/help/de/balsa/preferences-mail-options.page +share/help/de/balsa/preferences-miscellaneous.page +share/help/de/balsa/preferences-spelling.page +share/help/de/balsa/preferences-startup.page +share/help/de/balsa/preferences.page +share/help/de/balsa/toolbar-prefs.page +share/help/de/balsa/win-composer.page +share/help/de/balsa/win-filters.page +share/help/de/balsa/win-main.page +share/help/de/balsa/win-message.page +share/help/de/balsa/win-run-filters.page +share/help/de/balsa/win-search.page +share/help/el/balsa/ab-conf.page +share/help/el/balsa/authors.page +share/help/el/balsa/common-tasks.page +share/help/el/balsa/figures/address-book-ldap.png +share/help/el/balsa/figures/address-book-modify.png +share/help/el/balsa/figures/address-book-vcard.png +share/help/el/balsa/figures/address-book.png +share/help/el/balsa/figures/balsa_logo.png +share/help/el/balsa/figures/druid-start.png +share/help/el/balsa/figures/example-alias.png +share/help/el/balsa/figures/figuresdobaaddress-book-modify.png +share/help/el/balsa/figures/main-window-toolbar.png +share/help/el/balsa/figures/main-window.png +share/help/el/balsa/figures/message-window.png +share/help/el/balsa/figures/msg-part-select.png +share/help/el/balsa/figures/newmsg-window-attachments.png +share/help/el/balsa/figures/newmsg-window-toolbar.png +share/help/el/balsa/figures/newmsg-window.png +share/help/el/balsa/figures/preferences-window.png +share/help/el/balsa/figures/spell-check.png +share/help/el/balsa/folder-config.page +share/help/el/balsa/getting-started.page +share/help/el/balsa/glossary.page +share/help/el/balsa/identities.page +share/help/el/balsa/index.page +share/help/el/balsa/introduction.page +share/help/el/balsa/its-not-working.page +share/help/el/balsa/mbox-formats.page +share/help/el/balsa/preferences-address-books.page +share/help/el/balsa/preferences-display-options.page +share/help/el/balsa/preferences-mail-options.page +share/help/el/balsa/preferences-miscellaneous.page +share/help/el/balsa/preferences-spelling.page +share/help/el/balsa/preferences-startup.page +share/help/el/balsa/preferences.page +share/help/el/balsa/toolbar-prefs.page +share/help/el/balsa/win-composer.page +share/help/el/balsa/win-filters.page +share/help/el/balsa/win-main.page +share/help/el/balsa/win-message.page +share/help/el/balsa/win-run-filters.page +share/help/el/balsa/win-search.page +share/help/es/balsa/ab-conf.page +share/help/es/balsa/authors.page +share/help/es/balsa/common-tasks.page share/help/es/balsa/figures/address-book-ldap.png share/help/es/balsa/figures/address-book-modify.png share/help/es/balsa/figures/address-book-vcard.png @@ -117,6 +272,31 @@ share/help/es/balsa/figures/newmsg-window-toolbar.png share/help/es/balsa/figures/newmsg-window.png share/help/es/balsa/figures/preferences-window.png share/help/es/balsa/figures/spell-check.png +share/help/es/balsa/folder-config.page +share/help/es/balsa/getting-started.page +share/help/es/balsa/glossary.page +share/help/es/balsa/identities.page +share/help/es/balsa/index.page +share/help/es/balsa/introduction.page +share/help/es/balsa/its-not-working.page +share/help/es/balsa/mbox-formats.page +share/help/es/balsa/preferences-address-books.page +share/help/es/balsa/preferences-display-options.page +share/help/es/balsa/preferences-mail-options.page +share/help/es/balsa/preferences-miscellaneous.page +share/help/es/balsa/preferences-spelling.page +share/help/es/balsa/preferences-startup.page +share/help/es/balsa/preferences.page +share/help/es/balsa/toolbar-prefs.page +share/help/es/balsa/win-composer.page +share/help/es/balsa/win-filters.page +share/help/es/balsa/win-main.page +share/help/es/balsa/win-message.page +share/help/es/balsa/win-run-filters.page +share/help/es/balsa/win-search.page +share/help/fr/balsa/ab-conf.page +share/help/fr/balsa/authors.page +share/help/fr/balsa/common-tasks.page share/help/fr/balsa/figures/address-book-ldap.png share/help/fr/balsa/figures/address-book-modify.png share/help/fr/balsa/figures/address-book-vcard.png @@ -134,6 +314,31 @@ share/help/fr/balsa/figures/newmsg-window-toolbar.png share/help/fr/balsa/figures/newmsg-window.png share/help/fr/balsa/figures/preferences-window.png share/help/fr/balsa/figures/spell-check.png +share/help/fr/balsa/folder-config.page +share/help/fr/balsa/getting-started.page +share/help/fr/balsa/glossary.page +share/help/fr/balsa/identities.page +share/help/fr/balsa/index.page +share/help/fr/balsa/introduction.page +share/help/fr/balsa/its-not-working.page *** 77 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306101628.35AGSoVX001095>