# HG changeset patch
# User ernia <monghitri@aruba.it>
# Date 1360393159 0
# Node ID 040e376db2cd1a289a72bf1002c199427c94e6f9
# Parent  cfea6eaa0adaa4e90dfab4da3caab5c3d47e6623
poppler*:reorganized receipt + added poppler-qt4-dev

diff -r cfea6eaa0ada -r 040e376db2cd poppler-dev/receipt
--- a/poppler-dev/receipt	Fri Feb 08 22:33:30 2013 +0000
+++ b/poppler-dev/receipt	Sat Feb 09 06:59:19 2013 +0000
@@ -21,4 +21,8 @@
 	cp $src/poppler/*.h $fs/usr/include/poppler
 	cp $src/goo/*.h $fs/usr/include/poppler/goo
 	cp $src/splash/*.h $fs/usr/include/poppler/splash
+	#included in poppler-qt4-dev
+	rm -r $fs/usr/include/poppler/qt4
+	rm $fs/usr/lib/*qt4.*a
+	rm $fs/usr/lib/pkgconfig/poppler-qt4.pc
 }
diff -r cfea6eaa0ada -r 040e376db2cd poppler-qt4-dev/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/poppler-qt4-dev/receipt	Sat Feb 09 06:59:19 2013 +0000
@@ -0,0 +1,21 @@
+# SliTaz package receipt.
+
+PACKAGE="poppler-qt4-dev"
+VERSION="0.22.0"
+CATEGORY="development"
+SHORT_DESC="Poppler qt4 devel files."
+MAINTAINER="pankso@slitaz.org"
+DEPENDS="poppler-dev"
+WANTED="poppler"
+WEB_SITE="http://poppler.freedesktop.org/"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/lib \
+		$fs/usr/include/poppler/ \
+		$fs/usr/lib/pkgconfig
+	cp -a $_pkg/usr/lib/*qt4.*a $fs/usr/lib
+	cp -a $_pkg/usr/include/poppler/qt4 $fs/usr/include/poppler
+	cp -a $_pkg/usr/lib/pkgconfig/poppler-qt4.pc $fs/usr/lib
+}
diff -r cfea6eaa0ada -r 040e376db2cd poppler-qt4/receipt
--- a/poppler-qt4/receipt	Fri Feb 08 22:33:30 2013 +0000
+++ b/poppler-qt4/receipt	Sat Feb 09 06:59:19 2013 +0000
@@ -5,25 +5,9 @@
 CATEGORY="office"
 SHORT_DESC="Poppler compiled with Qt4 library."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="expat freetype glib jpeg xorg-libXdamage lcms \
-gcc-lib-base gtk+ cairo libQtCore libQtXml libQtGui gcc-lib-base"
-BUILD_DEPENDS="pkg-config Qt4-dev fontconfig-dev expat-dev"
-SOURCE="poppler"
-TARBALL="$SOURCE-$VERSION.tar.gz"
+DEPENDS="poppler libQtCore libQtXml libQtGui"
+WANTED="poppler"
 WEB_SITE="http://poppler.freedesktop.org/"
-WGET_URL="http://poppler.freedesktop.org/$TARBALL"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure \
-		--enable-poppler-qt4 \
-		--enable-zlib \
-		$CONFIGURE_ARGS &&
-	make &&
-	make install
-}
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r cfea6eaa0ada -r 040e376db2cd poppler/receipt
--- a/poppler/receipt	Fri Feb 08 22:33:30 2013 +0000
+++ b/poppler/receipt	Sat Feb 09 06:59:19 2013 +0000
@@ -13,7 +13,7 @@
 gcc-lib-base cairo tiff bzlib libpng"
 BUILD_DEPENDS="$DEPENDS expat-dev pkg-config jpeg-dev tiff-dev \
 freetype-dev fontconfig-dev glib-dev lcms-dev zlib-dev cairo-dev \
-automake bzip2-dev libpng-dev libtool"
+automake bzip2-dev libpng-dev libtool Qt4-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -24,6 +24,7 @@
 	./configure \
 		--enable-zlib \
 		--enable-cairo-output \
+		--enable-poppler-qt4 \
 		$CONFIGURE_ARGS &&
 	make &&	make install
 }
@@ -33,4 +34,6 @@
 {
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
+	#following libs are included in poppler-qt4
+	rm -r $fs/usr/lib/*qt4.so*
 }