From 12215b77e3793ea3cc0b42c438a8dddaeadddb37 Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Wed, 30 Apr 2014 05:32:18 +0000
Subject: Remove typedef of PopplerTextSpan here. It is already defined in
 poppler.h and rise build error in poppler-glib.

---
 print/poppler/distinfo                                   |  3 ++-
 .../patches/patch-glib_poppler-structure-element.h       | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 print/poppler/patches/patch-glib_poppler-structure-element.h

(limited to 'print/poppler')

diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index d6f0fc2a4d6..f21444527d1 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2014/04/29 08:03:53 wiz Exp $
+$NetBSD: distinfo,v 1.91 2014/04/30 05:32:18 obache Exp $
 
 SHA1 (poppler-0.26.0.tar.xz) = 1f5d08ee01683c309688f17116d18bf47b13f001
 RMD160 (poppler-0.26.0.tar.xz) = 9c74dd6fb617928375b64c3576575603ed2a72a5
@@ -10,4 +10,5 @@ SHA1 (patch-aq) = b1e1cd6e234a68ebc352d76dbf89ed4e3cb7b3c0
 SHA1 (patch-ar) = c3f9c4d0176f215cfee6127d2ac077a26c23ffa2
 SHA1 (patch-as) = 9e2329c923c904074495076fd7cc594fced51a0d
 SHA1 (patch-configure) = a2488314e1da41c94bc78c327795e126515bdde5
+SHA1 (patch-glib_poppler-structure-element.h) = e37f2a1b750f917d5bdc5e44f1bed000de19f836
 SHA1 (patch-qt5_src_Makefile.in) = 3bbe51eca4f10fd91f6afd4f8e4cee05b04e98c3
diff --git a/print/poppler/patches/patch-glib_poppler-structure-element.h b/print/poppler/patches/patch-glib_poppler-structure-element.h
new file mode 100644
index 00000000000..f8b49cad97f
--- /dev/null
+++ b/print/poppler/patches/patch-glib_poppler-structure-element.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-glib_poppler-structure-element.h,v 1.1 2014/04/30 05:32:18 obache Exp $
+
+* PopplerTextSpan is already defined in poppler.h.
+
+--- glib/poppler-structure-element.h.orig	2014-03-11 19:48:54.000000000 +0000
++++ glib/poppler-structure-element.h
+@@ -250,9 +250,6 @@ typedef enum {
+ } PopplerStructureTableScope;
+ 
+ 
+-typedef struct _PopplerTextSpan PopplerTextSpan;
+-
+-
+ GType                            poppler_structure_element_get_type               (void) G_GNUC_CONST;
+ PopplerStructureElementKind      poppler_structure_element_get_kind               (PopplerStructureElement     *poppler_structure_element);
+ gint                             poppler_structure_element_get_page               (PopplerStructureElement     *poppler_structure_element);
-- 
cgit v1.2.3