# HG changeset patch
# User Mark Brand <mabrand@mabrand.nl>
# Date 1342034716 -7200
# Node ID 9aa687683a3258c9f44f0012c94f1ae3101ee8cc
# Parent  49ecbfac69b1f88fbb15a1c5541275fafa77586e
update package poppler

diff -r 49ecbfac69b1 -r 9aa687683a32 index.html
--- a/index.html	Wed Jul 11 20:39:28 2012 +0200
+++ b/index.html	Wed Jul 11 21:25:16 2012 +0200
@@ -1730,7 +1730,7 @@
     </tr>
     <tr>
         <td id="poppler-package">poppler</td>
-        <td id="poppler-version">0.20.1</td>
+        <td id="poppler-version">0.20.2</td>
         <td id="poppler-website"><a href="http://poppler.freedesktop.org/">poppler</a></td>
     </tr>
     <tr>
diff -r 49ecbfac69b1 -r 9aa687683a32 src/poppler-1-win32.patch
--- a/src/poppler-1-win32.patch	Wed Jul 11 20:39:28 2012 +0200
+++ b/src/poppler-1-win32.patch	Wed Jul 11 21:25:16 2012 +0200
@@ -1,23 +1,20 @@
 This file is part of MXE.
 See index.html for further information.
 
-From 5aede813b0cfdf672241f925bc34b766cf567a0f Mon Sep 17 00:00:00 2001
+From 0cdf3c0c6d2740fa3542d7030878eaffdd4cf7a4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
 Date: Sat, 21 Apr 2012 09:34:46 +0200
-Subject: [PATCH 1/3] Only check for Type1 fonts in custom directory if path
+Subject: [PATCH 1/2] Only check for Type1 fonts in custom directory if path
  is non-NULL
 
 Otherwise, programs using poppler may crash
 Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037
----
- poppler/GlobalParamsWin.cc |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
-index b77ac4f..f660224 100644
+index 527f08e..0739946 100644
 --- a/poppler/GlobalParamsWin.cc
 +++ b/poppler/GlobalParamsWin.cc
-@@ -423,7 +423,7 @@ void GlobalParams::setupBaseFonts(char * dir)
+@@ -424,7 +424,7 @@ void GlobalParams::setupBaseFonts(char * dir)
          if (fontFiles->lookup(fontName))
              continue;
  
@@ -30,18 +27,13 @@
 1.7.10.4
 
 
-From 944b910b4ede55c0b1dca5169960068fb9d1d0a4 Mon Sep 17 00:00:00 2001
+From fe1720718e224b0138f3f95c5aa0c72ac85e06b8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
 Date: Sat, 21 Apr 2012 13:19:54 +0200
-Subject: [PATCH 2/3] Don't use dllimport/dllexport
+Subject: [PATCH 2/2] Don't use dllimport/dllexport
 
 Otherwise static linking fails
 MXE workaround for https://bugs.freedesktop.org/show_bug.cgi?id=49038 (presumably would break shared linking!)
----
- cpp/poppler-global.h     |    5 -----
- poppler/XpdfPluginAPI.h  |   18 ------------------
- qt4/src/poppler-export.h |    5 -----
- 3 files changed, 28 deletions(-)
 
 diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
 index 5650182..6c3e01b 100644
@@ -129,31 +121,3 @@
 -- 
 1.7.10.4
 
-
-From 66acb0dedae6564d1975d652abca10b18ab4eb46 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Thu, 14 Jun 2012 17:08:58 +0200
-Subject: [PATCH 3/3] fix typo
-
-taken from
-https://bugs.freedesktop.org/show_bug.cgi?id=51079
----
- poppler/GlobalParamsWin.cc |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
-index f660224..0e691eb 100644
---- a/poppler/GlobalParamsWin.cc
-+++ b/poppler/GlobalParamsWin.cc
-@@ -573,7 +573,7 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
-     *type = fi->type;
-     *fontNum = fi->fontNum;
-     if (substituteFontName)
--      substituteFontName.Set(fi->substituteName->getCString());
-+      substituteFontName->Set(fi->substituteName->getCString());
-   } else {
-     GooString *substFontName = new GooString(findSubstituteName(font, fontFiles,
-                                                                 substFiles,
--- 
-1.7.10.4
-
diff -r 49ecbfac69b1 -r 9aa687683a32 src/poppler.mk
--- a/src/poppler.mk	Wed Jul 11 20:39:28 2012 +0200
+++ b/src/poppler.mk	Wed Jul 11 21:25:16 2012 +0200
@@ -3,7 +3,7 @@
 
 PKG             := poppler
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := a2b09ffe216dbe5f259d71e81327e00edf8c1229
+$(PKG)_CHECKSUM := 0f745b593e764d27a0e21645e6febd6ad8ad2ab9
 $(PKG)_SUBDIR   := poppler-$($(PKG)_VERSION)
 $(PKG)_FILE     := poppler-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://poppler.freedesktop.org/$($(PKG)_FILE)