diff options
author | Daniel Gryniewicz <dang@gentoo.org> | 2006-11-17 18:14:20 +0000 |
---|---|---|
committer | Daniel Gryniewicz <dang@gentoo.org> | 2006-11-17 18:14:20 +0000 |
commit | 0b6e77a0a070cd2593f86bb0f9a3373f19da69fd (patch) | |
tree | 7b6681261d1283e4cfa3cc5e97c741f240b3ba13 /app-text/gtkspell/files | |
parent | Add dep on pkgconfig for bug #155002; clean up old version (diff) | |
download | gentoo-2-0b6e77a0a070cd2593f86bb0f9a3373f19da69fd.tar.gz gentoo-2-0b6e77a0a070cd2593f86bb0f9a3373f19da69fd.tar.bz2 gentoo-2-0b6e77a0a070cd2593f86bb0f9a3373f19da69fd.zip |
Add dep on pkgconfig for bug #155002; clean up old version
(Portage version: 2.1.2_rc1-r7)
(Signed Manifest commit)
Diffstat (limited to 'app-text/gtkspell/files')
-rw-r--r-- | app-text/gtkspell/files/digest-gtkspell-2.0.11 | 3 | ||||
-rw-r--r-- | app-text/gtkspell/files/gtkspell-2.0.10-enchant.patch | 266 |
2 files changed, 0 insertions, 269 deletions
diff --git a/app-text/gtkspell/files/digest-gtkspell-2.0.11 b/app-text/gtkspell/files/digest-gtkspell-2.0.11 deleted file mode 100644 index f4af17382c66..000000000000 --- a/app-text/gtkspell/files/digest-gtkspell-2.0.11 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 494869f67146a12a3f17a958f51aeb05 gtkspell-2.0.11.tar.gz 347172 -RMD160 c5ca1804807f445e246de2b384448a7c7c76855f gtkspell-2.0.11.tar.gz 347172 -SHA256 521d6be1e1236706cd491305b10f01d989bf47787ca97242c56c0d2b038e6a12 gtkspell-2.0.11.tar.gz 347172 diff --git a/app-text/gtkspell/files/gtkspell-2.0.10-enchant.patch b/app-text/gtkspell/files/gtkspell-2.0.10-enchant.patch deleted file mode 100644 index ec02ba4e7ce9..000000000000 --- a/app-text/gtkspell/files/gtkspell-2.0.10-enchant.patch +++ /dev/null @@ -1,266 +0,0 @@ -diff -ru gtkspell-2.0.10/configure.ac egspell/configure.ac ---- gtkspell-2.0.10/configure.ac 2005-02-27 10:48:18.000000000 -0500 -+++ egspell/configure.ac 2005-05-23 12:23:01.193537669 -0400 -@@ -4,18 +4,12 @@ - AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) - AC_CONFIG_HEADERS([config.h]) - --AC_CHECK_HEADER(aspell.h, [AC_DEFINE(HAVE_ASPELL_H,1, -- [Define to 1 if you have the <aspell.h> header file.] )] ) --AC_CHECK_HEADER(pspell/pspell.h, [AC_DEFINE(HAVE_PSPELL_H,1, -- [Define to 1 if you have the <pspell/pspell.h> header file.] )] ) --AC_CHECK_LIB(aspell, new_aspell_speller, SPELLER_LIB="-laspell", -- [AC_CHECK_LIB(pspell, new_pspell_manager, SPELLER_LIB="-lpspell", -- [AC_MSG_ERROR([You must have the aspell or pspell dev libraries to build gtkspell.]) ] ) ] ) -+SPELLER_LIB=-lenchant - - AC_SUBST(SPELLER_LIB) - GTKSPELL_PACKAGES=gtk+-2.0 - AC_SUBST(GTKSPELL_PACKAGES) --PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES) -+PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant >= 0.4.0 ) - AC_SUBST(GTKSPELL_CFLAGS) - AC_SUBST(GTKSPELL_LIBS) - -diff -ru gtkspell-2.0.10/gtkspell/gtkspell.c egspell/gtkspell/gtkspell.c ---- gtkspell-2.0.10/gtkspell/gtkspell.c 2005-02-27 10:53:26.000000000 -0500 -+++ egspell/gtkspell/gtkspell.c 2005-05-23 12:53:31.615836490 -0400 -@@ -14,37 +14,11 @@ - - #define GTKSPELL_MISSPELLED_TAG "gtkspell-misspelled" - --#ifdef HAVE_ASPELL_H -- #define USING_ASPELL -- #include <aspell.h> --#elif defined HAVE_PSPELL_H -- #define USING_PSPELL -- #include <pspell/pspell.h> -- #define AspellSpeller PspellManager -- #define speller manager -- #define aspell_speller_check pspell_manager_check -- #define aspell_speller_add_to_session pspell_manager_add_to_session -- #define aspell_speller_add_to_personal pspell_manager_add_to_personal -- #define aspell_speller_save_all_word_lists pspell_manager_save_all_word_lists -- #define aspell_speller_store_replacement pspell_manager_store_replacement -- #define AspellWordList PspellWordList -- #define AspellStringEnumeration PspellStringEmulation -- #define aspell_speller_suggest pspell_manager_suggest -- #define aspell_word_list_elements pspell_word_list_elements -- #define aspell_string_enumeration_next pspell_string_emulation_next -- #define delete_aspell_string_enumeration delete_pspell_string_emulation -- #define AspellConfig PspellConfig -- #define AspellCanHaveError PspellCanHaveError -- #define new_aspell_config new_pspell_config -- #define aspell_config_replace pspell_config_replace -- #define new_aspell_speller new_pspell_manager -- #define delete_aspell_config delete_pspell_config -- #define aspell_error_message pspell_error_message -- #define delete_aspell_speller delete_pspell_manager -- #define to_aspell_speller to_pspell_manager -- #define aspell_error_number pspell_error_number -- #define aspell pspell --#endif -+#include <enchant.h> -+ -+/* prepare for gettext internationalization */ -+#undef _ -+#define _(x) x - - const int debug = 0; - const int quiet = 0; -@@ -55,7 +29,8 @@ - GtkTextMark *mark_insert_start; - GtkTextMark *mark_insert_end; - gboolean deferred_check; -- AspellSpeller *speller; -+ EnchantBroker *broker; -+ EnchantDict *speller; - GtkTextMark *mark_click; - }; - -@@ -126,10 +101,12 @@ - check_word(GtkSpell *spell, GtkTextBuffer *buffer, - GtkTextIter *start, GtkTextIter *end) { - char *text; -+ if (!spell->speller) -+ return; - text = gtk_text_buffer_get_text(buffer, start, end, FALSE); - if (debug) g_print("checking: %s\n", text); - if (g_unichar_isdigit(*text) == FALSE) /* don't check numbers */ -- if (aspell_speller_check(spell->speller, text, -1) == FALSE) -+ if (enchant_dict_check(spell->speller, text, strlen(text)) != 0) - gtk_text_buffer_apply_tag(buffer, spell->tag_highlight, start, end); - g_free(text); - } -@@ -304,8 +281,7 @@ - get_word_extents_from_mark(buffer, &start, &end, spell->mark_click); - word = gtk_text_buffer_get_text(buffer, &start, &end, FALSE); - -- aspell_speller_add_to_personal(spell->speller, word, strlen(word)); -- aspell_speller_save_all_word_lists(spell->speller); -+ enchant_dict_add_to_pwl( spell->speller, word, strlen(word)); - - gtkspell_recheck_all(spell); - -@@ -323,7 +299,7 @@ - get_word_extents_from_mark(buffer, &start, &end, spell->mark_click); - word = gtk_text_buffer_get_text(buffer, &start, &end, FALSE); - -- aspell_speller_add_to_session(spell->speller, word, strlen(word)); -+ enchant_dict_add_to_session(spell->speller, word, strlen(word)); - - gtkspell_recheck_all(spell); - -@@ -337,6 +313,9 @@ - GtkTextIter start, end; - GtkTextBuffer *buffer; - -+ if (!spell->speller) -+ return; -+ - buffer = gtk_text_view_get_buffer(spell->view); - - get_word_extents_from_mark(buffer, &start, &end, spell->mark_click); -@@ -352,33 +331,33 @@ - gtk_text_buffer_delete(buffer, &start, &end); - gtk_text_buffer_insert(buffer, &start, newword, -1); - -- aspell_speller_store_replacement(spell->speller, -+ enchant_dict_store_replacement(spell->speller, - oldword, strlen(oldword), - newword, strlen(newword)); - - g_free(oldword); - } - --GtkWidget* -+static GtkWidget* - build_suggestion_menu(GtkSpell *spell, GtkTextBuffer *buffer, - const char *word) { - const char *suggestion; - GtkWidget *topmenu, *menu; - GtkWidget *mi; - GtkWidget *hbox; -- int count = 0; - void *spelldata; -- const AspellWordList *suggestions; -- AspellStringEnumeration *elements; -+ char **suggestions; -+ size_t n_suggs, i; - char *label; - - topmenu = menu = gtk_menu_new(); - -- suggestions = aspell_speller_suggest(spell->speller, word, -1); -- elements = aspell_word_list_elements(suggestions); -+ if (!spell->speller) -+ return topmenu; - -- suggestion = aspell_string_enumeration_next(elements); -- if (suggestion == NULL) { -+ suggestions = enchant_dict_suggest(spell->speller, word, strlen(word), &n_suggs); -+ -+ if (suggestions == NULL || !n_suggs) { - /* no suggestions. put something in the menu anyway... */ - GtkWidget *label; - label = gtk_label_new(""); -@@ -390,8 +369,8 @@ - gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), mi); - } else { - /* build a set of menus with suggestions. */ -- while (suggestion != NULL) { -- if (count == 10) { -+ for (i = 0; i < n_suggs; i++ ) { -+ if (i > 0 && i % 10 == 0) { - mi = gtk_menu_item_new(); - gtk_widget_show(mi); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); -@@ -402,19 +381,16 @@ - - menu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), menu); -- count = 0; - } -- mi = gtk_menu_item_new_with_label(suggestion); -+ mi = gtk_menu_item_new_with_label(suggestions[i]); - g_signal_connect(G_OBJECT(mi), "activate", - G_CALLBACK(replace_word), spell); - gtk_widget_show(mi); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); -- count++; -- suggestion = aspell_string_enumeration_next(elements); - } - } - -- delete_aspell_string_enumeration(elements); -+ enchant_dict_free_suggestions(spell->speller, suggestions); - - /* Separator */ - mi = gtk_menu_item_new(); -@@ -519,9 +495,6 @@ - - static gboolean - gtkspell_set_language_internal(GtkSpell *spell, const gchar *lang, GError **error) { -- AspellConfig *config; -- AspellCanHaveError *err; -- AspellSpeller *speller; - - if (lang == NULL) { - lang = g_getenv("LANG"); -@@ -533,26 +506,25 @@ - } - } - -- config = new_aspell_config(); -- if (lang) -- aspell_config_replace(config, "language-tag", lang); -- aspell_config_replace(config, "encoding", "utf-8"); -- err = new_aspell_speller(config); -- delete_aspell_config(config); -+ if (!spell->broker) -+ spell->broker = enchant_broker_init(); - -- if (aspell_error_number(err) != 0) { --#ifdef USING_ASPELL -- g_set_error(error, GTKSPELL_ERROR, GTKSPELL_ERROR_BACKEND, -- "aspell: %s", aspell_error_message(err)); --#elif defined USING_PSPELL -+ if (spell->speller) { -+ enchant_broker_free_dict(spell->broker, spell->speller); -+ spell->speller = NULL; -+ } -+ -+ if (!lang) { -+ lang = "en"; -+ } -+ -+ spell->speller = enchant_broker_request_dict(spell->broker, lang ); -+ -+ if (!spell->speller) { - g_set_error(error, GTKSPELL_ERROR, GTKSPELL_ERROR_BACKEND, -- "pspell: %s", aspell_error_message(err)); --#endif -+ _("enchant error for language: %s"),lang); - return FALSE; - } -- if (spell->speller) -- delete_aspell_speller(spell->speller); -- spell->speller = to_aspell_speller(err); - - return TRUE; - } -@@ -715,8 +687,13 @@ - gtk_text_buffer_delete_mark(buffer, spell->mark_insert_end); - gtk_text_buffer_delete_mark(buffer, spell->mark_click); - -- delete_aspell_speller(spell->speller); - -+ if (spell->broker) { -+ if (spell->speller) { -+ enchant_broker_free_dict(spell->broker, spell->speller); -+ } -+ enchant_broker_free(spell->broker); -+ } - g_signal_handlers_disconnect_matched(spell->view, - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, NULL, |