heya,
here's an update to the latest release version of sylpheed. tested on
amd64 for a week now and it behaves just fine.
do note that it has started using shared libraries now. after the diff
you should be left with only 1 patch file which is non-zero, all
previous patches seem to have been incorporated.
// nick
diff -uNPr -x CVS sylpheed/Makefile sylpheed-new/Makefile
--- sylpheed/Makefile Tue Jan 5 20:36:12 2010
+++ sylpheed-new/Makefile Tue Jan 5 20:35:15 2010
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.85 2009/12/21 22:20:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.84 2009/08/10 06:32:43 kili Exp $
COMMENT= mail/news client in gtk+
-MAJOR= 2.5
-VERSION= ${MAJOR}.0
+MAJOR= 2.7
+VERSION= ${MAJOR}.1
DISTNAME= sylpheed-${VERSION}
-PKGNAME= ${DISTNAME}p4
+PKGNAME= ${DISTNAME}p0
+SHARED_LIBS+= sylph-0 0.1
+SHARED_LIBS+= sylpheed-plugin-0 0.1
CATEGORIES= mail news x11
HOMEPAGE= http://sylpheed.sraoss.jp/en
diff -uNPr -x CVS sylpheed/distinfo sylpheed-new/distinfo
--- sylpheed/distinfo Tue Jan 5 20:36:12 2010
+++ sylpheed-new/distinfo Tue Jan 5 20:35:15 2010
@@ -1,5 +1,5 @@
-MD5 (sylpheed-2.5.0.tar.gz) = sbzL8Yeb1u23mlIRoL0SPA==
-RMD160 (sylpheed-2.5.0.tar.gz) = xtLk6Gw8PWE2mpvpn268yFfNzxs=
-SHA1 (sylpheed-2.5.0.tar.gz) = zYMc9f5oyc3NEJiHtYuINJKV2+o=
-SHA256 (sylpheed-2.5.0.tar.gz) = NfEid/xUWEb9jK7zONSQ0fOYZ87Et7NCxORRYmD89o4=
-SIZE (sylpheed-2.5.0.tar.gz) = 4203799
+MD5 (sylpheed-2.7.1.tar.gz) = QF+8lSmNzs9Ut0LncjbO3Q==
+RMD160 (sylpheed-2.7.1.tar.gz) = Po6DN2wf35evn0Ruk6kdBiRP9ng=
+SHA1 (sylpheed-2.7.1.tar.gz) = 9JYyZPWwFGE85unLttlNVqZj3M4=
+SHA256 (sylpheed-2.7.1.tar.gz) = 65RBUfVdBvQExEChFvGZfRuGbyK1bUzdc21iNJH2Yyo=
+SIZE (sylpheed-2.7.1.tar.gz) = 4340355
diff -uNPr -x CVS sylpheed/patches/patch-libsylph_mbox_c
sylpheed-new/patches/patch-libsylph_mbox_c
--- sylpheed/patches/patch-libsylph_mbox_c Tue Nov 6 22:18:10 2007
+++ sylpheed-new/patches/patch-libsylph_mbox_c Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
-$OpenBSD: patch-libsylph_mbox_c,v 1.2 2007/11/06 21:18:10 rui Exp $
---- libsylph/mbox.c.orig Thu Feb 8 01:40:46 2007
-+++ libsylph/mbox.c Fri Nov 2 15:06:59 2007
-@@ -42,7 +42,9 @@
- #include "account.h"
- #include "utils.h"
-
--#define MSGBUFSIZE 8192
-+#ifndef MSGBUFSIZE
-+# define MSGBUFSIZE 8192
-+#endif
-
- #define FPUTS_TO_TMP_ABORT_IF_FAIL(s) \
- { \
diff -uNPr -x CVS sylpheed/patches/patch-libsylph_procmime_c
sylpheed-new/patches/patch-libsylph_procmime_c
--- sylpheed/patches/patch-libsylph_procmime_c Tue Nov 6 22:18:10 2007
+++ sylpheed-new/patches/patch-libsylph_procmime_c Tue Jan 5 20:35:15 2010
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libsylph_procmime_c,v 1.4 2007/11/06 21:18:10 rui Exp $
---- libsylph/procmime.c.orig Tue May 15 04:34:23 2007
-+++ libsylph/procmime.c Fri Nov 2 15:06:59 2007
-@@ -1391,7 +1391,7 @@ static GHashTable *procmime_get_mime_type_table(void)
+$OpenBSD$
+--- libsylph/procmime.c.orig Fri Jan 1 19:36:51 2010
++++ libsylph/procmime.c Fri Jan 1 19:37:41 2010
+@@ -1477,7 +1477,7 @@ static GHashTable *procmime_get_mime_type_table(void)
procmime_get_mime_type_list(SYSCONFDIR "/mime.types");
if (!mime_type_list)
mime_type_list =
diff -uNPr -x CVS sylpheed/patches/patch-libsylph_smtp_h
sylpheed-new/patches/patch-libsylph_smtp_h
--- sylpheed/patches/patch-libsylph_smtp_h Tue Nov 6 22:18:10 2007
+++ sylpheed-new/patches/patch-libsylph_smtp_h Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
-$OpenBSD: patch-libsylph_smtp_h,v 1.2 2007/11/06 21:18:10 rui Exp $
---- libsylph/smtp.h.orig Tue Nov 21 05:51:33 2006
-+++ libsylph/smtp.h Fri Nov 2 15:06:59 2007
-@@ -33,7 +33,9 @@ typedef struct _SMTPSession SMTPSession;
-
- #define SMTP_SESSION(obj) ((SMTPSession *)obj)
-
--#define MSGBUFSIZE 8192
-+#ifndef MSGBUFSIZE
-+# define MSGBUFSIZE 8192
-+#endif
-
- typedef enum
- {
diff -uNPr -x CVS sylpheed/patches/patch-src_addr_compl_c
sylpheed-new/patches/patch-src_addr_compl_c
--- sylpheed/patches/patch-src_addr_compl_c Tue Oct 28 18:03:15 2008
+++ sylpheed-new/patches/patch-src_addr_compl_c Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_addr_compl_c,v 1.1 2008/10/28 17:03:15 landry Exp $
---- src/addr_compl.c.orig Tue Oct 28 17:32:02 2008
-+++ src/addr_compl.c Tue Oct 28 17:32:18 2008
-@@ -26,6 +26,7 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
-+#include <gtk/gtk.h>
- #include <gtk/gtkmain.h>
- #include <gtk/gtkwindow.h>
- #include <gtk/gtkentry.h>
diff -uNPr -x CVS sylpheed/patches/patch-src_compose_c
sylpheed-new/patches/patch-src_compose_c
--- sylpheed/patches/patch-src_compose_c Sat Nov 15 11:41:15 2008
+++ sylpheed-new/patches/patch-src_compose_c Thu Jan 1 01:00:00 1970
@@ -1,120 +0,0 @@
-$OpenBSD: patch-src_compose_c,v 1.1 2008/11/15 10:41:15 ajacoutot Exp $
---- src/compose.c.orig Fri May 16 11:23:12 2008
-+++ src/compose.c Thu Nov 13 18:35:10 2008
-@@ -69,8 +69,12 @@
- #if USE_GTKSPELL
- # include <gtk/gtkradiomenuitem.h>
- # include <gtkspell/gtkspell.h>
-+#if USE_ENCHANT
-+# include <enchant/enchant.h>
-+#else
- # include <aspell.h>
- #endif
-+#endif
-
- #include <stdio.h>
- #include <stdlib.h>
-@@ -5296,6 +5300,7 @@ static Compose *compose_create(PrefsAccount *account,
- compose->check_spell = prefs_common.check_spell;
- compose->spell_lang = g_strdup(prefs_common.spell_lang);
- compose->spell_menu = spell_menu;
-+ compose->dict_list = NULL;
- #endif /* USE_GTKSPELL */
-
- compose->focused_editable = NULL;
-@@ -5732,8 +5737,37 @@ static void compose_set_out_encoding(Compose *compose)
- }
-
- #if USE_GTKSPELL
-+#if USE_ENCHANT
-+static void ench_dict_desc_cb(const char *const lang_tag,
-+ const char *const provider_name,
-+ const char *const provider_desc,
-+ const char *const provider_file,
-+ void *user_data)
-+{
-+ GSList **dict_list = (GSList **)user_data;
-+ *dict_list = g_slist_append(*dict_list, g_strdup((gchar*)lang_tag));
-+}
-+
- static void compose_set_spell_lang_menu(Compose *compose)
- {
-+ EnchantBroker *eb;
-+ GSList *dict_list = NULL, *menu_list = NULL, *cur;
-+ GtkWidget *menu;
-+ gboolean lang_set = FALSE;
-+
-+ eb = enchant_broker_init();
-+ enchant_broker_list_dicts(eb, ench_dict_desc_cb, &dict_list);
-+ enchant_broker_free(eb);
-+
-+ for (cur = dict_list; cur != NULL; cur = cur->next) {
-+ if (compose->spell_lang != NULL &&
-+ g_ascii_strcasecmp(compose->spell_lang,
-+ (gchar *)cur->data) == 0)
-+ lang_set = TRUE;
-+ }
-+#else /* !USE_ENCHANT */
-+static void compose_set_spell_lang_menu(Compose *compose)
-+{
- AspellConfig *config;
- AspellDictInfoList *dlist;
- AspellDictInfoEnumeration *dels;
-@@ -5748,13 +5782,16 @@ static void compose_set_spell_lang_menu(Compose *compo
-
- dels = aspell_dict_info_list_elements(dlist);
- while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
-- dict_list = g_slist_append(dict_list, (gchar *)entry->name);
-+ dict_list = g_slist_append(dict_list, g_strdup(entry->name));
- if (compose->spell_lang != NULL &&
- g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0)
- lang_set = TRUE;
- }
- delete_aspell_dict_info_enumeration(dels);
-+#endif /* USE_ENCHANT */
-
-+ compose->dict_list = dict_list;
-+
- menu = gtk_menu_new();
-
- for (cur = dict_list; cur != NULL; cur = cur->next) {
-@@ -5777,15 +5814,18 @@ static void compose_set_spell_lang_menu(Compose *compo
- g_object_set_data(G_OBJECT(item), "spell-lang", dict);
- gtk_widget_show(item);
-
-- if (!lang_set && g_ascii_strcasecmp("en", dict) == 0)
-+ if (!lang_set && g_ascii_strcasecmp("en", dict) == 0) {
-+ g_free(compose->spell_lang);
-+ compose->spell_lang = g_strdup("en");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(item), TRUE);
-+ }
- }
-
- gtk_widget_show(menu);
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->spell_menu), menu);
- }
--#endif
-+#endif /* USE_GTKSPELL */
-
- static void compose_set_template_menu(Compose *compose)
- {
-@@ -5924,6 +5964,8 @@ static void compose_destroy(Compose *compose)
- address_completion_end(compose->window);
-
- #if USE_GTKSPELL
-+ slist_free_strings(compose->dict_list);
-+ g_slist_free(compose->dict_list);
- g_free(compose->spell_lang);
- #endif
-
-@@ -7505,7 +7547,8 @@ static void compose_toggle_spell_cb(gpointer data, gui
- GtkSpell *speller;
-
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
-- debug_print("Spell checking enabled\n");
-+ debug_print("Spell checking enabled: %s\n",
-+ compose->spell_lang ? compose->spell_lang :
"(none)");
- speller = gtkspell_new_attach(GTK_TEXT_VIEW(compose->text),
- compose->spell_lang, NULL);
- compose->check_spell = TRUE;
diff -uNPr -x CVS sylpheed/patches/patch-src_compose_h
sylpheed-new/patches/patch-src_compose_h
--- sylpheed/patches/patch-src_compose_h Sat Nov 15 11:41:15 2008
+++ sylpheed-new/patches/patch-src_compose_h Thu Jan 1 01:00:00 1970
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_compose_h,v 1.1 2008/11/15 10:41:15 ajacoutot Exp $
---- src/compose.h.orig Thu May 8 10:37:28 2008
-+++ src/compose.h Thu Nov 13 18:35:10 2008
-@@ -1,6 +1,6 @@
- /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
-- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
-+ * Copyright (C) 1999-2008 Hiroyuki Yamamoto
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
-@@ -133,9 +133,10 @@ struct _Compose
- GtkWidget *tmpl_menu;
-
- #if USE_GTKSPELL
-- GtkWidget *spell_menu;
-- gchar *spell_lang;
-- gboolean check_spell;
-+ GtkWidget *spell_menu;
-+ gchar *spell_lang;
-+ gboolean check_spell;
-+ GSList *dict_list;
- #endif
-
- ComposeMode mode;
diff -uNPr -x CVS sylpheed/patches/patch-src_editgroup_c
sylpheed-new/patches/patch-src_editgroup_c
--- sylpheed/patches/patch-src_editgroup_c Tue Oct 28 18:03:15 2008
+++ sylpheed-new/patches/patch-src_editgroup_c Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_editgroup_c,v 1.1 2008/10/28 17:03:15 landry Exp $
---- src/editgroup.c.orig Tue Oct 28 17:32:33 2008
-+++ src/editgroup.c Tue Oct 28 17:32:49 2008
-@@ -26,6 +26,7 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
-+#include <gtk/gtk.h>
- #include <gtk/gtkwindow.h>
- #include <gtk/gtkclist.h>
- #include <gtk/gtkvbox.h>
diff -uNPr -x CVS sylpheed/patches/patch-src_inc_c
sylpheed-new/patches/patch-src_inc_c
--- sylpheed/patches/patch-src_inc_c Tue Oct 28 18:03:15 2008
+++ sylpheed-new/patches/patch-src_inc_c Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_inc_c,v 1.7 2008/10/28 17:03:15 landry Exp $
---- src/inc.c.orig Thu Sep 20 04:27:39 2007
-+++ src/inc.c Tue Oct 28 16:54:06 2008
-@@ -69,7 +69,9 @@ static GdkPixbuf *current_pixbuf;
- static GdkPixbuf *error_pixbuf;
- static GdkPixbuf *ok_pixbuf;
-
--#define MSGBUFSIZE 8192
-+#ifndef MSGBUFSIZE
-+# define MSGBUFSIZE 8192
-+#endif
-
- static void inc_finished (MainWindow *mainwin,
- gint new_messages);
diff -uNPr -x CVS sylpheed/patches/patch-src_prefs_display_items_c
sylpheed-new/patches/patch-src_prefs_display_items_c
--- sylpheed/patches/patch-src_prefs_display_items_c Tue Oct 28 18:03:15 2008
+++ sylpheed-new/patches/patch-src_prefs_display_items_c Thu Jan 1
01:00:00 1970
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_prefs_display_items_c,v 1.1 2008/10/28 17:03:15 landry Exp
$
---- src/prefs_display_items.c.orig Tue Oct 28 17:30:44 2008
-+++ src/prefs_display_items.c Tue Oct 28 17:30:58 2008
-@@ -25,6 +25,7 @@
-
- #include <glib.h>
- #include <glib/gi18n.h>
-+#include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- #include <gtk/gtkmain.h>
- #include <gtk/gtkwindow.h>
diff -uNPr -x CVS sylpheed/patches/patch-src_prefs_summary_column_c
sylpheed-new/patches/patch-src_prefs_summary_column_c
--- sylpheed/patches/patch-src_prefs_summary_column_c Tue Oct 28 18:03:15 2008
+++ sylpheed-new/patches/patch-src_prefs_summary_column_c Thu Jan 1
01:00:00 1970
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_prefs_summary_column_c,v 1.1 2008/10/28 17:03:15 landry
Exp $
---- src/prefs_summary_column.c.orig Tue Oct 28 17:31:14 2008
-+++ src/prefs_summary_column.c Tue Oct 28 17:31:32 2008
-@@ -26,6 +26,7 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
-+#include <gtk/gtk.h>
- #include <gtk/gtkmain.h>
- #include <gtk/gtkwindow.h>
- #include <gtk/gtkvbox.h>
diff -uNPr -x CVS sylpheed/patches/patch-src_select-keys_c
sylpheed-new/patches/patch-src_select-keys_c
--- sylpheed/patches/patch-src_select-keys_c Thu Oct 30 19:23:50 2008
+++ sylpheed-new/patches/patch-src_select-keys_c Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_select-keys_c,v 1.1 2008/10/30 18:23:50 landry Exp $
---- src/select-keys.c.orig Thu Oct 30 19:16:28 2008
-+++ src/select-keys.c Thu Oct 30 19:16:44 2008
-@@ -27,6 +27,7 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
-+#include <gtk/gtk.h>
- #include <gtk/gtkmain.h>
- #include <gtk/gtkwidget.h>
- #include <gtk/gtkwindow.h>
diff -uNPr -x CVS sylpheed/pkg/PFRAG.shared sylpheed-new/pkg/PFRAG.shared
--- sylpheed/pkg/PFRAG.shared Thu Jan 1 01:00:00 1970
+++ sylpheed-new/pkg/PFRAG.shared Tue Jan 5 20:35:15 2010
@@ -0,0 +1,3 @@
+...@comment $OpenBSD$
+...@lib lib/libsylph-0.so.${LIBsylph-0_VERSION}
+...@lib lib/libsylpheed-plugin-0.so.${LIBsylpheed-plugin-0_VERSION}
diff -uNPr -x CVS sylpheed/pkg/PLIST sylpheed-new/pkg/PLIST
--- sylpheed/pkg/PLIST Mon Dec 21 23:20:12 2009
+++ sylpheed-new/pkg/PLIST Tue Jan 5 20:35:15 2010
@@ -1,5 +1,51 @@
-...@comment $OpenBSD: PLIST,v 1.31 2009/12/21 22:20:12 ajacoutot Exp $
+...@comment $OpenBSD: PLIST,v 1.30 2008/10/28 17:03:15 landry Exp $
+%%SHARED%%
@bin bin/sylpheed
+include/sylpheed/
+include/sylpheed/plugin.h
+include/sylpheed/sylph/
+include/sylpheed/sylph/account.h
+include/sylpheed/sylph/base64.h
+include/sylpheed/sylph/codeconv.h
+include/sylpheed/sylph/customheader.h
+include/sylpheed/sylph/defs.h
+include/sylpheed/sylph/displayheader.h
+include/sylpheed/sylph/enums.h
+include/sylpheed/sylph/filter.h
+include/sylpheed/sylph/folder.h
+include/sylpheed/sylph/html.h
+include/sylpheed/sylph/imap.h
+include/sylpheed/sylph/mbox.h
+include/sylpheed/sylph/md5.h
+include/sylpheed/sylph/md5_hmac.h
+include/sylpheed/sylph/mh.h
+include/sylpheed/sylph/news.h
+include/sylpheed/sylph/nntp.h
+include/sylpheed/sylph/pop.h
+include/sylpheed/sylph/prefs.h
+include/sylpheed/sylph/prefs_account.h
+include/sylpheed/sylph/prefs_common.h
+include/sylpheed/sylph/procheader.h
+include/sylpheed/sylph/procmime.h
+include/sylpheed/sylph/procmsg.h
+include/sylpheed/sylph/quoted-printable.h
+include/sylpheed/sylph/recv.h
+include/sylpheed/sylph/session.h
+include/sylpheed/sylph/smtp.h
+include/sylpheed/sylph/socket.h
+include/sylpheed/sylph/ssl.h
+include/sylpheed/sylph/stringtable.h
+include/sylpheed/sylph/syl-marshal.h
+include/sylpheed/sylph/sylmain.h
+include/sylpheed/sylph/unmime.h
+include/sylpheed/sylph/utils.h
+include/sylpheed/sylph/uuencode.h
+include/sylpheed/sylph/virtual.h
+include/sylpheed/sylph/xml.h
+lib/libsylph-0.a
+lib/libsylph-0.la
+lib/libsylpheed-plugin-0.a
+lib/libsylpheed-plugin-0.la
share/applications/sylpheed.desktop
share/locale/be/LC_MESSAGES/sylpheed.mo
share/locale/bg/LC_MESSAGES/sylpheed.mo
@@ -103,6 +149,7 @@
share/sylpheed/manual/ja/sylpheed-22.html
share/sylpheed/manual/ja/sylpheed-23.html
share/sylpheed/manual/ja/sylpheed-24.html
+share/sylpheed/manual/ja/sylpheed-25.html
share/sylpheed/manual/ja/sylpheed-3.html
share/sylpheed/manual/ja/sylpheed-4.html
share/sylpheed/manual/ja/sylpheed-5.html
@@ -113,4 +160,4 @@
share/sylpheed/manual/ja/sylpheed.html
share/sylpheed/manual/ja/sylpheed.sgml
@exec %D/bin/update-desktop-database
-...@unexec-delete %D/bin/update-desktop-database
+...@unexec %D/bin/update-desktop-database
