[arch-commits] CVS update of extra/office/abiword-plugins (2 files)

[Jan de Groot]

    Date: Friday, September 7, 2007 @ 17:56:56
  Author: jgc
    Path: /home/cvs-extra/extra/office/abiword-plugins

Modified: PKGBUILD (1.6 -> 1.7) abiword-poppler.patch (1.1 -> 1.2)

upgpkg: abiword-plugins 2.4.6-2
Build with new poppler, remove goffice support since whoever updated it to 0.4 broke it


-----------------------+
 PKGBUILD              |   17 +++++++++--------
 abiword-poppler.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 8 deletions(-)


Index: extra/office/abiword-plugins/PKGBUILD
diff -u extra/office/abiword-plugins/PKGBUILD:1.6 extra/office/abiword-plugins/PKGBUILD:1.7
--- extra/office/abiword-plugins/PKGBUILD:1.6	Sat Dec 23 14:34:36 2006
+++ extra/office/abiword-plugins/PKGBUILD	Fri Sep  7 17:56:56 2007
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD,v 1.6 2006/12/23 19:34:36 jgc Exp $
+# $Id: PKGBUILD,v 1.7 2007/09/07 21:56:56 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=abiword-plugins
 pkgver=2.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Various plugins for Abiword"
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.abisource.com"
-options=('nolibtool')
-depends=("abiword>=${pkgver}" 'poppler>=0.5.4-2' 'aiksaurus>=1.2.1' 
+options=('!libtool' '!makeflags')
+depends=("abiword>=${pkgver}" 'poppler>=0.6' 'aiksaurus>=1.2.1' 
          'libgnomedb>=1.2.2' 'gtkmathview>=0.7.7' 'link-grammar>=4.2.4'
-	 'libwmf>=0.2.8.4' 'librsvg>=2.16.1' 'libwpd>=0.8.7' 'libots>=0.4.2'
-	 'psiconv>=0.9.8' 'goffice>=0.2.2')
+	 'libwmf>=0.2.8.4' 'librsvg>=2.18.1' 'libwpd>=0.8.7' 'libots>=0.4.2'
+	 'psiconv>=0.9.8')
 source=(http://www.abisource.com/downloads/abiword/${pkgver}/source/abiword-${pkgver}.tar.bz2
 	abiword-poppler.patch) 
-md5sums=('8ed5fb282b9741aca75b9e47500d39a1' '0a681e3ce1f2c4b676241f11e0687341')
+md5sums=('8ed5fb282b9741aca75b9e47500d39a1' '41365ad59754954cb5cb776f7632bed2')
 
 build() {
   cd ${startdir}/src/abiword-${pkgver}/abiword-plugins
   patch -Np1 -i ${startdir}/src/abiword-poppler.patch || return 1
   ./configure --prefix=/usr
-  make -j1 || return 1
+  make || return 1
   make DESTDIR=${startdir}/pkg install
 }
Index: extra/office/abiword-plugins/abiword-poppler.patch
diff -u extra/office/abiword-plugins/abiword-poppler.patch:1.1 extra/office/abiword-plugins/abiword-poppler.patch:1.2
--- extra/office/abiword-plugins/abiword-poppler.patch:1.1	Sat Dec 23 14:34:36 2006
+++ extra/office/abiword-plugins/abiword-poppler.patch	Fri Sep  7 17:56:56 2007
@@ -9,3 +9,14 @@
        delete textOut;
  
        IE_Imp_Text txt_imp(getDoc(), "UTF-8");      
+--- abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp	2007-09-07 21:45:24.000000000 +0000
++++ abiword-plugins/wp/impexp/pdf/xp/ie_imp_PDF.cpp	2007-09-07 21:49:02.000000000 +0000
+@@ -63,7 +63,7 @@
+   
+     PDFDoc * doc = new PDFDoc(fileName);
+ 
+-    globalParams = new GlobalParams("");
++    globalParams = new GlobalParams();
+     globalParams->setTextEncoding("UTF-8");
+     globalParams->setTextEOL("\n");
+     globalParams->setTextPageBreaks(gFalse);