diff -Nru abiword-3.0.1/debian/changelog abiword-3.0.1/debian/changelog --- abiword-3.0.1/debian/changelog 2016-05-28 16:56:52.000000000 +0000 +++ abiword-3.0.1/debian/changelog 2016-06-28 15:26:34.000000000 +0000 @@ -1,3 +1,17 @@ +abiword (3.0.1-8) unstable; urgency=medium + + * QA upload. + * debian/source/options: + - Drop obsolete xz compression option, this is default since Jessie + * Build-depend on liblink-grammar-dev instead of liblink-grammar4-dev + * Backport patches from stable 3.0 branch to build with link-grammar 5: + - 0011-Bug-13650-Fix-build-with-recent-link-grammar-patch-f.patch + - 0012-Bug-13726-Fix-Grammar-plugin-build-with-link-grammar.patch + * debian/control: + - Mention that the grammar plugin only supports English currently + + -- Jeremy Bicha Thu, 16 Jun 2016 05:47:15 -0400 + abiword (3.0.1-7) unstable; urgency=low [ Jeremy Bicha ] diff -Nru abiword-3.0.1/debian/control abiword-3.0.1/debian/control --- abiword-3.0.1/debian/control 2016-05-28 08:06:35.000000000 +0000 +++ abiword-3.0.1/debian/control 2016-06-27 20:00:01.000000000 +0000 @@ -21,7 +21,7 @@ ,libglib2.0-dev ,libgtk-3-dev ,libjpeg-dev - ,liblink-grammar4-dev + ,liblink-grammar-dev ,libloudmouth1-dev ,libots-dev ,libpng-dev @@ -86,7 +86,7 @@ is extensible with a variety of plugins. . This package contains an in-line grammar checking system for AbiWord - documents. + documents. Only English is currently supported. Package: libabiword-3.0 Section: libs diff -Nru abiword-3.0.1/debian/patches/0011-Bug-13650-Fix-build-with-recent-link-grammar-patch-f.patch abiword-3.0.1/debian/patches/0011-Bug-13650-Fix-build-with-recent-link-grammar-patch-f.patch --- abiword-3.0.1/debian/patches/0011-Bug-13650-Fix-build-with-recent-link-grammar-patch-f.patch 1970-01-01 00:00:00.000000000 +0000 +++ abiword-3.0.1/debian/patches/0011-Bug-13650-Fix-build-with-recent-link-grammar-patch-f.patch 2016-06-27 20:00:01.000000000 +0000 @@ -0,0 +1,149 @@ +From a9589e24a63b63b89fcfbed09c341d4386339146 Mon Sep 17 00:00:00 2001 +From: Hubert Figuiere +Date: Mon, 21 Sep 2015 02:28:31 +0000 +Subject: [PATCH 1/2] Bug 13650 - Fix build with recent link-grammar, patch + from Linas. + +Cherry-pick from trunk@34627. By jbrefort + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35106 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 +--- + .../grammar/linkgrammarwrap/LinkGrammarWrap.cpp | 102 ++++++++------------- + 1 file changed, 38 insertions(+), 64 deletions(-) + +diff --git a/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp b/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp +index 503cbed..aa7eabe 100644 +--- a/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp ++++ b/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp +@@ -145,59 +145,57 @@ bool LinkGrammarWrap::parseSentence(PieceOfText * pT) + } + AbiGrammarError * pWordMap = new AbiGrammarError(); + pWordMap->m_iErrLow = iLow; +- pWordMap->m_iErrHigh = iLow + strlen(sentence_get_nth_word(sent, i)); ++ pWordMap->m_iErrHigh = iLow + strlen(linkage_get_word(linkage, i)); + pWordMap->m_iWordNum = i; + vecMapOfWords.addItem(pWordMap); + bool bNew = false; +- if(!sentence_nth_word_has_disjunction(sent, i)) ++ ++ //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string)); ++ if(pErr == NULL) ++ { ++ pErr = new AbiGrammarError(); ++ bNew = true; ++ } ++ if(bNew || (pErr->m_iWordNum + 1 < i)) + { +- //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string)); +- if(pErr == NULL) ++ if(!bNew) + { +- pErr = new AbiGrammarError(); +- bNew = true; ++ if(pErr) ++ { ++ delete pErr; ++ } ++ pErr = new AbiGrammarError(); + } +- if(bNew || (pErr->m_iWordNum + 1 < i)) ++ iHigh = iLow + strlen(linkage_get_word(linkage, i)); ++ pErr->m_iErrLow = iLow + iOff -1; ++ pErr->m_iErrHigh = iHigh + iOff -1; ++ if(pErr->m_iErrLow < 0) ++ { ++ pErr->m_iErrLow = 0; ++ } ++ if(pErr->m_iErrHigh < totlen-1) + { +- if(!bNew) +- { +- if(pErr) +- { +- delete pErr; +- } +- pErr = new AbiGrammarError(); +- } +- iHigh = iLow + strlen(sentence_get_nth_word(sent, i)); +- pErr->m_iErrLow = iLow + iOff -1; +- pErr->m_iErrHigh = iHigh + iOff -1; +- if(pErr->m_iErrLow < 0) +- { +- pErr->m_iErrLow = 0; +- } +- if(pErr->m_iErrHigh < totlen-1) +- { + pErr->m_iErrHigh += 1; +- } +- pErr->m_iWordNum = i; +- // UT_DEBUGMSG(("Add Error %x low %d High %d\n",pErr,pErr->m_iErrLow,pErr->m_iErrHigh)); +- pT->m_vecGrammarErrors.addItem(pErr); +- pErr = NULL; + } +- else ++ pErr->m_iWordNum = i; ++ // UT_DEBUGMSG(("Add Error %x low %d High %d\n",pErr,pErr->m_iErrLow,pErr->m_iErrHigh)); ++ pT->m_vecGrammarErrors.addItem(pErr); ++ pErr = NULL; ++ } ++ else ++ { ++ // ++ // Expand the sqiggle ++ // ++ iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff; ++ pErr->m_iErrHigh = iHigh; ++ if(pErr->m_iErrHigh < totlen-1) + { +- // +- // Expand the sqiggle +- // +- iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff; +- pErr->m_iErrHigh = iHigh; +- if(pErr->m_iErrHigh < totlen-1) +- { + pErr->m_iErrHigh += 1; +- } +- pErr->m_iWordNum = i; + } ++ pErr->m_iWordNum = i; + } +- iLow += strlen(sentence_get_nth_word(sent, i)); ++ iLow += strlen(linkage_get_word(linkage, i)); + } + // + // No NULL links but still an error , mark the whole sentence bad. +@@ -229,30 +227,6 @@ bool LinkGrammarWrap::parseSentence(PieceOfText * pT) + // } + UT_UTF8String sErr = linkage_get_violation_name(linkage); + // UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str())); +- UT_sint32 count = linkage_get_num_sublinkages(linkage); +- // +- // Find linkages with violations +- // +- for(i=0; i +Date: Mon, 21 Sep 2015 02:28:37 +0000 +Subject: [PATCH 2/2] Bug 13726 - Fix Grammar plugin build with link-grammar >= + 5.1.0. + +Cherry-pick from trunk@35098. By jbrefort + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35107 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 +--- +Index: abiword-3.0.1/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp +=================================================================== +--- abiword-3.0.1.orig/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp ++++ abiword-3.0.1/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp +@@ -39,6 +39,7 @@ + */ + /********************************************************************************/ + ++#include "config.h" + #include "xap_App.h" + #include "ut_locale.h" + #include "ut_string_class.h" +@@ -87,7 +88,6 @@ bool LinkGrammarWrap::parseSentence(Piec + parse_options_set_min_null_count(m_Opts, 0); + parse_options_set_max_null_count(m_Opts, 0); + parse_options_set_islands_ok(m_Opts, 0); +- parse_options_set_panic_mode(m_Opts, TRUE); + parse_options_reset_resources(m_Opts); + UT_sint32 num_linkages = sentence_parse(sent, m_Opts); + bool res = (num_linkages >= 1); diff -Nru abiword-3.0.1/debian/patches/series abiword-3.0.1/debian/patches/series --- abiword-3.0.1/debian/patches/series 2016-05-28 16:56:52.000000000 +0000 +++ abiword-3.0.1/debian/patches/series 2016-06-27 20:00:01.000000000 +0000 @@ -22,3 +22,6 @@ 0008_do-nothing-with-unchecked-radio-buttons.patch 0009_clean-svg-icon.patch 0010_fix-parallel-build.patch +0011-Bug-13650-Fix-build-with-recent-link-grammar-patch-f.patch +0012-Bug-13726-Fix-Grammar-plugin-build-with-link-grammar.patch + diff -Nru abiword-3.0.1/debian/source/options abiword-3.0.1/debian/source/options --- abiword-3.0.1/debian/source/options 2016-05-28 07:45:23.000000000 +0000 +++ abiword-3.0.1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -compression = "xz"