catch up with an API change in poppler, fixes crash if linearized PDFs

are viewed, from IWAMOTO Toshihiro per PR pkg/44870
bump PKGREVISION

5 files changed, 88 insertions, 5 deletions

diff --git a/print/epdfview/Makefile b/print/epdfview/Makefile
index 1d482cb236f..ed6188f5425 100644
--- a/print/epdfview/Makefile
+++ b/print/epdfview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2011/03/09 12:16:35 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2011/04/18 17:10:23 drochner Exp $
 #
 
 DISTNAME=	epdfview-0.1.7
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	print
 MASTER_SITES=	http://trac.emma-soft.com/epdfview/chrome/site/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/print/epdfview/distinfo b/print/epdfview/distinfo
index c0cae8bbff5..0257b8259b0 100644
--- a/print/epdfview/distinfo
+++ b/print/epdfview/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.6 2011/02/12 14:18:35 drochner Exp $
+$NetBSD: distinfo,v 1.7 2011/04/18 17:10:23 drochner Exp $
 
 SHA1 (epdfview-0.1.7.tar.bz2) = ff46942c285b8e2c28766a38cdfce1a018b4a015
 RMD160 (epdfview-0.1.7.tar.bz2) = 485399d1982a3f8128322ee7e13d46225573bae3
 Size (epdfview-0.1.7.tar.bz2) = 443609 bytes
 SHA1 (patch-aa) = 6c5b2766836cf3610c92feb5fdcc5de0dd75534d
 SHA1 (patch-ab) = 67ab5dd3c5c2d4af5e2aeddc77e4714c9e96b008
-SHA1 (patch-ac) = bca1aa97617ba41a13bd0dfa3c8db44d726e4f9a
+SHA1 (patch-ac) = 64056116653246b5ae89af7247dfd790d4aab724
+SHA1 (patch-ba) = 92644aa2aa9012e2e97ee8e13f2964eb7cf96703
+SHA1 (patch-bb) = cf24cafa8460100a9ba6dd1d06d7205d10d28d3f
diff --git a/print/epdfview/patches/patch-ac b/print/epdfview/patches/patch-ac
index bcc33f547e4..17401df1988 100644
--- a/print/epdfview/patches/patch-ac
+++ b/print/epdfview/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2011/02/12 14:18:35 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2011/04/18 17:10:23 drochner Exp $
 
 --- src/PDFDocument.cxx.orig	2009-02-28 21:00:35.000000000 +0000
 +++ src/PDFDocument.cxx
+@@ -324,7 +324,7 @@ PDFDocument::loadMetadata (void)
+     gchar *format = NULL;
+     gchar *keywords = NULL;
+     PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET;
+-    gchar *linearized = NULL;
++    gboolean linearized = 0;
+     GTime modDate;
+     PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET;
+     gchar *producer = NULL;
 @@ -680,13 +680,13 @@ PDFDocument::setTextSelection (DocumentR
  
      //for get text we must exchange y coordinate, don't ask me where logic here.
diff --git a/print/epdfview/patches/patch-ba b/print/epdfview/patches/patch-ba
new file mode 100644
index 00000000000..519f6df266b
--- /dev/null
+++ b/print/epdfview/patches/patch-ba
@@ -0,0 +1,50 @@
+$NetBSD: patch-ba,v 1.1 2011/04/18 17:10:23 drochner Exp $
+
+--- src/IDocument.cxx.orig	2009-02-28 21:00:35.000000000 +0000
++++ src/IDocument.cxx
+@@ -135,7 +135,7 @@ IDocument::IDocument ()
+     m_FindPage = 0;
+     m_Format = NULL;
+     m_Keywords = NULL;
+-    m_Linearized = NULL;
++    m_Linearized = 0;
+     m_ModifiedDate = NULL;
+     m_PageCache = NULL;
+     m_PageCacheAge = 0;
+@@ -164,7 +164,6 @@ IDocument::~IDocument ()
+     g_free (m_FileName);
+     g_free (m_Format);
+     g_free (m_Keywords);
+-    g_free (m_Linearized);
+     g_free (m_ModifiedDate);
+     g_free (m_Password);
+     g_free (m_Producer);
+@@ -755,11 +754,11 @@ IDocument::setFormat (gchar *format)
+ const gchar *
+ IDocument::getLinearized ()
+ {
+-    if ( NULL == m_Linearized )
++    if ( !m_Linearized )
+     {
+         return "No";
+     }
+-    return m_Linearized;
++    return "Yes";
+ }
+ 
+ ///
+@@ -769,12 +768,9 @@ IDocument::getLinearized ()
+ ///                   otherwise. IDocument will free it.
+ ///
+ void
+-IDocument::setLinearized (gchar *linearized)
++IDocument::setLinearized (gboolean linearized)
+ {
+-    gchar *oldLinearized = m_Linearized;
+-    m_Linearized = g_strdup (linearized);
+-    g_free (oldLinearized);
+-    g_free (linearized);
++    m_Linearized = linearized;
+ }
+ 
+ ///
diff --git a/print/epdfview/patches/patch-bb b/print/epdfview/patches/patch-bb
new file mode 100644
index 00000000000..44673e7d939
--- /dev/null
+++ b/print/epdfview/patches/patch-bb
@@ -0,0 +1,22 @@
+$NetBSD: patch-bb,v 1.1 2011/04/18 17:10:23 drochner Exp $
+
+--- src/IDocument.h.orig	2009-02-28 21:00:35.000000000 +0000
++++ src/IDocument.h
+@@ -306,7 +306,7 @@ namespace ePDFView 
+             const gchar *getFormat (void);
+             void setFormat (gchar *format);
+             const gchar *getLinearized (void);
+-            void setLinearized (gchar *linearized);
++            void setLinearized (gboolean linearized);
+             const gchar *getCreationDate (void);
+             void setCreationDate (gchar *date);
+             const gchar *getModifiedDate (void);
+@@ -382,7 +382,7 @@ namespace ePDFView 
+             /// The document's keyword.
+             gchar *m_Keywords;
+             /// Tells if the document is linearized or not.
+-            gchar *m_Linearized;
++            gboolean m_Linearized;
+             /// The document's modification date and time.
+             gchar *m_ModifiedDate;
+             /// @brief The list of classes that will receive notifications