Maj poppler-qt#0.13.1-3

2 files changed, 19 insertions, 40 deletions

diff --git a/kde/poppler-qt/.footprint b/kde/poppler-qt/.footprint
index 5ae2c4a59..5e9e8c526 100644
--- a/kde/poppler-qt/.footprint
+++ b/kde/poppler-qt/.footprint
@@ -1,32 +1,18 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/pdffonts
--rwxr-xr-x	root/root	usr/bin/pdfimages
--rwxr-xr-x	root/root	usr/bin/pdfinfo
--rwxr-xr-x	root/root	usr/bin/pdftoabw
--rwxr-xr-x	root/root	usr/bin/pdftohtml
--rwxr-xr-x	root/root	usr/bin/pdftoppm
--rwxr-xr-x	root/root	usr/bin/pdftops
--rwxr-xr-x	root/root	usr/bin/pdftotext
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/poppler/
+drwxr-xr-x	root/root	usr/include/poppler/qt4/
+-rw-r--r--	root/root	usr/include/poppler/qt4/poppler-annotation.h
+-rw-r--r--	root/root	usr/include/poppler/qt4/poppler-export.h
+-rw-r--r--	root/root	usr/include/poppler/qt4/poppler-form.h
+-rw-r--r--	root/root	usr/include/poppler/qt4/poppler-link.h
+-rw-r--r--	root/root	usr/include/poppler/qt4/poppler-optcontent.h
+-rw-r--r--	root/root	usr/include/poppler/qt4/poppler-page-transition.h
+-rw-r--r--	root/root	usr/include/poppler/qt4/poppler-qt4.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libpoppler-qt4.la
--rwxr-xr-x	root/root	usr/lib/libpoppler.la
-lrwxrwxrwx	root/root	usr/lib/libpoppler.so -> libpoppler.so.6.0.0
-lrwxrwxrwx	root/root	usr/lib/libpoppler.so.6 -> libpoppler.so.6.0.0
--rwxr-xr-x	root/root	usr/lib/libpoppler.so.6.0.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler-qt4.so -> libpoppler-qt4.so.3.2.0
+lrwxrwxrwx	root/root	usr/lib/libpoppler-qt4.so.3 -> libpoppler-qt4.so.3.2.0
+-rwxr-xr-x	root/root	usr/lib/libpoppler-qt4.so.3.2.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/poppler-cairo.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/poppler-splash.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/poppler.pc
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/pdffonts.1.gz
--rw-r--r--	root/root	usr/share/man/man1/pdfimages.1.gz
--rw-r--r--	root/root	usr/share/man/man1/pdfinfo.1.gz
--rw-r--r--	root/root	usr/share/man/man1/pdftohtml.1.gz
--rw-r--r--	root/root	usr/share/man/man1/pdftoppm.1.gz
--rw-r--r--	root/root	usr/share/man/man1/pdftops.1.gz
--rw-r--r--	root/root	usr/share/man/man1/pdftotext.1.gz
+-rw-r--r--	root/root	usr/lib/pkgconfig/poppler-qt4.pc
diff --git a/kde/poppler-qt/Pkgfile b/kde/poppler-qt/Pkgfile
index e9e56b94d..bfacb0c0d 100755
--- a/kde/poppler-qt/Pkgfile
+++ b/kde/poppler-qt/Pkgfile
@@ -6,33 +6,26 @@
 
 name=poppler-qt
 version=0.13.0
-release=2
+release=3
 source=(http://poppler.freedesktop.org/poppler-$version.tar.gz)
 
 build() { 
 	cd poppler-$version
-	libtoolize --force --copy
-	AT_M4DIR="m4" autoreconf -i
 	  ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --enable-zlib \
 	      --enable-libjpeg \
-	      --enable-cairo-output \
+	--disable-xpdf-headers \
+	      --disable-cairo-output \
 	      --enable-poppler-qt4 \
 	      --disable-poppler-glib \
 	      --disable-gtk-test \
 	      --disable-poppler-qt
-	sed -i -e 's|^LDFLAGS =|LDFLAGS = -lqt-mt|' qt/Makefile
-	make -C goo libgoo.la
-	make -C splash libsplash.la
-	make -C fofi libfofi.la
-	make -C poppler libpoppler.la libpoppler-cairo.la libpoppler-arthur.la
-	make
+	make -j3
 	make prefix=$PKG/usr install
 
-	rm -rf $PKG/usr/include/poppler/{glib,qt3,qt4}
-  	rm -f $PKG/usr/lib/libpoppler-{glib,qt,qt4}.so*
-  	rm -f $PKG/usr/lib/pkgconfig/poppler-{glib,qt,qt4}.pc
-  	rm -rf $PKG/usr/share/gtk-doc
+	rm -rf $PKG/usr/{share,bin}
+  	rm -f $PKG/usr/lib/libpoppler{-{glib,qt}.so*,.*}
+  	rm -f $PKG/usr/lib/pkgconfig/poppler{,-{glib,qt,cairo,splash}}.pc
 }