File evince-poppler-0.5.4.patch of Package evince

Overview Repositories Revisions Requests Users Attributes Meta

File evince-poppler-0.5.4.patch of Package evince (Revision 7d25941db6822554b98c7c4adae49cfe)

Currently displaying revision 7d25941db6822554b98c7c4adae49cfe , Show latest

Index: backend/pdf/ev-poppler.cc
===================================================================
--- backend/pdf/ev-poppler.cc	(revision 2673)
+++ backend/pdf/ev-poppler.cc	(working copy)
@@ -1113,9 +1113,11 @@
 pdf_document_links_get_links (EvDocumentLinks *document_links,
 			      gint             page)
 {
+	GList *retval = NULL;
+#ifdef HAVE_POPPLER_PAGE_GET_IMAGE_MAPPING
 	PdfDocument *pdf_document;
 	PopplerPage *poppler_page;
-	GList *retval = NULL;
+
 	GList *mapping_list;
 	GList *list;
 	double height;
@@ -1147,6 +1149,8 @@
 	g_object_unref (poppler_page);
 
 	return g_list_reverse (retval);
+#endif /* HAVE_POPPLER_PAGE_GET_IMAGE_MAPPING */
+	return retval;
 }
 
 static EvLinkDest *
@@ -1182,6 +1186,7 @@
 				gint              page)
 {
 	GList *retval = NULL;
+#ifdef HAVE_POPPLER_PAGE_GET_IMAGE_MAPPING
 	PdfDocument *pdf_document;
 	PopplerPage *poppler_page;
 	GList *mapping_list;
@@ -1189,6 +1194,7 @@
 
 	pdf_document = PDF_DOCUMENT (document_images);
 	poppler_page = poppler_document_get_page (pdf_document->document, page);
+
 	mapping_list = poppler_page_get_image_mapping (poppler_page);
 
 	for (list = mapping_list; list; list = list->next) {
@@ -1210,7 +1216,7 @@
 
 	poppler_page_free_image_mapping (mapping_list);
 	g_object_unref (poppler_page);
-
+#endif /* HAVE_POPPLER_PAGE_GET_IMAGE_MAPPING */
 	return retval;
 }
 
@@ -1831,6 +1837,7 @@
 				 TRUE, 8,
 				 width, height);
 
+#ifdef HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF
 	poppler_page_render_selection_to_pixbuf (POPPLER_PAGE (rc->data),
 						 rc->scale, rc->rotation, pixbuf,
 						 (PopplerRectangle *)points,
@@ -1838,6 +1845,14 @@
 						 (PopplerSelectionStyle)style,
 						 text,
 						 base);
+#else
+ 	poppler_page_render_selection (POPPLER_PAGE (rc->data),
+ 				       rc->scale, rc->rotation, pixbuf,
+ 				       (PopplerRectangle *)points,
+ 				       (PopplerRectangle *)old_points,
+ 				       text,
+ 				       base);
+#endif /* HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF */
 	if (*surface)
 		cairo_surface_destroy (*surface);
 	*surface = ev_document_misc_surface_from_pixbuf (pixbuf);
@@ -1867,7 +1882,9 @@
 	r.y2 = height - points->y1;
 
 	retval = poppler_page_get_text (poppler_page,
+#if 0
 					(PopplerSelectionStyle)style,
+#endif
 					&r);
 
 	g_object_unref (poppler_page);
@@ -1890,7 +1907,9 @@
 
 	retval = poppler_page_get_selection_region ((PopplerPage *)rc->data,
 						    rc->scale,
+#if 0
 						    (PopplerSelectionStyle)style,
+#endif
 						    (PopplerRectangle *) points);
 	return retval;
 }
@@ -1912,7 +1931,9 @@
 	points.y1 = 0.0;
 	poppler_page_get_size (poppler_page, &(points.x2), &(points.y2));
 	retval = poppler_page_get_selection_region (poppler_page, 1.0,
+#if 0
 						    POPPLER_SELECTION_GLYPH,
+#endif
 						    &points);
 	g_object_unref (poppler_page);
 
@@ -1933,6 +1954,7 @@
 pdf_document_get_page_duration (EvDocumentTransition *trans,
 				gint                  page)
 {
+#ifdef HAVE_POPPLER_PAGE_GET_DURATION
 	PdfDocument *pdf_document;
 	PopplerPage *poppler_page;
 	gdouble      duration = -1;
@@ -1946,6 +1968,11 @@
 	g_object_unref (poppler_page);
 
 	return duration;
+#else
+	return -1;
+#endif /* HAVE_POPPLER_PAGE_GET_DURATION */
+
+
 }
 
 static void
@@ -1960,6 +1987,7 @@
 	return PDF_DOCUMENT (g_object_new (PDF_TYPE_DOCUMENT, NULL));
 }
 
+#ifdef HAVE_FORMS
 /* Forms */
 static void
 pdf_document_get_crop_box (EvDocument  *document, 
@@ -2345,3 +2373,4 @@
 	iface->form_field_choice_get_text = pdf_document_forms_form_field_choice_get_text;
 }
 
+#endif
Index: configure.ac
===================================================================
--- configure.ac	(revision 2673)
+++ configure.ac	(working copy)
@@ -235,7 +235,7 @@
               [AC_HELP_STRING([--enable-pdf], [Compile with pdf support])],enable_pdf="$enableval",enable_pdf=yes)
 
 if test "x$enable_pdf" = "xyes"; then
-    POPPLER_REQUIRED=0.6
+    POPPLER_REQUIRED=0.5.4
     PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no)
 
     if test "x$enable_pdf" = "xyes"; then
@@ -246,7 +246,13 @@
 
 	    evince_save_LIBS=$LIBS
 	    LIBS="$LIBS $FRONTEND_LIBS"
-	    AC_CHECK_FUNCS(poppler_page_render)
+	    dnl AC_CHECK_FUNCS(poppler_page_render)
+ 	    AC_CHECK_FUNCS(poppler_form_field_button_get_button_type)
+ 	    AC_CHECK_FUNCS(poppler_form_field_text_get_max_len)
+ 	    AC_CHECK_FUNCS(poppler_form_field_text_is_password)
+            AC_CHECK_FUNCS(poppler_page_get_duration)
+            AC_CHECK_FUNCS(poppler_page_get_image_mapping)
+            AC_CHECK_FUNCS(poppler_page_render_selection_to_pixbuf)
 	    LIBS=$evince_save_LIBS
 
 	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)

Places

File evince-poppler-0.5.4.patch of Package evince (Revision 7d25941db6822554b98c7c4adae49cfe)

Places