Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update enchant deps to build with enchant-2 and force a rebuild. Fixes …
…#4039 (#4041) latexila is missing as that needs a package rename and update, will follow later. I also went ahead and updated gspell (dll version bump) since its reverse deps are a subset of the enchant ones.
- Loading branch information
Showing
9 changed files
with
100 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| diff -u -r gtkspell-2.0.16/configure.ac gtkspell-2.0.16-enchant2/configure.ac | ||
| --- gtkspell-2.0.16/configure.ac 2009-10-23 04:52:31.000000000 +0200 | ||
| +++ gtkspell-2.0.16-enchant2/configure.ac 2018-01-18 12:42:06.366410232 +0100 | ||
| @@ -12,12 +12,12 @@ | ||
| AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) | ||
| AC_CONFIG_HEADERS([config.h]) | ||
|
|
||
| -SPELLER_LIB=-lenchant | ||
| +SPELLER_LIB=-lenchant-2 | ||
|
|
||
| AC_SUBST(SPELLER_LIB) | ||
| GTKSPELL_PACKAGES=gtk+-2.0 | ||
| AC_SUBST(GTKSPELL_PACKAGES) | ||
| -PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant >= 0.4.0 ) | ||
| +PKG_CHECK_MODULES(GTKSPELL, $GTKSPELL_PACKAGES enchant-2 >= 2.2.0 ) | ||
| AC_SUBST(GTKSPELL_CFLAGS) | ||
| AC_SUBST(GTKSPELL_LIBS) | ||
|
|
||
| diff -u -r gtkspell-2.0.16/gtkspell/gtkspell.c gtkspell-2.0.16-enchant2/gtkspell/gtkspell.c | ||
| --- gtkspell-2.0.16/gtkspell/gtkspell.c 2009-10-09 21:01:47.000000000 +0200 | ||
| +++ gtkspell-2.0.16-enchant2/gtkspell/gtkspell.c 2018-01-18 12:41:37.146338802 +0100 | ||
| @@ -277,7 +277,7 @@ | ||
| get_word_extents_from_mark(spell->buffer, &start, &end, spell->mark_click); | ||
| word = gtk_text_buffer_get_text(spell->buffer, &start, &end, FALSE); | ||
|
|
||
| - enchant_dict_add_to_pwl( spell->speller, word, strlen(word)); | ||
| + enchant_dict_add( spell->speller, word, strlen(word)); | ||
|
|
||
| gtkspell_recheck_all(spell); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| --- gtkspell3-3.0.9/gtkspell/gtkspell.c.orig 2016-08-06 09:43:17.000000000 +0000 | ||
| +++ gtkspell3-3.0.9/gtkspell/gtkspell.c 2017-11-22 12:07:52.716086700 +0000 | ||
| @@ -353,7 +353,7 @@ | ||
| get_word_extents_from_mark (spell->priv->buffer, &start, &end, spell->priv->mark_click); | ||
| word = gtk_text_buffer_get_text (spell->priv->buffer, &start, &end, FALSE); | ||
|
|
||
| - enchant_dict_add_to_pwl (spell->priv->speller, word, strlen (word)); | ||
| + enchant_dict_add (spell->priv->speller, word, strlen (word)); | ||
|
|
||
| gtk_spell_checker_recheck_all (spell); | ||
|
|
||
| @@ -1246,7 +1246,7 @@ | ||
| void | ||
| gtk_spell_checker_add_to_dictionary (GtkSpellChecker *spell, const gchar *word) | ||
| { | ||
| - enchant_dict_add_to_pwl (spell->priv->speller, word, strlen (word)); | ||
| + enchant_dict_add (spell->priv->speller, word, strlen (word)); | ||
| gtk_spell_checker_recheck_all (spell); | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --- webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp.orig 2017-12-06 14:59:40.768262788 -0500 | ||
| +++ webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2017-12-06 15:03:10.000000000 -0500 | ||
| @@ -128,7 +128,7 @@ | ||
| for (i = 0; i < numberOfSuggestions; i++) | ||
| guesses.append(String::fromUTF8(suggestions[i])); | ||
|
|
||
| - enchant_dict_free_suggestions(*iter, suggestions); | ||
| + enchant_dict_free_string_list(*iter, suggestions); | ||
| } | ||
|
|
||
| return guesses; | ||
| --- webkitgtk-2.4.11/Source/autotools/FindDependencies.m4.orig 2018-07-04 12:52:47.582565800 +0200 | ||
| +++ webkitgtk-2.4.11/Source/autotools/FindDependencies.m4 2018-07-04 12:53:18.535026100 +0200 | ||
| @@ -154,7 +154,7 @@ | ||
| AC_SUBST(PANGO_LIBS) | ||
|
|
||
| if test "$enable_spellcheck" = "yes"; then | ||
| - PKG_CHECK_MODULES(ENCHANT, enchant >= enchant_required_version, [], [enable_spellcheck="no"]) | ||
| + PKG_CHECK_MODULES(ENCHANT, enchant-2 >= enchant_required_version, [], [enable_spellcheck="no"]) | ||
| AC_SUBST(ENCHANT_CFLAGS) | ||
| AC_SUBST(ENCHANT_LIBS) | ||
| fi |