From 3abf97f51e16f31ccf065c0a81a5c811e8b665746ecaaa3be1d78f831759ce37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 9 Dec 2016 12:43:34 +0000 Subject: [PATCH] Accepting request 445065 from GNOME:Factory Revert the hunspell change - it was a fault in hunspell to claim to be API compatible but then not being it OBS-URL: https://build.opensuse.org/request/show/445065 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/enchant?expand=0&rev=28 --- enchant-hunspell-1.5.0.patch | 13 ------------- enchant.changes | 6 ------ enchant.spec | 3 --- 3 files changed, 22 deletions(-) delete mode 100644 enchant-hunspell-1.5.0.patch diff --git a/enchant-hunspell-1.5.0.patch b/enchant-hunspell-1.5.0.patch deleted file mode 100644 index 998f7e1..0000000 --- a/enchant-hunspell-1.5.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 c57ae27..ade61f1 100644 --- a/enchant.changes +++ b/enchant.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 22 08:42:30 UTC 2016 - pgajdos@suse.com - -- Add enchant-hunspell-1.5.0.patch: fix build against - hunspell 1.5.0. - ------------------------------------------------------------------- Mon May 2 06:51:04 UTC 2016 - dimstar@opensuse.org diff --git a/enchant.spec b/enchant.spec index b423588..7abc041 100644 --- a/enchant.spec +++ b/enchant.spec @@ -27,8 +27,6 @@ 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++ @@ -101,7 +99,6 @@ to develop applications that require these. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %configure --with-pic \