pcr: abiword: update to 3.0.4-4 by syncing with archlinux

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

2 files changed, 187 insertions, 17 deletions

diff --git a/libre/abiword/PKGBUILD b/libre/abiword/PKGBUILD
index b92e4d879..7d951557b 100644
--- a/libre/abiword/PKGBUILD
+++ b/libre/abiword/PKGBUILD
@@ -5,9 +5,13 @@
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
+# parabola changes and rationale:
+# - Patched to replace nonfree fonts with free fonts.
+# - Built without the 'google' plugin
+
 pkgname=abiword
 pkgver=3.0.4
-pkgrel=1
+pkgrel=4
 pkgrel+=.parabola1
 pkgdesc='Fully-featured word processor'
 pkgdesc+=', without Google search engine and nonfree fonts support'
@@ -18,18 +22,19 @@ url='https://www.abisource.com'
 depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
          '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' 'libwpd' 'libwps' 'python2-gobject' 'python-gobject' 'autoconf-archive')
+makedepends=('pkgconfig' 'boost' 'gobject-introspection' 'libwpd' 'libwps' 'python-gobject' 'autoconf-archive')
 conflicts=('abiword-plugins' 'abiword-libre')
 replaces=('abiword-plugins' 'abiword-libre')
 options=(!makeflags)
 source=(https://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz{,.asc}
         abiword-3.0.0-librevenge.patch
-        abiword-3.0.1-libwps-0.4.patch
+	abiword-3.0.1-libwps-0.4.patch
         aiksaurus-plugin.m4
         command-plugin.m4
         python-override.patch
         enchant-2.1.patch
-        liberation-fonts.patch)
+        # https://github.com/AbiWord/abiword/commit/de5dc5fd94a5fe321791d44e88d209a4972264ba
+        boost-asio.patch)	
 sha256sums=('e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7'
             'SKIP'
             '77b52a3722096cec3bfbe4fff3802f51b6c9e0ff7aaa30028c29825fd4e6a65f'
@@ -38,8 +43,10 @@ sha256sums=('e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7'
             '2f26826e9d59d80dacd0dae4aceb815804eaa75954e47507a0897794f33e45be'
             'dba1e3265cd42589f17b41fea1a39c8aa4b83c7203b9d5944b578d0ff9c858be'
             '444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2'
-            '8a0b6e444e937924743f95c747cbe395a30fb8677a010e60c973b9039e258079')
+            '3d119595c8080f90570ce09e02d6765a0cb84b16f4cc51ef8eee4ff289c19e77')
 validpgpkeys=('6C44DB3E0BF3EAF5B433239A5FEE05E6A56E15A3') # Hubert Figuiere <hub@figuiere.net>
+source+=('liberation-fonts.patch')
+sha256sums+=('8a0b6e444e937924743f95c747cbe395a30fb8677a010e60c973b9039e258079')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -73,22 +80,25 @@ prepare() {
   autoreconf -fi
 }
 
+
 build() {
   cd $pkgname-$pkgver
 
-  # `--enable-plugins` has the complete list of plugins, except for
-  # 'command', 'gda', 'google', and 'rsvg'.
+  # `--enable-plugins` has the complete list of plugins
+  # Disabled plugins:
+  # - google: Search Google for your selected text
   ./configure --prefix=/usr \
     --enable-shared \
     --disable-static \
     --enable-clipart \
     --enable-templates \
-    --enable-plugins="aiksaurus applix babelfish bmp clarisworks collab docbook \
-                      eml epub freetranslation garble gdict gimp goffice grammar \
-                      hancom hrtext iscii kword latex loadbindings mathview mht \
-                      mif mswrite opendocument openwriter openxml opml ots paint \
-                      passepartout pdb pdf presentation psion s5 sdw t602 urldict \
-                      wikipedia wmf wml wordperfect wpg xslfo" \
+    --enable-plugins="aiksaurus applix babelfish bmp clarisworks collab \
+                      command docbook eml epub freetranslation garble gdict \
+                      gimp goffice grammar hancom hrtext iscii kword latex \
+                      loadbindings mathview mht mif mswrite opendocument \
+                      openwriter openxml ots paint passepartout pdb pdf \
+                      presentation psion s5 sdw t602 urldict wikipedia wmf \
+                      wml wordperfect wpg xslfo" \
     --enable-introspection
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
@@ -97,8 +107,4 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  cd src/gi-overrides
-  sed -i 's/python -c/python2 -c/' Makefile
-  make DESTDIR="$pkgdir" PYTHON=python2 install
 }
diff --git a/libre/abiword/boost-asio.patch b/libre/abiword/boost-asio.patch
new file mode 100644
index 000000000..515698362
--- /dev/null
+++ b/libre/abiword/boost-asio.patch
@@ -0,0 +1,164 @@
+From de5dc5fd94a5fe321791d44e88d209a4972264ba Mon Sep 17 00:00:00 2001
+From: Hubert Figuiere <hub@figuiere.net>
+Date: Sun, 5 Feb 2017 02:52:37 +0000
+Subject: [PATCH] Bug 13839 - Detect boost::asio
+
+Patch by Adam Majer <amajer@suse.de>
+
+git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35397 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
+---
+ .../collab/backends/service/xp/AsyncWorker.h   |  7 ++++++-
+ .../backends/service/xp/RealmConnection.h      |  6 +++++-
+ .../collab/backends/service/xp/RealmProtocol.h |  6 +++++-
+ .../collab/backends/service/xp/tls_tunnel.h    |  6 +++++-
+ .../collab/backends/tcp/xp/IOServerHandler.h   |  6 +++++-
+ plugins/collab/plugin.m4                       | 18 +++++++++++-------
+ 6 files changed, 37 insertions(+), 12 deletions(-)
+
+diff --git a/plugins/collab/backends/service/xp/AsyncWorker.h b/plugins/collab/backends/service/xp/AsyncWorker.h
+index ab0437c29f..2e527f9254 100644
+--- a/plugins/collab/backends/service/xp/AsyncWorker.h
++++ b/plugins/collab/backends/service/xp/AsyncWorker.h
+@@ -19,7 +19,12 @@
+ #ifndef __ASYNC_WORKER__
+ #define __ASYNC_WORKER__
+ 
+-#include <asio.hpp>
++#if defined(HAVE_BOOST_ASIO_HPP)
++# include <boost/asio.hpp>
++#else
++# include <asio.hpp>
++#endif
++
+ #include <boost/bind.hpp>
+ #include <boost/function.hpp>
+ #include <boost/noncopyable.hpp>
+diff --git a/plugins/collab/backends/service/xp/RealmConnection.h b/plugins/collab/backends/service/xp/RealmConnection.h
+index 7dc715548c..214b12316b 100644
+--- a/plugins/collab/backends/service/xp/RealmConnection.h
++++ b/plugins/collab/backends/service/xp/RealmConnection.h
+@@ -21,7 +21,11 @@
+ 
+ #include <boost/shared_ptr.hpp>
+ #include <boost/enable_shared_from_this.hpp>
+-#include <asio.hpp>
++#if defined(HAVE_BOOST_ASIO_HPP)
++# include <boost/asio.hpp>
++#else
++# include <asio.hpp>
++#endif
+ #include <vector>
+ #include <string>
+ #include "ut_types.h"
+diff --git a/plugins/collab/backends/service/xp/RealmProtocol.h b/plugins/collab/backends/service/xp/RealmProtocol.h
+index 772ad891dd..03fa536dea 100644
+--- a/plugins/collab/backends/service/xp/RealmProtocol.h
++++ b/plugins/collab/backends/service/xp/RealmProtocol.h
+@@ -9,7 +9,11 @@
+ #include <stdint.h>
+ #endif
+ #include <boost/shared_ptr.hpp>
+-#include <asio.hpp>
++#if defined(HAVE_BOOST_ASIO_HPP)
++# include <boost/asio.hpp>
++#else
++# include <asio.hpp>
++#endif
+ 
+ namespace realm {
+ 
+diff --git a/plugins/collab/backends/service/xp/tls_tunnel.h b/plugins/collab/backends/service/xp/tls_tunnel.h
+index ea07151c70..a78f7815c3 100644
+--- a/plugins/collab/backends/service/xp/tls_tunnel.h
++++ b/plugins/collab/backends/service/xp/tls_tunnel.h
+@@ -33,7 +33,11 @@
+ #include <boost/function.hpp>
+ #include <boost/lexical_cast.hpp>
+ #include <boost/enable_shared_from_this.hpp>
+-#include <asio.hpp>
++#if defined(HAVE_BOOST_ASIO_HPP)
++# include <boost/asio.hpp>
++#else
++# include <asio.hpp>
++#endif
+ #include <string>
+ #include <vector>
+ #ifdef _MSC_VER
+diff --git a/plugins/collab/backends/tcp/xp/IOServerHandler.h b/plugins/collab/backends/tcp/xp/IOServerHandler.h
+index 7a561f4a1c..8a2b931319 100644
+--- a/plugins/collab/backends/tcp/xp/IOServerHandler.h
++++ b/plugins/collab/backends/tcp/xp/IOServerHandler.h
+@@ -23,7 +23,11 @@
+ 
+ #include <boost/bind.hpp>
+ #include <boost/function.hpp>
+-#include <asio.hpp>
++#if defined(HAVE_BOOST_ASIO_HPP)
++# include <boost/asio.hpp>
++#else
++# include <asio.hpp>
++#endif
+ 
+ #include <sync/xp/Synchronizer.h>
+ #include "Session.h"
+diff --git a/plugins/collab/plugin.m4 b/plugins/collab/plugin.m4
+index 98028b99ff..7cfe3a1388 100644
+--- a/plugins/collab/plugin.m4
++++ b/plugins/collab/plugin.m4
+@@ -70,20 +70,22 @@ AC_ARG_ENABLE([collab-backend-tcp],
+ 	enable_collab_backend_tcp=$enableval
+ 	if test "$enable_collab_backend_tcp" != "no"; then
+ 		AC_LANG_PUSH(C++)
+-		AC_CHECK_HEADERS([asio.hpp], [], 
++		AC_CHECK_HEADERS([asio.hpp], [],
++			[AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])],
+ 		[
+ 			AC_MSG_ERROR([collab plugin: asio is required for the collab plugin TCP backend, see http://think-async.com/])
+-		])
++		])])
+ 		AC_LANG_POP
+ 		collab_deps="yes"
+ 	fi
+ ], [
+ 	AC_LANG_PUSH(C++)
+-	AC_CHECK_HEADERS([asio.hpp], 
++	AC_CHECK_HEADERS([asio.hpp],
++		[AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])],
+ 	[
+ 		enable_collab_backend_tcp="yes"
+ 		collab_deps="yes"
+-	])
++	])])
+ 	AC_LANG_POP
+ ])
+ AC_MSG_CHECKING([for collab tcp backend])
+@@ -112,10 +114,11 @@ AC_ARG_ENABLE([collab-backend-service],
+ 	enable_collab_backend_service=$enableval
+ 	if test "$enable_collab_backend_service" != "no"; then
+ 		AC_LANG_PUSH(C++)
+-		AC_CHECK_HEADERS([asio.hpp], [], 
++		AC_CHECK_HEADERS([asio.hpp], [],
++		[AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])],	
+ 		[
+ 			AC_MSG_ERROR([collab plugin: asio is required for the the abicollab.net backend, see http://think-async.com/])
+-		])
++		])])
+ 		AC_LANG_POP
+ 		PKG_CHECK_EXISTS([ $collab_service_req ], [], [
+ 			AC_MSG_ERROR([collab plugin: missing dependencies])
+@@ -125,13 +128,14 @@ AC_ARG_ENABLE([collab-backend-service],
+ ], [
+ 	AC_LANG_PUSH(C++)
+ 	AC_CHECK_HEADERS([asio.hpp],
++		[AC_CHECK_HEADERS([boost/asio.hpp], [AC_DEFINE([HAVE_BOOST_ASIO_HPP])],
+ 	[
+ 		PKG_CHECK_EXISTS([ $collab_service_req ], [
+ 			enable_collab_backend_service="yes"
+ 			collab_deps="yes"
+ 		], [
+ 			enable_collab_backend_service="no"
+-		])
++		])])
+ 	], [
+ 		enable_collab_backend_service="no"
+         ])