rpms/gtkspell/devel gtkspell-2.0.11-enchant.patch, NONE, 1.1 gtkspell.spec, 1.19, 1.20
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Thu Dec 20 13:27:38 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/gtkspell/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22127
Modified Files:
gtkspell.spec
Added Files:
gtkspell-2.0.11-enchant.patch
Log Message:
* Thu Dec 20 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.11-5.fc9
- Add patch for RH bug #245888 (use Enchant).
gtkspell-2.0.11-enchant.patch:
--- NEW FILE gtkspell-2.0.11-enchant.patch ---
diff -up gtkspell-2.0.11/gtkspell/gtkspell.c.enchant gtkspell-2.0.11/gtkspell/gtkspell.c
--- gtkspell-2.0.11/gtkspell/gtkspell.c.enchant 2007-12-20 08:14:36.000000000 -0500
+++ gtkspell-2.0.11/gtkspell/gtkspell.c 2007-12-20 08:15:31.000000000 -0500
@@ -14,37 +14,7 @@
#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>
static const int debug = 0;
static const int quiet = 0;
@@ -55,7 +25,8 @@ struct _GtkSpell {
GtkTextMark *mark_insert_start;
GtkTextMark *mark_insert_end;
gboolean deferred_check;
- AspellSpeller *speller;
+ EnchantBroker *broker;
+ EnchantDict *speller;
GtkTextMark *mark_click;
};
@@ -124,10 +95,12 @@ static void
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);
}
@@ -302,8 +275,7 @@ add_to_dictionary(GtkWidget *menuitem, G
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);
@@ -321,7 +293,7 @@ ignore_all(GtkWidget *menuitem, GtkSpell
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);
@@ -335,6 +307,9 @@ replace_word(GtkWidget *menuitem, GtkSpe
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);
@@ -350,7 +325,7 @@ replace_word(GtkWidget *menuitem, GtkSpe
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));
@@ -366,17 +341,17 @@ build_suggestion_menu(GtkSpell *spell, G
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("");
@@ -388,8 +363,8 @@ build_suggestion_menu(GtkSpell *spell, G
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);
@@ -400,19 +375,16 @@ build_suggestion_menu(GtkSpell *spell, G
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();
@@ -517,9 +489,6 @@ popup_menu_event(GtkTextView *view, GtkS
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");
@@ -531,26 +500,25 @@ gtkspell_set_language_internal(GtkSpell
}
}
- 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;
}
@@ -713,8 +681,13 @@ gtkspell_free(GtkSpell *spell) {
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,
diff -up gtkspell-2.0.11/configure.ac.enchant gtkspell-2.0.11/configure.ac
--- gtkspell-2.0.11/configure.ac.enchant 2005-05-27 17:38:33.000000000 -0400
+++ gtkspell-2.0.11/configure.ac 2007-12-20 08:15:00.000000000 -0500
@@ -4,18 +4,12 @@ AC_CONFIG_SRCDIR(gtkspell/gtkspell.c)
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)
Index: gtkspell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtkspell/devel/gtkspell.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gtkspell.spec 10 Oct 2007 20:07:41 -0000 1.19
+++ gtkspell.spec 20 Dec 2007 13:27:00 -0000 1.20
@@ -2,7 +2,7 @@
Name: gtkspell
Version: 2.0.11
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPL
Group: System Environment/Libraries
Summary: GtkSpell provides on-the-fly spell checking for GtkTextView widgets.
@@ -17,9 +17,14 @@
# RH bug #216142
Patch1: gtkspell-2.0.11-static.patch
+# RH bug #245888
+Patch2: gtkspell-2.0.11-enchant.patch
+
### Build Dependencies ###
-BuildRequires: aspell-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: enchant-devel
BuildRequires: gtk2-devel
BuildRequires: gettext
@@ -43,8 +48,10 @@
%setup -q
%patch0 -p1 -b .libs
%patch1 -p1 -b .static
+%patch2 -p1 -b .enchant
%build
+autoreconf --force
%configure --disable-gtk-doc
make %{?_smp_mflags}
@@ -78,6 +85,9 @@
%{_libdir}/pkgconfig/gtkspell-2.0.pc
%changelog
+* Thu Dec 20 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.11-5.fc9
+- Add patch for RH bug #245888 (use Enchant).
+
* Wed Oct 10 2007 Matthew Barnes <mbarnes at redhat.com> - 2.0.11-4.fc8
- Rebuild
More information about the fedora-extras-commits
mailing list