[arch-commits] Commit in poppler-qt/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, April 20, 2008 @ 08:14:39
  Author: jgc
Revision: 502

Merged revisions 2-501 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/poppler-qt/trunk

........
  r167 | jgc | 2008-04-12 14:00:51 +0000 (Sat, 12 Apr 2008) | 1 line
  
  upgpkg: poppler-qt 0.8.0-1
........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Modified:
  poppler-qt/repos/extra-i686/	(properties)
  poppler-qt/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


Property changes on: poppler-qt/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /poppler-qt/trunk:1
   + /poppler-qt/trunk:1-501

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-20 12:09:32 UTC (rev 501)
+++ extra-i686/PKGBUILD	2008-04-20 12:14:39 UTC (rev 502)
@@ -2,12 +2,12 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=poppler-qt
-pkgver=0.6.3
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="Poppler Qt bindings"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('qt' 'poppler>=0.6.3')
+depends=('qt>=4.3.3' 'poppler>=0.6.3')
 makedepends=('pkgconfig')
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
@@ -18,8 +18,8 @@
   cd ${startdir}/src/poppler-${pkgver}
 
   patch -Np1 -i ${startdir}/src/poppler-0.6-bindings.patch || return 1
-  
-  AT_M4DIR="m4" autoreconf
+  libtoolize --force --copy || return 1
+  AT_M4DIR="m4" autoreconf || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --enable-zlib \
@@ -30,13 +30,13 @@
 	      --disable-gtk-test \
 	      --disable-poppler-qt
   sed -i -e 's|^LDFLAGS =|LDFLAGS = -lqt-mt|' qt/Makefile
-  pushd poppler || return 1
-  make libpoppler-cairo.la || return 1
-  make libpoppler-arthur.la || return 1
-  popd
+  make -C goo libgoo.la || return 1
+  make -C splash libsplash.la || return 1
+  make -C fofi libfofi.la || return 1
+  make -C poppler libpoppler.la libpoppler-cairo.la libpoppler-arthur.la || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
   rm -f ${startdir}/pkg/usr/lib/pkgconfig/poppler-cairo.pc || return 1
 }
-md5sums=('a585677188cd56a090c4dc3357e03a95'
+md5sums=('1a3ea3000d3446a97366c37b876979f4'
          '4255424fcf2c29fe3cae9cb14a671da6')