From 984b5f22f2f22c7e2307bcf6d9812a10d31efccd Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 11 Oct 2012 10:43:04 +0200 Subject: [PATCH] poppler-qt4: disable static, set -devel noarch. --- srcpkgs/poppler-qt4/poppler-qt4-devel.template | 4 ++-- srcpkgs/poppler-qt4/template | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/poppler-qt4/poppler-qt4-devel.template b/srcpkgs/poppler-qt4/poppler-qt4-devel.template index 1e786687c3..4605bfabc4 100644 --- a/srcpkgs/poppler-qt4/poppler-qt4-devel.template +++ b/srcpkgs/poppler-qt4/poppler-qt4-devel.template @@ -1,6 +1,7 @@ # Template file for 'poppler-qt4-devel'. # -depends="poppler-qt4>=$version" +noarch=yes +depends="${sourcepkg}-${version}_${revision}" short_desc="${sourcepkg} QT 4 bindings (development files)" long_desc="${long_desc} @@ -8,7 +9,6 @@ long_desc="${long_desc} do_install() { vmove usr/include/poppler/qt4 usr/include/poppler - vmove usr/lib/libpoppler-qt4.a usr/lib vmove usr/lib/pkgconfig/poppler-qt4.pc usr/lib/pkgconfig rm -rf ${SRCPKGDESTDIR}/usr/include } diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template index f0972a6057..10c4d60327 100644 --- a/srcpkgs/poppler-qt4/template +++ b/srcpkgs/poppler-qt4/template @@ -1,17 +1,18 @@ # Template file for 'poppler-qt4'. pkgname=poppler-qt4 version=0.20.2 -revision=1 +revision=2 wrksrc="poppler-${version}" depends="qt>=4.8.2_2" build_style=gnu-configure configure_args="--enable-zlib --enable-libcurl --enable-libjpeg ---enable-libtiff --disable-libopenjpeg --enable-cairo-output ---enable-xpdf-headers --disable-gtk-test --disable-poppler-glib ---enable-poppler-qt4 --disable-poppler-cpp --disable-utils" + --enable-libtiff --disable-libopenjpeg --enable-cairo-output + --enable-xpdf-headers --disable-gtk-test --disable-poppler-glib + --enable-poppler-qt4 --disable-poppler-cpp --disable-utils + --disable-static" subpackages="poppler-qt4-devel" makedepends="pkg-config libpng-devel>=1.5.10 gobject-introspection -tiff-devel lcms2-devel libcurl-devel qt-devel>=4.8.2_2" + tiff-devel lcms2-devel libcurl-devel qt-devel>=4.8.2_2" fulldepends="poppler-data" short_desc="PDF rendering library -- QT bindings" maintainer="Juan RP "