From e0008c304546067093f9208b9aea391919702c87b86cb42c99701cf859073f93 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 25 Nov 2016 18:10:10 +0000 Subject: [PATCH] Accepting request 441368 from home:pgajdos - fix build against hunspell 1.5.0 + enchant-hunspell-1.5.0.patch OBS-URL: https://build.opensuse.org/request/show/441368 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/enchant?expand=0&rev=26 --- enchant-hunspell-1.5.0.patch | 13 +++++++++++++ enchant.changes | 6 ++++++ enchant.spec | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 enchant-hunspell-1.5.0.patch diff --git a/enchant-hunspell-1.5.0.patch b/enchant-hunspell-1.5.0.patch new file mode 100644 index 0000000..998f7e1 --- /dev/null +++ b/enchant-hunspell-1.5.0.patch @@ -0,0 +1,13 @@ +Index: enchant-1.6.0/src/myspell/myspell_checker.cpp +=================================================================== +--- enchant-1.6.0.orig/src/myspell/myspell_checker.cpp 2016-11-22 09:32:52.653021617 +0100 ++++ enchant-1.6.0/src/myspell/myspell_checker.cpp 2016-11-22 09:37:27.753598594 +0100 +@@ -431,7 +431,7 @@ MySpellChecker::requestDictionary(const + if(myspell == NULL){ + return false; + } +- char *enc = myspell->get_dic_encoding(); ++ const char *enc = myspell->get_dic_encoding(); + + m_translate_in = g_iconv_open(enc, "UTF-8"); + m_translate_out = g_iconv_open("UTF-8", enc); diff --git a/enchant.changes b/enchant.changes index ade61f1..f732b60 100644 --- a/enchant.changes +++ b/enchant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 22 08:42:30 UTC 2016 - pgajdos@suse.com + +- fix build against hunspell 1.5.0 + + enchant-hunspell-1.5.0.patch + ------------------------------------------------------------------- Mon May 2 06:51:04 UTC 2016 - dimstar@opensuse.org diff --git a/enchant.spec b/enchant.spec index 7abc041..b423588 100644 --- a/enchant.spec +++ b/enchant.spec @@ -27,6 +27,8 @@ Source: http://www.abisource.com/downloads/%{name}/%{version}/%{name}-%{ Source1: baselibs.conf # PATCH-FIX-UPSTREAM enchant-hunspell-1.4.0.patch dimstar@opensuse.org -- Fix build against hunspell 1.4.0, where WORDMAXLEN is no longer exported Patch0: enchant-hunspell-1.4.0.patch +# PATCH-FIX-UPSTREAM enchant-hunspell-1.5.0.patch pgajdos@suse.cz -- fix build against hunspell 1.5.0 +Patch1: enchant-hunspell-1.5.0.patch BuildRequires: aspell-devel BuildRequires: dbus-1-glib-devel BuildRequires: gcc-c++ @@ -99,6 +101,7 @@ to develop applications that require these. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure --with-pic \