poppler: version bump 0.10.4 -> 0.16.6

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 124 insertions, 88 deletions

diff --git a/patches/poppler-0.10.4/m4_libjpeg-fix.diff b/patches/poppler-0.10.4/m4_libjpeg-fix.diff
deleted file mode 100644
index 1457cf145..000000000
--- a/patches/poppler-0.10.4/m4_libjpeg-fix.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: [libjpeg.m4] use AC_CHECK_HEADER to find headers
-
-The original m4/libjpeg.m4 used AC_FIND_FILE to look for jpeg header file.
-This test is not cross-compiling save. This patch uses the autoconf function
-AC_CHECK_HEADER to look for the jpeg header, which works in the native and
-the cross compiling scenaria.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
-reported upstream as:
-https://bugs.freedesktop.org/show_bug.cgi?id=20538
-
-fixed upstream, will be included in the next release (0.10.5)
-
----
- m4/libjpeg.m4 |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-Index: poppler-0.10.4/m4/libjpeg.m4
-===================================================================
---- poppler-0.10.4.orig/m4/libjpeg.m4
-+++ poppler-0.10.4/m4/libjpeg.m4
-@@ -68,8 +68,7 @@ KDE_FIND_JPEG_HELPER(6b, 6b,
- 
- dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
- dnl requires system dependent includes loaded before it)
--jpeg_incdirs="`eval echo $includedir` /usr/include /usr/local/include /mingw/include"
--AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
-+AC_CHECK_HEADER([jpeglib.h], [jpeg_incdir=yes], [jpeg_incdir=NO])
- test "x$jpeg_incdir" = xNO && jpeg_incdir=
- 
- dnl if headers _and_ libraries are missing, this is no error, and we
diff --git a/patches/poppler-0.10.4/series b/patches/poppler-0.10.4/series
deleted file mode 100644
index 44fdd6c2c..000000000
--- a/patches/poppler-0.10.4/series
+++ /dev/null
@@ -1 +0,0 @@
-m4_libjpeg-fix.diff
diff --git a/patches/poppler-0.16.6/0001-make-qt4-tests-optional.patch b/patches/poppler-0.16.6/0001-make-qt4-tests-optional.patch
new file mode 100644
index 000000000..599535ecf
--- /dev/null
+++ b/patches/poppler-0.16.6/0001-make-qt4-tests-optional.patch
@@ -0,0 +1,60 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 11 Jun 2011 20:23:02 +0200
+Subject: [PATCH] make qt4 tests optional
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac          |   13 ++++++-------
+ qt4/tests/Makefile.am |    2 +-
+ 2 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 471f909..aff11d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -482,19 +482,17 @@ AC_ARG_ENABLE(poppler-qt4,
+ if test x$enable_poppler_qt4 = xyes; then
+   PKG_CHECK_MODULES(POPPLER_QT4, 
+ 	            QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0)
+-  PKG_CHECK_MODULES(POPPLER_QT4_TEST, 
+-	            QtTest >= 4.4.0)
+ elif test x$enable_poppler_qt4 = xtry; then
+   PKG_CHECK_MODULES(POPPLER_QT4,
+                     QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0,
+                     [enable_poppler_qt4="yes"],
+                     [enable_poppler_qt4="no"])
+-  if test x$enable_poppler_qt4 = xyes; then
+-    PKG_CHECK_MODULES(POPPLER_QT4_TEST,
++fi
++if test x$enable_poppler_qt4 = xyes; then
++  PKG_CHECK_MODULES(POPPLER_QT4_TEST,
+                     QtTest >= 4.4.0,
+-                    [enable_poppler_qt4="yes"],
+-                    [enable_poppler_qt4="no"])
+-  fi
++                    [enable_poppler_qt4_tests="yes"],
++                    [enable_poppler_qt4_tests="no"])
+ fi
+ 
+ AC_SUBST(POPPLER_QT4_CXXFLAGS)
+@@ -522,6 +520,7 @@ if test x$enable_poppler_qt4 = xyes; then
+ fi
+ 
+ AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes")
++AM_CONDITIONAL(BUILD_POPPLER_QT4_TESTS, test "x$enable_poppler_qt4_tests" = "xyes")
+ 
+ dnl
+ dnl CPP frontend
+diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
+index 93e1132..9e8deaf 100644
+--- a/qt4/tests/Makefile.am
++++ b/qt4/tests/Makefile.am
+@@ -65,7 +65,7 @@ stress_poppler_dir_LDADD = $(LDADDS)
+ clean-generic:
+ 	rm -f *.moc
+ 
+-if BUILD_POPPLER_QT4
++if BUILD_POPPLER_QT4_TESTS
+ TESTS = \
+ 	check_attachments	\
+ 	check_actualtext	\
diff --git a/patches/poppler-0.10.4/autogen.sh b/patches/poppler-0.16.6/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/poppler-0.10.4/autogen.sh
+++ b/patches/poppler-0.16.6/autogen.sh
diff --git a/patches/poppler-0.16.6/series b/patches/poppler-0.16.6/series
new file mode 100644
index 000000000..ee918b11f
--- /dev/null
+++ b/patches/poppler-0.16.6/series
@@ -0,0 +1,3 @@
+# generated by git-ptx-patches
+0001-make-qt4-tests-optional.patch
+# 43d87fa6b1fe06cfd4205ae4a494e960  - git-ptx-patches magic
diff --git a/rules/poppler.in b/rules/poppler.in
index 0fe816669..c5c875eea 100644
--- a/rules/poppler.in
+++ b/rules/poppler.in
@@ -4,11 +4,18 @@ menuconfig POPPLER
 	tristate
 	prompt "poppler                       "
 	select FONTCONFIG
-	select GLIB	if POPPLER_GLIB
-	select LIBJPEG	if POPPLER_JPEG
-	select CAIRO	if POPPLER_CAIRO
-	select GTK	if POPPLER_SPLASH && POPPLER_GLIB
-	select ZLIB	if POPPLER_ZLIB
+	select HOST_GETTEXT
+	select GLIB		if POPPLER_GLIB
+	select LIBPNG		if POPPLER_PNG
+	select LIBJPEG		if POPPLER_JPEG
+	select CAIRO		if POPPLER_CAIRO
+	select GTK		if POPPLER_SPLASH && POPPLER_GLIB
+	select ZLIB		if POPPLER_ZLIB
+	select LIBCURL		if POPPLER_CURL
+	select LCMS		if POPPLER_CMS
+	select QT4		if POPPLER_QT4
+	select QT4_BUILD_GUI	if POPPLER_QT4
+	select QT4_BUILD_XML	if POPPLER_QT4
 	help
 	  Poppler is a PDF rendering library based on the xpdf-3.0 code base.
 
@@ -28,8 +35,14 @@ config POPPLER_GLIB
 	help
 	  build poppler glib wrapper.
 
-comment "glibc wrapper needs at least one graphics backend"
-	depends on POPPLER_GLIB && !(POPPLER_CAIRO || POPPLER_SPLASH)
+config POPPLER_QT4
+	bool
+	prompt "enable poppler Qt4 wrapper"
+	help
+	  build poppler Qt4 wrapper.
+
+comment "least one graphics backend should be selected"
+	depends on !(POPPLER_CAIRO || POPPLER_SPLASH)
 
 config POPPLER_CAIRO
 	bool
@@ -43,11 +56,17 @@ config POPPLER_SPLASH
 	help
 	  build splash graphics backend
 
+config POPPLER_PNG
+	bool
+	prompt "enable poppler png support"
+	help
+	  compiles poppler with png support.
+
 config POPPLER_JPEG
 	bool
 	prompt "enable poppler jpeg support"
 	help
-	  compiles poppler glib wrapper.
+	  compiles poppler with jpeg support.
 
 config POPPLER_ZLIB
 	bool
@@ -55,4 +74,16 @@ config POPPLER_ZLIB
 	help
 	  compiles poppler with zlib support.
 
+config POPPLER_CURL
+	bool
+	prompt "enable poppler curl support"
+	help
+	  compiles poppler with curl support.
+
+config POPPLER_CMS
+	bool
+	prompt "enable poppler cms support"
+	help
+	  compiles poppler with color management system support.
+
 endif
diff --git a/rules/poppler.make b/rules/poppler.make
index 8caa00616..359e66b42 100644
--- a/rules/poppler.make
+++ b/rules/poppler.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_POPPLER) += poppler
 #
 # Paths and names
 #
-POPPLER_VERSION	:= 0.10.4
-POPPLER_MD5	:= 8d17dbf4e4f0f55bdcf433ce1d5c44b5
+POPPLER_VERSION	:= 0.16.6
+POPPLER_MD5	:= 592a564fb7075a845f75321ed6425424
 POPPLER		:= poppler-$(POPPLER_VERSION)
 POPPLER_SUFFIX	:= tar.gz
 POPPLER_URL	:= http://poppler.freedesktop.org/$(POPPLER).$(POPPLER_SUFFIX)
@@ -45,54 +45,27 @@ POPPLER_ENV 	:= $(CROSS_ENV)
 #
 POPPLER_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-abiword-output \
 	--disable-gdk \
 	--disable-gtk-test \
+	--disable-gtk-doc \
+	--disable-gtk-doc-html \
+	--disable-gtk-doc-pdf \
+	--disable-poppler-cpp \
 	--disable-poppler-qt \
-	--disable-poppler-qt4 \
-	--without-x
-
-ifdef PTXCONF_POPPLER_BIN
-POPPLER_AUTOCONF += --enable-utils
-else
-POPPLER_AUTOCONF += --disable-utils
-endif
-
-ifdef PTXCONF_POPPLER_ZLIB
-POPPLER_AUTOCONF += --enable-zlib
-else
-POPPLER_AUTOCONF += --disable-zlib
-endif
-
-ifdef PTXCONF_POPPLER_JPEG
-POPPLER_AUTOCONF += --enable-libjpeg
-else
-POPPLER_AUTOCONF += --disable-libjpeg
-endif
-
-ifdef PTXCONF_POPPLER_CAIRO
-POPPLER_AUTOCONF += --enable-cairo-output
-else
-POPPLER_AUTOCONF += --disable-cairo-output
-endif
-
-ifdef PTXCONF_POPPLER_SPLASH
-POPPLER_AUTOCONF += --enable-splash-output
-else
-POPPLER_AUTOCONF += --disable-splash-output
-endif
-
-ifdef PTXCONF_POPPLER_GLIB
-POPPLER_AUTOCONF += --enable-poppler-glib
-else
-POPPLER_AUTOCONF += --disable-poppler-glib
-endif
-
-ifdef PTXCONF_HAS_HARDFLOAT
-POPPLER_AUTOCONF += --disable-fixedpoint
-else
-POPPLER_AUTOCONF += --enable-fixedpoint
-endif
+	--without-x \
+	--$(call ptx/endis, PTXCONF_POPPLER_GLIB)-poppler-glib \
+	--$(call ptx/endis, PTXCONF_POPPLER_QT4)-poppler-qt4 \
+	--$(call ptx/endis, PTXCONF_POPPLER_CAIRO)-cairo-output \
+	--$(call ptx/endis, PTXCONF_POPPLER_SPLASH)-splash-output \
+	--$(call ptx/endis, PTXCONF_POPPLER_ZLIB)-zlib \
+	--$(call ptx/endis, PTXCONF_POPPLER_LIB)-libcurl \
+	--$(call ptx/endis, PTXCONF_POPPLER_JPEG)-libjpeg \
+	--$(call ptx/endis, PTXCONF_POPPLER_PNG)-libpng \
+	--$(call ptx/endis, PTXCONF_POPPLER_CMS)-cms \
+	--$(call ptx/endis, PTXCONF_POPPLER_BIN)-utils \
+	--$(call ptx/disen, PTXCONF_HAS_HARDFLOAT)-single-precision
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -118,6 +91,9 @@ endif
 ifdef PTXCONF_POPPLER_GLIB
 	@$(call install_lib, poppler, 0, 0, 0644, libpoppler-glib)
 endif
+ifdef PTXCONF_POPPLER_QT4
+	@$(call install_lib, poppler, 0, 0, 0644, libpoppler-qt4)
+endif
 	@$(call install_finish, poppler)
 
 	@$(call touch)