diff options
-rw-r--r-- | mail/sylpheed/Makefile | 6 | ||||
-rw-r--r-- | mail/sylpheed/distinfo | 15 | ||||
-rw-r--r-- | mail/sylpheed/patches/patch-aa | 85 | ||||
-rw-r--r-- | mail/sylpheed/patches/patch-ab | 12 | ||||
-rw-r--r-- | mail/sylpheed/patches/patch-ac | 12 | ||||
-rw-r--r-- | mail/sylpheed/patches/patch-ad | 12 | ||||
-rw-r--r-- | mail/sylpheed/patches/patch-ae | 12 | ||||
-rw-r--r-- | mail/sylpheed/patches/patch-af | 12 | ||||
-rw-r--r-- | mail/sylpheed/patches/patch-ag | 12 |
9 files changed, 7 insertions, 171 deletions
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 5a3f81dcec9..f818638dc9d 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.113 2008/06/29 11:38:32 tnn Exp $ +# $NetBSD: Makefile,v 1.114 2008/12/23 22:45:00 ahoka Exp $ -DISTNAME= sylpheed-2.5.0 +DISTNAME= sylpheed-2.6.0 CATEGORIES= mail news x11 -MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v2.5/ +MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v2.6/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= chris@NetBSD.org diff --git a/mail/sylpheed/distinfo b/mail/sylpheed/distinfo index 1b059106260..a49b100334e 100644 --- a/mail/sylpheed/distinfo +++ b/mail/sylpheed/distinfo @@ -1,12 +1,5 @@ -$NetBSD: distinfo,v 1.64 2008/10/18 18:32:18 tnn Exp $ +$NetBSD: distinfo,v 1.65 2008/12/23 22:45:00 ahoka Exp $ -SHA1 (sylpheed-2.5.0.tar.bz2) = d6384669b720c361d1761bbcc5d426e69a1d2bd4 -RMD160 (sylpheed-2.5.0.tar.bz2) = 7514a6b49b4cc399c7926dd4a011bce9566e5971 -Size (sylpheed-2.5.0.tar.bz2) = 2762950 bytes -SHA1 (patch-aa) = 30305efb899b511b0b3aff50377c7d1b9d6176a8 -SHA1 (patch-ab) = 465f69e8cee24da06089e24eefd3963908aa04be -SHA1 (patch-ac) = a24840af4d52c6bdc750dbc9b076f5fbd4f25690 -SHA1 (patch-ad) = 346dab88b4c4cfd9c50ae8dcc074d4de74ec6d32 -SHA1 (patch-ae) = a3cbd0c99a5eee72f30d853b3686124b6f1d8b3e -SHA1 (patch-af) = a28663b1210e688987c3df0837663a4172e63969 -SHA1 (patch-ag) = 54a58f757da11f3b68d59866d0ee3e297f57ca02 +SHA1 (sylpheed-2.6.0.tar.bz2) = 122fe608b5a7cb5a262da65908b1f5cf67a0123f +RMD160 (sylpheed-2.6.0.tar.bz2) = a4eb3b11d297dce1c42c23ceb553680b0942d75c +Size (sylpheed-2.6.0.tar.bz2) = 2833188 bytes diff --git a/mail/sylpheed/patches/patch-aa b/mail/sylpheed/patches/patch-aa deleted file mode 100644 index 3c047c202cb..00000000000 --- a/mail/sylpheed/patches/patch-aa +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2008/06/29 11:38:32 tnn Exp $ - ---- src/compose.c.orig 2008-05-16 11:23:12.000000000 +0200 -+++ src/compose.c -@@ -69,7 +69,7 @@ - #if USE_GTKSPELL - # include <gtk/gtkradiomenuitem.h> - # include <gtkspell/gtkspell.h> --# include <aspell.h> -+# include <enchant/enchant.h> - #endif - - #include <stdio.h> -@@ -5295,6 +5295,7 @@ static Compose *compose_create(PrefsAcco - #ifdef USE_GTKSPELL - compose->check_spell = prefs_common.check_spell; - compose->spell_lang = g_strdup(prefs_common.spell_lang); -+ compose->spell_dict_list = NULL; - compose->spell_menu = spell_menu; - #endif /* USE_GTKSPELL */ - -@@ -5734,26 +5735,30 @@ static void compose_set_out_encoding(Com - #if USE_GTKSPELL - static void compose_set_spell_lang_menu(Compose *compose) - { -- AspellConfig *config; -- AspellDictInfoList *dlist; -- AspellDictInfoEnumeration *dels; -- const AspellDictInfo *entry; -+ EnchantBroker* eb; - GSList *dict_list = NULL, *menu_list = NULL, *cur; - GtkWidget *menu; - gboolean lang_set = FALSE; - -- config = new_aspell_config(); -- dlist = get_aspell_dict_info_list(config); -- delete_aspell_config(config); -- -- 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); -- if (compose->spell_lang != NULL && -- g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0) -- lang_set = TRUE; -+ void enchDictDescCb (const char * const lang_tag, -+ const char * const provider_name, -+ const char * const provider_desc, -+ const char * const provider_file, -+ void * user_data) -+ { -+ dict_list = g_slist_append(dict_list, g_strdup((gchar*)lang_tag)); -+ } -+ -+ eb = enchant_broker_init(); -+ enchant_broker_list_dicts (eb, enchDictDescCb, &dict_list); -+ compose->spell_dict_list = 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, cur->data) == 0) -+ lang_set = TRUE; - } -- delete_aspell_dict_info_enumeration(dels); - - menu = gtk_menu_new(); - -@@ -5913,6 +5918,7 @@ static void compose_destroy(Compose *com - AttachInfo *ainfo; - GtkTextBuffer *buffer; - GtkClipboard *clipboard; -+ GSList *cur; - - compose_list = g_list_remove(compose_list, compose); - -@@ -5924,6 +5930,9 @@ static void compose_destroy(Compose *com - address_completion_end(compose->window); - - #if USE_GTKSPELL -+ for (cur = compose->spell_dict_list; cur!=NULL; cur = cur->next) { -+ g_free((gchar*)cur->data); -+ } - g_free(compose->spell_lang); - #endif - diff --git a/mail/sylpheed/patches/patch-ab b/mail/sylpheed/patches/patch-ab deleted file mode 100644 index 216e0dd38aa..00000000000 --- a/mail/sylpheed/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2008/06/29 11:38:32 tnn Exp $ - ---- src/compose.h.orig 2008-05-08 10:37:28.000000000 +0200 -+++ src/compose.h -@@ -135,6 +135,7 @@ struct _Compose - #if USE_GTKSPELL - GtkWidget *spell_menu; - gchar *spell_lang; -+ GSList *spell_dict_list; - gboolean check_spell; - #endif - diff --git a/mail/sylpheed/patches/patch-ac b/mail/sylpheed/patches/patch-ac deleted file mode 100644 index 7c43a29f4d8..00000000000 --- a/mail/sylpheed/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2008/10/18 18:32:18 tnn Exp $ - ---- src/addr_compl.c.orig 2008-03-13 08:15:07.000000000 +0100 -+++ src/addr_compl.c -@@ -30,6 +30,7 @@ - #include <gtk/gtkwindow.h> - #include <gtk/gtkentry.h> - #include <gtk/gtkeditable.h> -+#include <gtk/gtkctree.h> - #include <gtk/gtkclist.h> - #include <gtk/gtkscrolledwindow.h> - diff --git a/mail/sylpheed/patches/patch-ad b/mail/sylpheed/patches/patch-ad deleted file mode 100644 index 1d0199e5cfe..00000000000 --- a/mail/sylpheed/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2008/10/18 18:32:18 tnn Exp $ - ---- src/editgroup.c.orig 2007-03-28 03:30:15.000000000 +0200 -+++ src/editgroup.c -@@ -27,6 +27,7 @@ - #include <glib/gi18n.h> - #include <gdk/gdkkeysyms.h> - #include <gtk/gtkwindow.h> -+#include <gtk/gtkctree.h> - #include <gtk/gtkclist.h> - #include <gtk/gtkvbox.h> - #include <gtk/gtkstatusbar.h> diff --git a/mail/sylpheed/patches/patch-ae b/mail/sylpheed/patches/patch-ae deleted file mode 100644 index 01d5b7a7d1c..00000000000 --- a/mail/sylpheed/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2008/10/18 18:32:18 tnn Exp $ - ---- src/prefs_display_items.c.orig 2007-09-20 04:17:58.000000000 +0200 -+++ src/prefs_display_items.c -@@ -30,6 +30,7 @@ - #include <gtk/gtkwindow.h> - #include <gtk/gtkvbox.h> - #include <gtk/gtkhbox.h> -+#include <gtk/gtkctree.h> - #include <gtk/gtkclist.h> - #include <gtk/gtkbutton.h> - #include <gtk/gtkstock.h> diff --git a/mail/sylpheed/patches/patch-af b/mail/sylpheed/patches/patch-af deleted file mode 100644 index d215f1c1d21..00000000000 --- a/mail/sylpheed/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.1 2008/10/18 18:32:18 tnn Exp $ - ---- src/prefs_summary_column.c.orig 2007-09-12 08:56:55.000000000 +0200 -+++ src/prefs_summary_column.c -@@ -30,6 +30,7 @@ - #include <gtk/gtkwindow.h> - #include <gtk/gtkvbox.h> - #include <gtk/gtkhbox.h> -+#include <gtk/gtkctree.h> - #include <gtk/gtkclist.h> - #include <gtk/gtkbutton.h> - #include <gtk/gtkstock.h> diff --git a/mail/sylpheed/patches/patch-ag b/mail/sylpheed/patches/patch-ag deleted file mode 100644 index a7884cb9996..00000000000 --- a/mail/sylpheed/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2008/10/18 18:32:18 tnn Exp $ - ---- src/select-keys.c.orig 2008-05-16 11:19:55.000000000 +0200 -+++ src/select-keys.c -@@ -33,6 +33,7 @@ - #include <gtk/gtkscrolledwindow.h> - #include <gtk/gtkvbox.h> - #include <gtk/gtkhbox.h> -+#include <gtk/gtkctree.h> - #include <gtk/gtkclist.h> - #include <gtk/gtklabel.h> - #include <gtk/gtkentry.h> |