[abiword] Second link-grammar 5 patch.

[Jon Ciesla]

commit bafae00416b921ca390498f1d50a984c42c2fc6e
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jun 30 12:05:45 2014 -0500

    Second link-grammar 5 patch.

 abiword-3.0.0-link-grammar-5-second.patch |   35 +++++++++++++++++++++++++++++
 abiword.spec                              |    4 ++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/abiword-3.0.0-link-grammar-5-second.patch b/abiword-3.0.0-link-grammar-5-second.patch
new file mode 100644
index 0000000..c471c74
--- /dev/null
+++ b/abiword-3.0.0-link-grammar-5-second.patch
@@ -0,0 +1,35 @@
+--- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig	2014-06-30 08:21:30.000000000 -0500
++++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp	2014-06-30 08:27:01.000000000 -0500
+@@ -220,6 +220,7 @@ bool LinkGrammarWrap::parseSentence(Piec
+ 	  pErr = NULL;
+ 	}
+ 
++#ifdef DEAD_DEBUG_CODE
+ 	//	  for(i=0; i< pT->m_vecGrammarErrors.getItemCount(); i++)
+ 	// {
+ 	//    pErr = pT->m_vecGrammarErrors.getNthItem(i);
+@@ -227,15 +228,10 @@ bool LinkGrammarWrap::parseSentence(Piec
+ 	//  }
+ 	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<count;i++)
+ 	{
+-	  UT_sint32 iok = linkage_set_current_sublinkage(linkage, i);
+-	  if(iok == 0)
+-	    continue;
+ 	  UT_sint32 j = 0;
+ 	  UT_sint32 iNum = linkage_get_num_links(linkage);
+ 	  for(j=0;j< iNum;j++)
+@@ -252,6 +248,8 @@ bool LinkGrammarWrap::parseSentence(Piec
+ 	  }
+ 	}
+ 	linkage_delete(linkage);
++#endif // DEAD_DEBUG_CODE
++
+ 	for(i=0; i<  vecMapOfWords.getItemCount(); i++)
+ 	{
+ 	  AbiGrammarError * p = vecMapOfWords.getNthItem(i);
diff --git a/abiword.spec b/abiword.spec
index 33997ac..2cb3b55 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -26,6 +26,7 @@ Patch5: abiword-3.0.0-gnutls-no-libgcrypt.patch
 Patch6: abiword-3.0.0-librevenge.patch
 Patch7: abiword-3.0.0-libebook.patch
 Patch8: abiword-3.0.0-link-grammar-5.patch
+Patch9: abiword-3.0.0-link-grammar-5-second.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -116,6 +117,7 @@ Python bindings for developing with libabiword
 %patch6 -p0 -b .librevenge
 %patch7 -p1 -b .libebook
 %patch8 -p1 -b .link-grammar-5
+%patch9 -p1 -b .link-grammar-5-second
 
 # setup abiword documentation
 %setup -q -T -b 1 -n abiword-docs-%{version}
@@ -204,7 +206,7 @@ fi
 
 %changelog
 * Mon Jun 30 2014 Jon Ciesla <limburgher at gmail.com> - 1:3.0.0-11
-- Corrected patch from Linas Vepstas.
+- Corrected and second patches from Linas Vepstas.
 
 * Tue Jun 24 2014 Jon Ciesla <limburgher at gmail.com> - 1:3.0.0-10
 - Rebuild for new link-grammar, with patch for API change.