abiword-3.0.1-6.parabola1: add libwps dependency

3 files changed, 52 insertions, 18 deletions

diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD
index 8793aead9..4f0a915f0 100644
--- a/libre/abiword/PKGBUILD
+++ b/libre/abiword/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 257689 2016-01-09 13:17:16Z arojas $
+# $Id: PKGBUILD 266625 2016-04-29 13:05:20Z jgc $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
 # Contributor (Arch): Maël Lavault <moimael@neuf.fr>
@@ -6,24 +6,24 @@
 
 pkgname=abiword
 pkgver=3.0.1
-pkgrel=5.parabola1
-arch=('i686' 'x86_64')
+pkgrel=6.parabola1
 pkgdesc='Fully-featured word processor, without Google search engine and nonfree fonts support'
+arch=('i686' 'x86_64')
 license=('GPL')
 url='http://www.abisource.com'
 depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
-         'redland' 'libical' 'gtk-update-icon-cache' 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
+         'redland' 'libical' 'gtk-update-icon-cache' 'loudmouth' 'libwpg' 'libwps' 'libwmf' 'link-grammar'
          'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
-makedepends=('pkgconfig' 'asio' 'boost' 'gobject-introspection' 'python2' 'libwpd')
+makedepends=('pkgconfig' 'asio' 'boost' 'gobject-introspection' 'python2' 'libwpd' 'libwps')
 conflicts=('abiword-plugins' 'abiword-libre')
 replaces=('abiword-plugins' 'abiword-libre')
-install=abiword.install
 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
@@ -33,6 +33,7 @@ sha256sums=('e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6'
             '6d88800f1e16becd69ed93d5f070793a56b9f162f7d886c71756643bcaed7ef5'
             'd2c80da81a339634a7a4ee4cef12f7ee968f2c2a8c2f75533b6713b71f0d61fd'
             '94d1e638f7b85123dc2282d2e59b982bde6ad0dbbe1b6b54351e610c5a0ea578'
+            'f1375b2ab7af2959717cba0259ba546c8e75ef849e84263bdc253019e849cb2a'
             '5f80a2f94f9929cdba9809c5e1a87cd5d537a2518bb879bfb9eab51a71c8dac1'
             '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be'
             'b393e26c19f92901f64d2bae54c86708ea7dd0b647572088a8ac0cd2eec89100'
@@ -48,9 +49,13 @@ prepare() {
   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
+
   # python2 fix
   sed -i 's/python -c/python2 -c/' src/gi-overrides/Makefile.{am,in}
 
diff --git a/libre/abiword/abiword-3.0.1-libwps-0.4.patch b/libre/abiword/abiword-3.0.1-libwps-0.4.patch
new file mode 100644
index 000000000..3c041a63e
--- /dev/null
+++ b/libre/abiword/abiword-3.0.1-libwps-0.4.patch
@@ -0,0 +1,41 @@
+From 6fcb43935bab90d61858eb1bc0f150c843586c54 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 6 Jun 2015 21:48:02 +0200
+Subject: [PATCH] adapt to libwps 0.4
+
+---
+ plugin-configure.m4                           | 2 +-
+ plugins/wordperfect/plugin.m4                 | 2 +-
+ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp | 4 +++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/wordperfect/plugin.m4 b/plugins/wordperfect/plugin.m4
+index 0aadbaf..bc32d48 100644
+--- a/plugins/wordperfect/plugin.m4
++++ b/plugins/wordperfect/plugin.m4
+@@ -1,6 +1,6 @@
+ 
+ wordperfect_pkgs="libwpd-0.10 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.3'
++wordperfect_wps_pkgs='libwps-0.4'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
+diff --git a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+index bd19971..3e69f79 100644
+--- a/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
++++ b/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+@@ -1389,7 +1389,9 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::recognizeContents (GsfInput * input)
+ 	AbiWordperfectInputStream gsfInput(input);
+ 
+ 	libwps::WPSKind kind;
+-	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
++        libwps::WPSCreator creator;
++        bool needsEncoding = false;
++	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
+ 	
+ 	if (kind != libwps::WPS_TEXT)
+ 		confidence = libwps::WPS_CONFIDENCE_NONE;
+-- 
+2.4.2
+
diff --git a/libre/abiword/abiword.install b/libre/abiword/abiword.install
deleted file mode 100644
index cc4abc0b6..000000000
--- a/libre/abiword/abiword.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}