Merge remote branch 'nutyx-2009/master'

4 files changed, 13 insertions, 200 deletions

diff --git a/kde/poppler-qt/.footprint b/kde/poppler-qt/.footprint
index 7ba58dc13..5e9e8c526 100644
--- a/kde/poppler-qt/.footprint
+++ b/kde/poppler-qt/.footprint
@@ -7,7 +7,6 @@ drwxr-xr-x	root/root	usr/include/poppler/qt4/
 -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-private.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/
diff --git a/kde/poppler-qt/.md5sum b/kde/poppler-qt/.md5sum
index 6b912dde1..e5781d60d 100644
--- a/kde/poppler-qt/.md5sum
+++ b/kde/poppler-qt/.md5sum
@@ -1,2 +1 @@
-3f828a8372687c6c0ca88925ff4f5036  poppler-0.10-bindings.patch
-d0ca8344d8d94e27aaba6d432688365d  poppler-0.12.3.tar.gz
+4923c1d7b08f8eabe1b6a53d3dcb93ee  poppler-0.13.0.tar.gz
diff --git a/kde/poppler-qt/Pkgfile b/kde/poppler-qt/Pkgfile
index 83165eaac..bfacb0c0d 100755
--- a/kde/poppler-qt/Pkgfile
+++ b/kde/poppler-qt/Pkgfile
@@ -5,31 +5,27 @@
 # Depends on: qt, poppler
 
 name=poppler-qt
-version=0.12.3
-release=1
-source=(http://poppler.freedesktop.org/poppler-$version.tar.gz \
-	poppler-0.10-bindings.patch)
+version=0.13.0
+release=3
+source=(http://poppler.freedesktop.org/poppler-$version.tar.gz)
 
-build() {
+build() { 
 	cd poppler-$version
-	patch -Np1 -i ../poppler-0.10-bindings.patch
-	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 -f $PKG/usr/lib/pkgconfig/poppler-cairo.pc
+
+	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
 }
+
diff --git a/kde/poppler-qt/poppler-0.10-bindings.patch b/kde/poppler-qt/poppler-0.10-bindings.patch
deleted file mode 100644
index e44a262c0..000000000
--- a/kde/poppler-qt/poppler-0.10-bindings.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -ruN poppler-0.10.0/Makefile.am poppler-0.10.0-bindings/Makefile.am
---- poppler-0.10.0/Makefile.am	2008-09-09 23:46:50.000000000 +0200
-+++ poppler-0.10.0-bindings/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -29,7 +29,7 @@
- utils_subdir = utils
- endif
- 
--SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
-+SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
- 
- EXTRA_DIST =					\
- 	README-XPDF				\
-@@ -40,9 +40,6 @@
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA =				\
--	poppler.pc				\
--	$(cairo_pc_file)			\
--	$(splash_pc_file)			\
- 	$(glib_pc_file)				\
- 	$(qt_pc_file)                           \
- 	$(qt4_pc_file)
-diff -ruN poppler-0.10.0/glib/Makefile.am poppler-0.10.0-bindings/glib/Makefile.am
---- poppler-0.10.0/glib/Makefile.am	2008-09-27 17:21:45.000000000 +0200
-+++ poppler-0.10.0-bindings/glib/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -87,7 +87,7 @@
- 	poppler-private.h
- 
- libpoppler_glib_la_LIBADD =				\
--	$(top_builddir)/poppler/libpoppler.la		\
-+	-lpoppler					\
- 	$(POPPLER_GLIB_LIBS)				\
- 	$(GDK_LIBS)					\
- 	$(FREETYPE_LIBS)				\
-@@ -103,7 +103,7 @@
-        test-poppler-glib.cc
- 
- test_poppler_glib_LDADD =			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	libpoppler-glib.la			\
- 	$(POPPLER_GLIB_LIBS)			\
- 	$(GDK_LIBS)				\
-diff -ruN poppler-0.10.0/glib/demo/Makefile.am poppler-0.10.0-bindings/glib/demo/Makefile.am
---- poppler-0.10.0/glib/demo/Makefile.am	2008-08-24 18:19:55.000000000 +0200
-+++ poppler-0.10.0-bindings/glib/demo/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -36,5 +36,5 @@
- 
- LDADD =						\
- 	$(top_builddir)/glib/libpoppler-glib.la	\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(GTK_TEST_LIBS)
-diff -ruN poppler-0.10.0/glib/reference/Makefile.am poppler-0.10.0-bindings/glib/reference/Makefile.am
---- poppler-0.10.0/glib/reference/Makefile.am	2008-07-24 22:45:05.000000000 +0200
-+++ poppler-0.10.0-bindings/glib/reference/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -73,7 +73,7 @@
- 	$(GDK_CFLAGS)					\
- 	$(FREETYPE_CFLAGS)
- 
--GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la	\
-+GTKDOC_LIBS=-lpoppler	\
- 	$(top_builddir)/glib/libpoppler-glib.la		\
- 	$(POPPLER_GLIB_LIBS)				\
- 	$(FREETYPE_LIBS)				\
-diff -ruN poppler-0.10.0/qt/Makefile.am poppler-0.10.0-bindings/qt/Makefile.am
---- poppler-0.10.0/qt/Makefile.am	2008-07-24 22:45:05.000000000 +0200
-+++ poppler-0.10.0-bindings/qt/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -24,7 +24,7 @@
- 	poppler-private.h
- 
- libpoppler_qt_la_LIBADD = 			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)			\
- 	$(FONTCONFIG_LIBS)
-@@ -41,7 +41,7 @@
-        test-poppler-qt.cpp
- 
- test_poppler_qt_LDADD =				\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	libpoppler-qt.la			\
- 	$(POPPLER_QT_LIBS)			\
- 	$(FREETYPE_LIBS)
-diff -ruN poppler-0.10.0/qt4/demos/Makefile.am poppler-0.10.0-bindings/qt4/demos/Makefile.am
---- poppler-0.10.0/qt4/demos/Makefile.am	2008-07-24 22:45:06.000000000 +0200
-+++ poppler-0.10.0-bindings/qt4/demos/Makefile.am	2008-11-08 00:05:09.000000000 +0100
-@@ -7,7 +7,7 @@
- 	$(POPPLER_QT4_CFLAGS)
- 
- LDADDS =					\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
-diff -ruN poppler-0.10.0/qt4/src/Makefile.am poppler-0.10.0-bindings/qt4/src/Makefile.am
---- poppler-0.10.0/qt4/src/Makefile.am	2008-09-10 00:02:49.000000000 +0200
-+++ poppler-0.10.0-bindings/qt4/src/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -52,7 +52,7 @@
- 	poppler-private.h
- 
- libpoppler_qt4_la_LIBADD = 			\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
- 
-diff -ruN poppler-0.10.0/qt4/tests/Makefile.am poppler-0.10.0-bindings/qt4/tests/Makefile.am
---- poppler-0.10.0/qt4/tests/Makefile.am	2008-09-05 18:41:33.000000000 +0200
-+++ poppler-0.10.0-bindings/qt4/tests/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -7,7 +7,7 @@
- 	$(POPPLER_QT4_CFLAGS)
- 
- LDADDS =					\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
- 	$(FONTCONFIG_LIBS)				\
- 	$(POPPLER_QT4_LIBS)
-diff -ruN poppler-0.10.0/test/Makefile.am poppler-0.10.0-bindings/test/Makefile.am
---- poppler-0.10.0/test/Makefile.am	2008-10-06 19:35:46.000000000 +0200
-+++ poppler-0.10.0-bindings/test/Makefile.am	2008-11-08 00:05:42.000000000 +0100
-@@ -51,14 +51,14 @@
-        gtk-splash-test.cc
- 
- gtk_splash_test_LDADD =				\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(GTK_TEST_LIBS)
- 
- gtk_cairo_test_SOURCES =			\
-        gtk-cairo-test.cc
- 
- gtk_cairo_test_LDADD =					\
--	$(top_builddir)/poppler/libpoppler.la		\
-+	-lpoppler		\
- 	$(top_builddir)/glib/libpoppler-glib.la		\
- 	$(CAIRO_LIBS)					\
- 	$(GTK_TEST_LIBS)				\
-@@ -69,7 +69,7 @@
- 
- pdf_inspector_LDADD =					\
- 	$(top_builddir)/poppler/libpoppler-cairo.la	\
--	$(top_builddir)/poppler/libpoppler.la		\
-+	-lpoppler		\
- 	$(CAIRO_LIBS)					\
- 	$(FREETYPE_LIBS)				\
- 	$(GTK_TEST_LIBS)				\
-@@ -80,7 +80,7 @@
-        perf-test-preview-dummy.cc
- 
- perf_test_LDADD =				\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(FREETYPE_LIBS)					\
- 	$(X_EXTRA_LIBS)
- 
-@@ -88,7 +88,7 @@
- 	pdf-fullrewrite.cc
- 
- pdf_fullrewrite_LDADD = \
--	$(top_builddir)/poppler/libpoppler.la
-+	-lpoppler
- 
- EXTRA_DIST =					\
- 	pdf-operators.c				\
-diff -ruN poppler-0.10.0/utils/Makefile.am poppler-0.10.0-bindings/utils/Makefile.am
---- poppler-0.10.0/utils/Makefile.am	2008-09-09 20:55:24.000000000 +0200
-+++ poppler-0.10.0-bindings/utils/Makefile.am	2008-11-08 00:03:17.000000000 +0100
-@@ -29,7 +29,7 @@
- 	$(ABIWORD_CFLAGS)
- 
- LDADD =						\
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler	\
- 	$(UTILS_LIBS)				\
- 	$(FONTCONFIG_LIBS)
-