Update to 0.10.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11926 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 195 insertions, 0 deletions

diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
new file mode 100644
index 000000000..94d7703cd
--- /dev/null
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -0,0 +1,45 @@
+--- glib/Makefile.in.orig	2008-03-24 09:03:54.000000000 -0400
++++ glib/Makefile.in	2008-03-24 09:04:38.000000000 -0400
+@@ -66,7 +66,6 @@
+ @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
+ libpoppler_glib_la_DEPENDENCIES =  \
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ am__objects_1 = poppler-enums.lo
+@@ -80,7 +79,6 @@
+ @BUILD_WITH_GDK_TRUE@	test-poppler-glib.$(OBJEXT)
+ test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
+ @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES =  \
+-@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la \
+ @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la $(am__DEPENDENCIES_1) \
+ @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
+@@ -295,7 +293,7 @@
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(CAIRO_LIBS)
+ 
+-SUBDIRS = . reference demo
++SUBDIRS = . reference
+ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Poppler\"		\
+ 	-I$(top_srcdir)				\
+@@ -336,7 +334,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler					\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(GDK_LIBS)					\
+ 	$(FREETYPE_LIBS)				\
+@@ -348,7 +346,7 @@
+ @BUILD_WITH_GDK_TRUE@       test-poppler-glib.cc
+ 
+ @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \
+-@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la	\
++@BUILD_WITH_GDK_TRUE@	-lpoppler				\
+ @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la			\
+ @BUILD_WITH_GDK_TRUE@	$(POPPLER_GLIB_LIBS)			\
+ @BUILD_WITH_GDK_TRUE@	$(GDK_LIBS)				\
diff --git a/graphics/poppler/files/patch-poppler_Page.cc b/graphics/poppler/files/patch-poppler_Page.cc
new file mode 100644
index 000000000..1d0f63298
--- /dev/null
+++ b/graphics/poppler/files/patch-poppler_Page.cc
@@ -0,0 +1,11 @@
+--- poppler/Page.cc.orig	2008-07-09 17:53:56.000000000 +0200
++++ poppler/Page.cc	2008-07-09 17:54:49.000000000 +0200
+@@ -230,7 +230,7 @@
+ 
+ Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form) {
+   Object tmp;
+-	
++  pageWidgets =	NULL;
+   ok = gTrue;
+   xref = xrefA;
+   num = numA;
diff --git a/graphics/poppler/files/patch-qt4_Makefile.in b/graphics/poppler/files/patch-qt4_Makefile.in
new file mode 100644
index 000000000..ffb4777b4
--- /dev/null
+++ b/graphics/poppler/files/patch-qt4_Makefile.in
@@ -0,0 +1,11 @@
+--- qt4/Makefile.in.orig	2008-03-24 08:30:49.000000000 -0400
++++ qt4/Makefile.in	2008-03-24 08:30:34.000000000 -0400
+@@ -223,7 +223,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ win32_libs = @win32_libs@
+-SUBDIRS = src tests demos
++SUBDIRS = src
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in
new file mode 100644
index 000000000..e9f0ee2e3
--- /dev/null
+++ b/graphics/poppler/files/patch-qt4_src_Makefile.in
@@ -0,0 +1,19 @@
+--- qt4/src/Makefile.in.orig	2008-07-02 14:06:32.000000000 -0500
++++ qt4/src/Makefile.in	2008-07-02 14:07:35.000000000 -0500
+@@ -62,7 +62,6 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libpoppler_qt4_la_DEPENDENCIES =  \
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__append_1)
+ am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
+ 	poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \
+@@ -303,7 +302,7 @@
+ 	poppler-export.h			\
+ 	poppler-private.h
+ 
+-libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \
++libpoppler_qt4_la_LIBADD = -lpoppler \
+ 	$(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1)
+ libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0
+ all: all-am
diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
new file mode 100644
index 000000000..d872262ea
--- /dev/null
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -0,0 +1,39 @@
+--- qt/Makefile.in.orig	2008-03-27 08:17:35.000000000 -0400
++++ qt/Makefile.in	2008-03-27 08:18:20.000000000 -0400
+@@ -59,8 +59,7 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++libpoppler_qt_la_DEPENDENCIES = 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
+ 	poppler-link.lo poppler-page.lo poppler-page-transition.lo
+@@ -71,7 +70,7 @@
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
+ test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
+-test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++test_poppler_qt_DEPENDENCIES = \
+ 	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -273,7 +272,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler -lqt-mt			\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)
+@@ -283,7 +282,7 @@
+        test-poppler-qt.cpp
+ 
+ test_poppler_qt_LDADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler -lqt-mt			\
+ 	libpoppler-qt.la			\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
new file mode 100644
index 000000000..e0faea3d1
--- /dev/null
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -0,0 +1,70 @@
+--- utils/Makefile.in.orig	2009-02-26 18:44:48.000000000 -0500
++++ utils/Makefile.in	2009-02-26 18:45:57.000000000 -0500
+@@ -61,50 +61,50 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+ pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
+ pdffonts_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdffonts_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
+ 	$(am__objects_1)
+ pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
+ pdfimages_LDADD = $(LDADD)
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfimages_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
+ 	$(am__objects_1)
+ pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
+ pdfinfo_LDADD = $(LDADD)
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfinfo_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h
+ @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
+ @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__objects_1)
+ pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
+ pdftoabw_LDADD = $(LDADD)
+-pdftoabw_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftoabw_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
+ 	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
+ pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
+ pdftohtml_LDADD = $(LDADD)
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftohtml_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h
+ @BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
+ @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
+ pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
+ pdftoppm_LDADD = $(LDADD)
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftoppm_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
+ pdftops_OBJECTS = $(am_pdftops_OBJECTS)
+ pdftops_LDADD = $(LDADD)
+-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftops_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
+ 	$(am__objects_1)
+ pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
+ pdftotext_LDADD = $(LDADD)
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftotext_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -320,7 +320,7 @@ INCLUDES = \
+ 	$(ABIWORD_CFLAGS)
+ 
+ LDADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(UTILS_LIBS)				\
+ 	$(FONTCONFIG_LIBS)
+