abiword-libre-3.0.0-1: updating version

1 files changed, 59 insertions, 66 deletions

diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 246511888..d3ab71fff 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -1,98 +1,91 @@
-# $Id: PKGBUILD 183900 2013-04-29 15:40:28Z bpiotrowski $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# $Id: PKGBUILD 203024 2014-01-01 19:07:24Z andyrtr $
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Maël Lavault <moimael@neuf.fr>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbase=abiword
 pkgbase=abiword-libre
 pkgname=('abiword-libre' 'abiword-libre-plugins')
-pkgver=2.8.6
-pkgrel=9.1
+pkgver=3.0.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-url="http://www.abisource.com"
-makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice0.8' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 
-             'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv' 'ttf-liberation')
-options=('!makeflags' '!libtool')
-source=(http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgbase}-${pkgver}.tar.gz
-        compat_libwpg_0_9.patch
-	abiword-2.8.6-no-undefined.patch
-        abiword-2.8.6-libpng15.patch
-        abiword-2.8.6-glib-2.31.patch
+url='http://www.abisource.com'
+makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv'
+             'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant'
+             'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv'
+             'redland' 'libical')
+options=('!makeflags')
+source=(http://abisource.com/downloads/$_pkgbase/$pkgver/source/$_pkgbase-$pkgver.tar.gz
         liberation-fonts.patch)
-md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
-         '09446a2ebba8288fc611e88f7cf17298'
-         '42e2614b6e0aad457d91f6ce20b6f225'
-         '40e370e7e88c5437140ef18037abfbd3'
-         '6ec338a27a6fb590c348724ddb545849'
-         '880b17db6f249d977d2a7cd012d9ce02')
+md5sums=('8d9c41cff3a8fbef8d0c835c65600e65'
+         'e7ef4d436469ae4b24b0f784b09ab023')
 
-build() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch"
-  # fix a gcc 4.6.x build issue, patch from Fedora
-  patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch"
-  patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch"
+prepare() {
+  cd $_pkgbase-$pkgver
 
-  # Fix build with recent glib, patch from Gentoo
-  patch -Np0 -i "${srcdir}/abiword-2.8.6-glib-2.31.patch"
-
-  # Replace non-free fonts support to liberation fonts
+  # Replace nonfree fonts support to liberation fonts
   patch -Np1 -i "${srcdir}/liberation-fonts.patch"
+}
 
-  libtoolize --force
-  autoreconf
+build() {
+  cd $_pkgbase-$pkgver
+
+# Collab plugin is somehow broken:
+# part service
+#In file included from ./../../../backends/service/xp/RealmConnection.h:33:0,
+#                 from ./../../../backends/service/xp/AbiCollabSaveInterceptor.h:23,
+#                 from ./../../../backends/service/xp/ServiceAccountHandler.h:33,
+#                 from ServiceUnixAccountHandler.h:23,
+#                 from ServiceUnixAccountHandler.cpp:20:
+#./../../../core/sync/xp/SynchronizedQueue.h:32:1: error: expected class-name before '{' token
+# {
+# part tcp
+#In file included from ./../../../backends/tcp/xp/IOServerHandler.h:29:0,
+#                 from ./../../../backends/tcp/xp/TCPAccountHandler.h:25,
+#                 from TCPUnixAccountHandler.h:22,
+#                 from TCPUnixAccountHandler.cpp:20:
+#./../../../backends/tcp/xp/Session.h:34:63: error: expected class-name before ',' token
+# class Session : public Synchronizer, public boost::noncopyable, public boost::enable_shared_from_this<Session>
 
   ./configure --prefix=/usr \
-              --enable-clipart \
-              --enable-templates \
-              --enable-collab-backend-xmpp \
-              --enable-collab-backend-tcp \
-              --enable-collab-backend-service \
-              --disable-collab-backend-sugar \
-              --enable-plugins --without-gnomevfs \
-              --with-gio \
-              --with-goffice \
-              --disable-static \
-              --with-psiconv-config=/nothere
+    --enable-shared \
+    --disable-static \
+    --enable-clipart \
+    --enable-templates \
+    --disable-builtin-plugins \
+    --enable-plugins \
+    --disable-collab-backend-service \
+    --disable-collab-backend-tcp
   make
 }
 
 package_abiword-libre() {
-  pkgdesc="A fully-featured word processor, without nonfree fonts recommendation"
-  depends=('fribidi' 'wv' 'goffice0.8' 'librsvg' 'enchant' 'desktop-file-utils')
-  install=$pkgname.install
+  pkgdesc='Fully-featured word processor, without nonfree fonts support'
+  depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils'
+           'redland' 'libical' 'gtk-update-icon-cache')
+  install=$_pkgbase.install
   optdepends=('abiword-libre-plugins')
   conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword')
   replaces=('abiword')
   provides=("abiword=$pkgver")
 
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
-  sed -i plugins/Makefile \
-      -e 's/ collab / /' \
-      -e 's/ wpg / /' \
-      -e 's/ wmf / /' \
-      -e 's/ grammar / /' \
-      -e 's/ mathview / /' \
-      -e 's/ aiksaurus / /' \
-      -e 's/ latex / /' \
-      -e 's/ ots / /' \
-      -e 's/ wordperfect / /'
-  make DESTDIR="${pkgdir}" install
+  cd $_pkgbase-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # split out plugins, there's no Makefile target for a clean way
+  mkdir ${srcdir}/_pluginsdir
+  mv "$pkgdir"/usr/lib/abiword-${pkgver%.*}/plugins ${srcdir}/_pluginsdir
 }
 
 package_abiword-libre-plugins() {
-  pkgdesc="Additional plugins for Abiword"
+  pkgdesc='Additional plugins for Abiword'
   depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
-           'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
+           'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv')
   conflicts=('abiword-plugins')
   replaces=('abiword-plugins')
   provides=("abiword-plugins=$pkgver")
-  
-  cd "${srcdir}/${_pkgbase}-${pkgver}/plugins"
-  
-  for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
+
+  install -dm755 ${pkgdir}/usr/lib/abiword-${pkgver%.*}
+  mv ${srcdir}/_pluginsdir/plugins ${pkgdir}/usr/lib/abiword-${pkgver%.*}/
 }