diff --git a/srcpkgs/poppler-qt4 b/srcpkgs/poppler-qt4 new file mode 120000 index 0000000000..5d4379bfb7 --- /dev/null +++ b/srcpkgs/poppler-qt4 @@ -0,0 +1 @@ +poppler \ No newline at end of file diff --git a/srcpkgs/poppler-qt4-devel b/srcpkgs/poppler-qt4-devel new file mode 120000 index 0000000000..5d4379bfb7 --- /dev/null +++ b/srcpkgs/poppler-qt4-devel @@ -0,0 +1 @@ +poppler \ No newline at end of file diff --git a/srcpkgs/poppler/poppler-devel.template b/srcpkgs/poppler/poppler-devel.template index 43bf0f20c2..ba805740a5 100644 --- a/srcpkgs/poppler/poppler-devel.template +++ b/srcpkgs/poppler/poppler-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run pkg-config Add_dependency run gtk+-devel Add_dependency run jpeg-devel @@ -15,6 +13,7 @@ Add_dependency run freetype-devel Add_dependency run fontconfig-devel Add_dependency run libpng-devel Add_dependency run zlib-devel +Add_dependency run qt-devel Add_dependency run poppler do_install() diff --git a/srcpkgs/poppler/poppler-glib-devel.template b/srcpkgs/poppler/poppler-glib-devel.template index a8243b3760..cb1238f159 100644 --- a/srcpkgs/poppler/poppler-glib-devel.template +++ b/srcpkgs/poppler/poppler-glib-devel.template @@ -19,8 +19,10 @@ Add_dependency run poppler-glib do_install() { - mkdir -p ${DESTDIR}/usr/lib/pkgconfig - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mkdir -p ${DESTDIR}/usr/lib/pkgconfig \ + ${DESTDIR}/usr/include/poppler + mv ${SRCPKGDESTDIR}/usr/include/poppler/glib \ + ${DESTDIR}/usr/include/poppler mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.*a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-glib.so ${DESTDIR}/usr/lib for f in poppler-cairo poppler-glib; do diff --git a/srcpkgs/poppler/poppler-glib.template b/srcpkgs/poppler/poppler-glib.template index e97ac8075c..95650539cc 100644 --- a/srcpkgs/poppler/poppler-glib.template +++ b/srcpkgs/poppler/poppler-glib.template @@ -5,15 +5,15 @@ long_desc="${long_desc} This package contains ${sourcepkg} GTK/GLib bindings." +Add_dependency run libgcc +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run zlib +Add_dependency run glib Add_dependency run pango +Add_dependency run cairo Add_dependency run freetype Add_dependency run fontconfig -Add_dependency run zlib -Add_dependency run libstdc++ -Add_dependency run glibc -Add_dependency run libgcc -Add_dependency run glib -Add_dependency run cairo Add_dependency run gtk+ Add_dependency run poppler diff --git a/srcpkgs/poppler/poppler-qt4-devel.template b/srcpkgs/poppler/poppler-qt4-devel.template new file mode 100644 index 0000000000..0187115d70 --- /dev/null +++ b/srcpkgs/poppler/poppler-qt4-devel.template @@ -0,0 +1,21 @@ +# Template file for 'poppler-qt4-devel'. +# +short_desc="${sourcepkg} QT 4 bindings (development files)" +long_desc="${long_desc} + + This package contains development files for QT 4 bindings." + +Add_dependency run glibc-devel +Add_dependency run libstdc++-devel +Add_dependency run zlib-devel +Add_dependency run qt-devel +Add_dependency run poppler-devel + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-qt4.*a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-qt4.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/poppler/poppler-qt4.template b/srcpkgs/poppler/poppler-qt4.template new file mode 100644 index 0000000000..105acb3bbe --- /dev/null +++ b/srcpkgs/poppler/poppler-qt4.template @@ -0,0 +1,20 @@ +# Template file for 'poppler-qt4'. +# +short_desc="${short_desc} (QT bindings)" +long_desc="${long_desc} + + This package contains ${sourcepkg} QT 4 bindings." + +Add_dependency run libgcc +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run zlib +Add_dependency run qt +Add_dependency run fontconfig +Add_dependency run poppler + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libpoppler-qt4.so.* ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/poppler/poppler-utils.template b/srcpkgs/poppler/poppler-utils.template index 375d2216a2..95c56122aa 100644 --- a/srcpkgs/poppler/poppler-utils.template +++ b/srcpkgs/poppler/poppler-utils.template @@ -5,11 +5,11 @@ long_desc="${long_desc} This package contains the ${sourcepkg} binary utilities." -Add_dependency run fontconfig -Add_dependency run zlib -Add_dependency run libstdc++ -Add_dependency run glibc Add_dependency run libgcc +Add_dependency run glibc +Add_dependency run libstdc++ +Add_dependency run zlib +Add_dependency run fontconfig Add_dependency run poppler do_install() diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index da5153ca7d..cdb969ac4d 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -1,14 +1,13 @@ # Template build file for 'poppler'. pkgname=poppler -version=0.12.3 -revision=1 +version=0.12.4 distfiles="http://poppler.freedesktop.org/$pkgname-$version.tar.gz" build_style=gnu_configure -configure_args="--enable-zlib --disable-poppler-qt --disable-poppler-qt4 +configure_args="--enable-zlib --disable-poppler-qt --enable-libjpeg --disable-libopenjpeg --disable-abiword-output" short_desc="PDF rendering library" maintainer="Juan RP " -checksum=7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc +checksum=2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a long_desc=" This is poppler, a PDF rendering library. It is a fork of the xpdf 3.0 PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. @@ -20,15 +19,17 @@ long_desc=" xpdf." subpackages="$pkgname-devel $pkgname-glib $pkgname-glib-devel $pkgname-utils" +subpackages="$subpackages $pkgname-qt4 $pkgname-qt4-devel" + +Add_dependency run libgcc Add_dependency run glibc +Add_dependency run libstdc++ Add_dependency run zlib Add_dependency run jpeg Add_dependency run libpng Add_dependency run lcms Add_dependency run freetype Add_dependency run fontconfig -Add_dependency run libstdc++ -Add_dependency run libgcc Add_dependency build pkg-config Add_dependency build gtk+-devel Add_dependency build jpeg-devel @@ -37,3 +38,4 @@ Add_dependency build freetype-devel Add_dependency build fontconfig-devel Add_dependency build libpng-devel Add_dependency build zlib-devel +Add_dependency build qt-devel