[arch-commits] CVS update of extra/lib/poppler-qt (PKGBUILD)

[Pierre Schmitz]

    Date: Saturday, November 17, 2007 @ 18:11:08
  Author: pierre
    Path: /home/cvs-extra/extra/lib/poppler-qt

Modified: PKGBUILD (1.8 -> 1.9)

upgpkg: poppler-qt 0.6.1-3
update to qt-4 version


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


Index: extra/lib/poppler-qt/PKGBUILD
diff -u extra/lib/poppler-qt/PKGBUILD:1.8 extra/lib/poppler-qt/PKGBUILD:1.9
--- extra/lib/poppler-qt/PKGBUILD:1.8	Sat Nov 10 10:12:35 2007
+++ extra/lib/poppler-qt/PKGBUILD	Sat Nov 17 18:11:07 2007
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD,v 1.8 2007/11/10 15:12:35 pierre Exp $
+# $Id: PKGBUILD,v 1.9 2007/11/17 23:11:07 pierre Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=poppler-qt
 pkgver=0.6.1
-pkgrel=2
-pkgdesc="Poppler Qt3 bindings"
+pkgrel=3
+pkgdesc="Poppler Qt bindings"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('qt3>=3.3.8' 'poppler>=0.6.1')
+depends=('qt' 'poppler>=0.6.1')
 makedepends=('pkgconfig')
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
@@ -17,8 +17,6 @@
          '4255424fcf2c29fe3cae9cb14a671da6')
 
 build() {
-  . /etc/profile.d/qt3.sh
-  
   cd ${startdir}/src/poppler-${pkgver}
 
   patch -Np1 -i ${startdir}/src/poppler-0.6-bindings.patch || return 1
@@ -29,14 +27,16 @@
 	      --enable-zlib \
 	      --enable-libjpeg \
 	      --enable-cairo-output \
-	      --enable-poppler-qt \
+	      --enable-poppler-qt4 \
 	      --disable-poppler-glib \
 	      --disable-gtk-test \
-	      --disable-poppler-qt4
-  sed -i -e 's|^LDFLAGS =|LDFLAGS = -L/opt/qt/lib -lqt-mt|' qt/Makefile
+	      --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 || return 1
   make DESTDIR=${startdir}/pkg install || return 1
+  rm -f ${startdir}/pkg/usr/lib/pkgconfig/poppler-cairo.pc || return 1
 }