- up to 3.0.2

diff --git a/abiword-link-grammar-5-second.patch b/abiword-link-grammar-5-second.patch
deleted file mode 100644 (file)
index c471c74..0000000
--- a/abiword-link-grammar-5-second.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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-link-grammar-5.patch b/abiword-link-grammar-5.patch
deleted file mode 100644 (file)
index bbf75f6..0000000
--- a/abiword-link-grammar-5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig     2014-06-29 14:50:30.000000000 -0500
-+++ abiword-3.0.0/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp  2014-06-29 14:55:39.000000000 -0500
-@@ -145,12 +145,11 @@ bool LinkGrammarWrap::parseSentence(Piec
-         }
-         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)
-           {
-@@ -167,7 +166,7 @@ bool LinkGrammarWrap::parseSentence(Piec
-               }
-               pErr = new AbiGrammarError();
-             }
--            iHigh = iLow + strlen(sentence_get_nth_word(sent, 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)
-@@ -188,7 +187,7 @@ bool LinkGrammarWrap::parseSentence(Piec
-             //
-             // Expand the sqiggle
-             //
--            iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff;
-+            iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff;
-             pErr->m_iErrHigh = iHigh;
-             if(pErr->m_iErrHigh < totlen-1)
-             {
-@@ -196,8 +195,7 @@ bool LinkGrammarWrap::parseSentence(Piec
-             }
-             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.

diff --git a/abiword-parallel.patch b/abiword-parallel.patch
deleted file mode 100644 (file)
index dd86e0f..0000000
--- a/abiword-parallel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- abiword-3.0.1/src/Makefile.am.orig 2016-05-15 17:46:25.779731460 +0200
-+++ abiword-3.0.1/src/Makefile.am      2016-05-15 18:26:28.726615664 +0200
-@@ -168,7 +168,7 @@
- 
- INTROSPECTION_GIRS += Abi-@ABIWORD_SERIES@.gir
- 
--Abi_@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile
-+Abi-@ABIWORD_SERIES@.gir: $(INTROSPECTION_SCANNER) libabiword-@ABIWORD_SERIES@.la Makefile
- Abi_@ABI_SUB_SERIES@_gir_INCLUDES = GObject-2.0 Gtk-3.0 Gsf-1
- Abi_@ABI_SUB_SERIES@_gir_CFLAGS = $(libabiword_@ABIWORD_SERIES@_la_CPPFLAGS)
- Abi_@ABI_SUB_SERIES@_gir_LIBS = libabiword-@ABIWORD_SERIES@.la

diff --git a/abiword.spec b/abiword.spec
index aebb5103ea6cc017751832f80236ad14e9dc9ed8..71da751f09c8660fa159a9b98930b3a788dcb76c 100644 (file)
--- a/abiword.spec
+++ b/abiword.spec
@@ -19,19 +19,16 @@
 Summary:       Multi-platform word processor
 Summary(pl.UTF-8):     Wieloplatformowy procesor tekstu
 Name:          abiword
-Version:       3.0.1
-Release:       9
+Version:       3.0.2
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications/Editors
 Source0:       http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.gz
-# Source0-md5: f3f8052e7b4979a43b75775a381e6cb8
+# Source0-md5: cda6dd58c747c133b421cc7eb18f5796
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-mht.patch
 Patch2:                %{name}-librevenge.patch
-Patch3:                %{name}-link-grammar-5.patch
-Patch4:                %{name}-link-grammar-5-second.patch
-Patch5:                %{name}-parallel.patch
 Patch6:                %{name}-tidy.patch
 Patch7:                %{name}-asio.patch
 URL:           http://www.abisource.com/
@@ -379,9 +376,6 @@ Jest to teczka clipartów używanych przez AbiWorda.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1