[arch-commits] Commit in abiword-plugins/repos (3 files)

[Giovanni Scafora]

    Date: Thursday, October 29, 2009 @ 23:50:18
  Author: giovanni
Revision: 56889

Merged revisions 56887 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/abiword-plugins/trunk

........
  r56887 | giovanni | 2009-10-29 20:35:50 -0700 (gio, 29 ott 2009) | 2 lines
  
  upgpkg: abiword-plugins 2.8.1-1
      upstream release
........

Modified:
  abiword-plugins/repos/extra-i686/	(properties)
  abiword-plugins/repos/extra-i686/PKGBUILD
Deleted:
  abiword-plugins/repos/extra-i686/AbiCommand.patch

------------------+
 AbiCommand.patch |   11 -----------
 PKGBUILD         |   27 ++++++++++-----------------
 2 files changed, 10 insertions(+), 28 deletions(-)


Property changes on: abiword-plugins/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /abiword-plugins/trunk:1-44623
   + /abiword-plugins/trunk:1-56888

Deleted: extra-i686/AbiCommand.patch
===================================================================
--- extra-i686/AbiCommand.patch	2009-10-30 03:36:27 UTC (rev 56888)
+++ extra-i686/AbiCommand.patch	2009-10-30 03:50:18 UTC (rev 56889)
@@ -1,11 +0,0 @@
---- a/tools/abicommand/xp/AbiCommand.cpp	2007-10-11 13:05:55.000000000 -0700
-+++ b/tools/abicommand/xp/AbiCommand.cpp	2009-05-29 12:36:40.000000000 -0700
-@@ -551,7 +551,7 @@
- 				UT_UTF8String *pCom1 =
- 					const_cast < UT_UTF8String * >(static_cast < const UT_UTF8String * >(pToks->getNthItem (1)));
- 				printf(" Filename %s \n",pCom1->utf8_str());
--				char *suffix = rindex (pCom1->utf8_str (), '.');
-+				const char *suffix = rindex (pCom1->utf8_str (), '.');
- 
- 				if (suffix != NULL)
- 				{

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-30 03:36:27 UTC (rev 56888)
+++ extra-i686/PKGBUILD	2009-10-30 03:50:18 UTC (rev 56889)
@@ -1,32 +1,25 @@
 # $Id$
 # Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Maël Lavault <moimael at neuf.fr>
 
 pkgname=abiword-plugins
-pkgver=2.6.8
-pkgrel=7
+pkgver=2.8.1
+pkgrel=1
 pkgdesc="Various plugins for Abiword"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.abisource.com"
 options=('!libtool' '!makeflags')
-makedepends=('libxml2')
-depends=("abiword>=${pkgver}" 'aiksaurus>=1.2.1' 'gtkmathview>=0.7.7' 
-         'link-grammar>=4.2.4' 'libwmf>=0.2.8.4' 'librsvg>=2.18.1' 
-         'libwpd>=0.8.7' 'psiconv>=0.9.8' 'boost')
-source=(http://www.abisource.com/downloads/abiword/${pkgver}/source/abiword-plugins-${pkgver}.tar.gz
-        http://www.abisource.com/downloads/abiword/${pkgver}/source/abiword-${pkgver}.tar.gz
-        AbiCommand.patch)
-md5sums=('421c49723e209c971ddb0798c1b313a9'
-         'fab04d8ef999c303f720197adf261310'
-         '7bd4ad7802216d43422063b86ee1bc9a')
+depends=("abiword>=${pkgver}" 'aiksaurus' 'gtkmathview' 
+         'link-grammar' 'libwpd' 'psiconv' 'libxslt' 'boost')
+source=(http://www.abisource.com/downloads/abiword/${pkgver}/source/abiword-${pkgver}.tar.gz)
+md5sums=('284fe25289c160c3797b527a8aacad12')
 
 build() {
-  cd "${srcdir}/abiword-plugins-${pkgver}"
-  patch -Np1 -i ${srcdir}/AbiCommand.patch || return 1
+  cd "${srcdir}/abiword-${pkgver}"
   ./configure --prefix=/usr \
-              --without-gda \
-	      --disable-gda \
-              --with-abiword="${srcdir}/abiword-${pkgver}/"
+              --enable-plugins
+  cd plugins
   make || return 1
   make DESTDIR="${pkgdir}/" install
 }