poppler: enable cairo output, xpdf compat headers.

srcpkgs/poppler/depends

@@ -1,2 +1,2 @@
 abi_depends=">=0.18.2"
-api_depends="${abi_depends}"
+api_depends="${abi_depends}_1"

srcpkgs/poppler/poppler-cpp-devel.template

@@ -5,9 +5,11 @@ long_desc="${long_desc}
 
  This package contains development files for C++ bindings."
 
+revision=1
+
 Add_dependency run libstdc++-devel
 Add_dependency run zlib-devel
-Add_dependency run poppler-devel
+Add_dependency run poppler-devel ">=${version}"
 
 do_install()
 {

srcpkgs/poppler/poppler-cpp.template

@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains ${sourcepkg} C++ bindings."
 
+revision=1
+
 do_install() {
 	vmove "usr/lib/libpoppler-cpp.so*" usr/lib
 }

srcpkgs/poppler/poppler-devel.template

@@ -6,10 +6,13 @@ long_desc="${long_desc}
  This package contains files for development, headers, static libs, etc."
 
 Add_dependency run glib-devel
-Add_dependency run poppler
+Add_dependency run poppler ">=${version}"
+
+revision=1
 
 do_install()
 {
+	vmove usr/include/poppler usr/include
 	vmove usr/lib/libpoppler.a usr/lib
 	vmove usr/lib/pkgconfig/poppler.pc usr/lib/pkgconfig
 	vmove usr/lib/pkgconfig/poppler-splash.pc usr/lib/pkgconfig

srcpkgs/poppler/poppler-glib-devel.template

@@ -5,8 +5,10 @@ long_desc="${long_desc}
 
  This package contains development files for GTK+/Glib bindings."
 
-Add_dependency run poppler-devel
-Add_dependency run poppler-glib
+Add_dependency run poppler-devel ">=${version}"
+Add_dependency run poppler-glib ">=${version}"
+
+revision=1
 
 do_install()
 {

srcpkgs/poppler/poppler-glib.rshlibs

@@ -3,8 +3,6 @@ libjpeg.so.8
 libpng14.so.14
 libcurl.so.4
 libgobject-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libcairo.so.2
 libfreetype.so.6

srcpkgs/poppler/poppler-glib.template

@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains ${sourcepkg} GTK/GLib bindings."
 
+revision=1
+
 do_install() {
 	vmove "usr/lib/libpoppler-glib.so*" usr/lib
 	vmove usr/lib/girepository-1.0 usr/lib

srcpkgs/poppler/poppler-qt4-devel.template

@@ -5,11 +5,13 @@ long_desc="${long_desc}
 
  This package contains development files for QT 4 bindings."
 
-Add_dependency run poppler-devel
+Add_dependency run poppler-devel ">=${version}"
+
+revision=1
 
 do_install()
 {
-	vmove usr/include usr
+	vmove usr/include/poppler/qt4 usr/include/poppler
 	vmove usr/lib/libpoppler-qt4.a usr/lib
-	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/lib/pkgconfig/poppler-qt4.pc usr/lib
 }

srcpkgs/poppler/poppler-qt4.template

@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains ${sourcepkg} QT 4 bindings."
 
+revision=1
+
 do_install() {
 	vmove "usr/lib/libpoppler-qt4.so*" usr/lib
 }

srcpkgs/poppler/poppler-utils.rshlibs

@@ -11,7 +11,6 @@ libgdk-x11-2.0.so.0
 libgdk_pixbuf-2.0.so.0
 libgio-2.0.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libglib-2.0.so.0
 libgcc_s.so.1	i686
 libpoppler.so.19

srcpkgs/poppler/poppler-utils.template

@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the ${sourcepkg} binary utilities."
 
+revision=1
+
 do_install() {
 	vmove usr/bin usr
 	vmove usr/share/man usr/share

srcpkgs/poppler/template

@@ -1,11 +1,13 @@
 # Template build file for 'poppler'.
 pkgname=poppler
 version=0.18.4
+revision=1
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
---enable-libtiff --disable-libopenjpeg"
+--enable-libtiff --disable-libopenjpeg --enable-cairo-output
+--enable-xpdf-headers"
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -20,9 +22,9 @@ long_desc="
  forward in a number of areas that doesn't fit within the goals of
  xpdf."
 
-subpackages="$pkgname-devel $pkgname-glib $pkgname-glib-devel $pkgname-utils"
+subpackages="$pkgname-glib $pkgname-glib-devel $pkgname-utils"
 subpackages="$subpackages $pkgname-cpp $pkgname-cpp-devel"
-subpackages="$subpackages $pkgname-qt4 $pkgname-qt4-devel"
+subpackages="$subpackages $pkgname-qt4 $pkgname-qt4-devel $pkgname-devel"
 
 Add_dependency build pkg-config
 Add_dependency build gobject-introspection