rpms/evince/devel 0001-pdf-Fix-build-when-text_layout-is-not-available.patch, NONE, 1.1 evince.spec, 1.210, 1.211

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/evince/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7171

Modified Files:
	evince.spec 
Added Files:
	0001-pdf-Fix-build-when-text_layout-is-not-available.patch 
Log Message:
fix the build


0001-pdf-Fix-build-when-text_layout-is-not-available.patch:
 ev-poppler.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0001-pdf-Fix-build-when-text_layout-is-not-available.patch ---
>From 9dd59f719ba098ef93aacf2e5e3d0974cfcd5b2c Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc at gnome.org>
Date: Tue, 29 Jun 2010 08:52:13 +0200
Subject: [PATCH] [pdf] Fix build when text_layout is not available

Fixes bug #623080.
---
 backend/pdf/ev-poppler.cc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 91f5c2e..6e56423 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -2029,6 +2029,7 @@ pdf_document_text_get_text (EvDocumentText  *selection,
 				      &r);
 }
 
+#ifdef HAVE_POPPLER_PAGE_GET_TEXT_LAYOUT
 static gboolean
 pdf_document_text_get_text_layout (EvDocumentText  *selection,
 				   EvPage          *page,
@@ -2043,6 +2044,7 @@ pdf_document_text_get_text_layout (EvDocumentText  *selection,
 
 	return poppler_page_get_text_layout (poppler_page, (PopplerRectangle **)areas, n_areas);
 }
+#endif
 
 static void
 pdf_document_text_iface_init (EvDocumentTextInterface *iface)
-- 
1.7.1



Index: evince.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evince/devel/evince.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- evince.spec	29 Jun 2010 12:16:09 -0000	1.210
+++ evince.spec	29 Jun 2010 13:31:44 -0000	1.211
@@ -16,6 +16,9 @@ Source0:        http://download.gnome.or
 # https://bugzilla.redhat.com/show_bug.cgi?id=562648
 Patch2:         evince-t1font-mapping.patch
 
+# upstream build fix
+Patch3: 0001-pdf-Fix-build-when-text_layout-is-not-available.patch
+
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  poppler-glib-devel >= %{poppler_version}
@@ -105,6 +108,7 @@ It adds an additional tab called "Docume
 %prep
 %setup -q
 %patch2 -p1 -b .t1font-map
+%patch3 -p1 -b .poppler-layout
 
 %build
 %configure \