abiword-3.0.2-1.parabola1: updating version

5 files changed, 4 insertions, 131 deletions

diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD
index 9bb29be22..aab9a485f 100644
--- a/libre/abiword/PKGBUILD
+++ b/libre/abiword/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 266866 2016-05-04 13:05:46Z jgc $
+# $Id: PKGBUILD 279515 2016-10-31 09:03:54Z jgc $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
 # Contributor (Arch): Maël Lavault <moimael@neuf.fr>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=abiword
-pkgver=3.0.1
-pkgrel=7.parabola1
+pkgver=3.0.2
+pkgrel=1.parabola1
 pkgdesc='Fully-featured word processor, without Google search engine and nonfree fonts support'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
@@ -20,24 +20,16 @@ replaces=('abiword-plugins' 'abiword-libre')
 options=('!makeflags')
 source=(http://abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz
         abiword-3.0.0-librevenge.patch
-        abiword-3.0.0-link-grammar-5.patch
-        abiword-3.0.0-link-grammar-5-second.patch
-        link-grammar-panic.patch
         abiword-3.0.1-libwps-0.4.patch
         aiksaurus-plugin.m4
         command-plugin.m4
-        gnutls-3.4.0.patch
         python-override.patch
         liberation-fonts.patch)
-sha256sums=('e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6'
+sha256sums=('afbfd458fd02989d8b0c6362ba8a4c14686d89666f54cfdb5501bd2090cf3522'
             '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f'
-            '6d88800f1e16becd69ed93d5f070793a56b9f162f7d886c71756643bcaed7ef5'
-            'd2c80da81a339634a7a4ee4cef12f7ee968f2c2a8c2f75533b6713b71f0d61fd'
-            '94d1e638f7b85123dc2282d2e59b982bde6ad0dbbe1b6b54351e610c5a0ea578'
             'f1375b2ab7af2959717cba0259ba546c8e75ef849e84263bdc253019e849cb2a'
             '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1'
             '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be'
-            'b393e26c19f92901f64d2bae54c86708ea7dd0b647572088a8ac0cd2eec89100'
             'dba1e3265cd42589f17b41fea1a39c8aa4b83c7203b9d5944b578d0ff9c858be'
             '8a0b6e444e937924743f95c747cbe395a30fb8677a010e60c973b9039e258079')
 
@@ -47,14 +39,6 @@ prepare() {
   # fix build with librevenge based import filters
   patch -Np0 -i ../abiword-3.0.0-librevenge.patch
 
-  # Fix build with recent versions of link-grammar
-  patch -Np1 -i ../abiword-3.0.0-link-grammar-5.patch
-  patch -Np1 -i ../abiword-3.0.0-link-grammar-5-second.patch
-  patch -Np0 -i ../link-grammar-panic.patch
-
-  # Fix build with new gnutls 3.4.x
-  patch -Np0 -i ../gnutls-3.4.0.patch
-
   # Fix libwpd 0.4 detection
   patch -Np1 -i ../abiword-3.0.1-libwps-0.4.patch
 
diff --git a/libre/abiword/abiword-3.0.0-link-grammar-5-second.patch b/libre/abiword/abiword-3.0.0-link-grammar-5-second.patch
deleted file mode 100644
index c471c749f..000000000
--- a/libre/abiword/abiword-3.0.0-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/libre/abiword/abiword-3.0.0-link-grammar-5.patch b/libre/abiword/abiword-3.0.0-link-grammar-5.patch
deleted file mode 100644
index bbf75f6ce..000000000
--- a/libre/abiword/abiword-3.0.0-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/libre/abiword/gnutls-3.4.0.patch b/libre/abiword/gnutls-3.4.0.patch
deleted file mode 100644
index 301576aca..000000000
--- a/libre/abiword/gnutls-3.4.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- plugins/collab/backends/service/xp/tls_tunnel.cpp	2014-11-04 02:12:14.000000000 +0100
-+++ plugins/collab/backends/service/xp/tls_tunnel.cpp.new	2015-04-17 17:23:16.297151397 +0200
-@@ -306,9 +306,6 @@
- 	disconnect_(transport_ptr, session_ptr, local_socket_ptr, remote_socket_ptr);		
- }
- 
--static const int PRIORITIES[] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0 };
--static const int CIPHERS[] = { GNUTLS_CIPHER_AES_256_CBC, GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, 0 };
--
- // FIXME: this clientproxy can only handle 1 SSL connection at the same time
- ClientProxy::ClientProxy(const std::string& connect_address, unsigned short connect_port, 
- 		const std::string& ca_file, bool check_hostname)
-@@ -400,8 +397,6 @@
- 	// setup session
- 	return_val_if_neg(gnutls_init(session_ptr.get(), GNUTLS_CLIENT), session_ptr_t());
- 	return_val_if_neg(gnutls_set_default_priority(*session_ptr), session_ptr_t());
--	return_val_if_neg(gnutls_kx_set_priority(*session_ptr,PRIORITIES), session_ptr_t());
--	return_val_if_neg(gnutls_cipher_set_priority(*session_ptr,CIPHERS), session_ptr_t());
- 	return_val_if_neg(gnutls_credentials_set(*session_ptr, GNUTLS_CRD_CERTIFICATE, x509cred), session_ptr_t());
- 
- 	// setup transport
diff --git a/libre/abiword/link-grammar-panic.patch b/libre/abiword/link-grammar-panic.patch
deleted file mode 100644
index f33a802ff..000000000
--- a/libre/abiword/link-grammar-panic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig	2015-02-17 12:11:05.062973479 +0000
-+++ plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp	2015-02-17 12:11:38.909495002 +0000
-@@ -87,7 +87,6 @@
-   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);