Update to 0.5.1.

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

2 files changed, 16 insertions, 93 deletions

diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
index 1c4dddb07..111a8521c 100644
--- a/graphics/poppler/files/patch-glib_Makefile.in
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -1,33 +1,32 @@
---- glib/Makefile.in.orig	Thu Jan 12 15:17:02 2006
-+++ glib/Makefile.in	Thu Jan 12 15:18:40 2006
-@@ -63,7 +63,7 @@
+--- glib/Makefile.in.orig	Wed Mar  8 20:40:26 2006
++++ glib/Makefile.in	Wed Mar  8 20:42:17 2006
+@@ -65,7 +65,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
  libpoppler_glib_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- am__objects_1 = poppler-enums.lo
- am_libpoppler_glib_la_OBJECTS = $(am__objects_1) poppler-action.lo \
-@@ -73,7 +73,7 @@
+-	$(top_builddir)/poppler/libpoppler.la \
+ 	$(top_builddir)/poppler/libpoppler-cairo.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2)
+@@ -78,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
  test_poppler_glib_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \
-+	libpoppler-glib.la \
++	$(top_builddir)/poppler/libpoppler-cairo.la libpoppler-glib.la \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -277,7 +277,7 @@
+@@ -306,7 +305,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(POPPLER_GLIB_LIBS)			\
- 	$(FREETYPE_LIBS)			\
- 	$(cairo_libs)
-@@ -286,7 +286,7 @@
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler					\
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
+@@ -317,7 +316,7 @@ test_poppler_glib_SOURCES = \
         test-poppler-glib.c
  
  test_poppler_glib_LDADD = \
diff --git a/graphics/poppler/files/patch-poppler_GlobalParams.cc b/graphics/poppler/files/patch-poppler_GlobalParams.cc
deleted file mode 100644
index efade0562..000000000
--- a/graphics/poppler/files/patch-poppler_GlobalParams.cc
+++ /dev/null
@@ -1,76 +0,0 @@
---- poppler/GlobalParams.cc.orig	Sat Feb 25 04:48:29 2006
-+++ poppler/GlobalParams.cc	Sat Feb 25 04:55:02 2006
-@@ -1266,7 +1266,7 @@ FcPattern *buildFcPattern(GfxFont *font)
- 
- DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
-   DisplayFontParam *dfp;
--  FcPattern *p=0,*m=0;
-+  FcPattern *p=0;
- 
-   GooString *fontName = font->getName();
-   if (!fontName) return NULL;
-@@ -1278,38 +1278,43 @@ DisplayFontParam *GlobalParams::getDispl
-     FcChar8* s;
-     char * ext;
-     FcResult res;
-+    FcFontSet *set;
-+    int i;
-     p = buildFcPattern(font);
- 
-     if (!p)
-       goto fin;
-     FcConfigSubstitute(FCcfg, p, FcMatchPattern);
-     FcDefaultSubstitute(p);
--    m = FcFontMatch(FCcfg,p,&res);
--    if (!m)
--      goto fin; 
--    res = FcPatternGetString(m, FC_FILE, 0, &s);
--    if (res != FcResultMatch || !s)
--      goto fin; 
--    ext = strrchr((char*)s,'.');
--    if (!ext)
-+    set = FcFontSort(FCcfg, p, FcFalse, NULL, &res);
-+    if (!set)
-       goto fin;
--    if (!strncasecmp(ext,".ttf",4))
-+    for (i = 0; i < set->nfont; ++i)
-     {
--      dfp = new DisplayFontParam(fontName->copy(), displayFontTT);  
--      dfp->tt.fileName = new GooString((char*)s);
-+	res = FcPatternGetString(set->fonts[i], FC_FILE, 0, &s);
-+	if (res != FcResultMatch || !s)
-+	    continue;
-+	ext = strrchr((char*)s,'.');
-+	if (!ext)
-+	    continue;
-+	if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4))
-+	{
-+	    dfp = new DisplayFontParam(fontName->copy(), displayFontTT);
-+	    dfp->tt.fileName = new GooString((char*)s);
-+	}
-+	else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4))
-+	{
-+	    dfp = new DisplayFontParam(fontName->copy(), displayFontT1);
-+	    dfp->t1.fileName = new GooString((char*)s);
-+	}
-+	else
-+	    continue;
-+	displayFonts->add(dfp->name,dfp);
-+	break;
-     }
--    else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4)) 
--    {
--      dfp = new DisplayFontParam(fontName->copy(), displayFontT1);  
--      dfp->t1.fileName = new GooString((char*)s);
--    }
--    else
--      goto fin;
--    displayFonts->add(dfp->name,dfp);
-+    FcFontSetDestroy(set);
-   }
- fin:
--  if (m)
--    FcPatternDestroy(m);
-   if (p)
-     FcPatternDestroy(p);
-