[75856] trunk/dports/gnome/evince

[dports at macports.org]

Revision: 75856
          http://trac.macports.org/changeset/75856
Author:   dports at macports.org
Date:     2011-02-10 11:54:50 -0800 (Thu, 10 Feb 2011)
Log Message:
-----------
evince: add patch to work around API changes in poppler 0.16; fixes
build failure (#28264)

Modified Paths:
--------------
    trunk/dports/gnome/evince/Portfile

Added Paths:
-----------
    trunk/dports/gnome/evince/files/
    trunk/dports/gnome/evince/files/patch-poppler-0.16-API-changes.diff

Modified: trunk/dports/gnome/evince/Portfile
===================================================================
--- trunk/dports/gnome/evince/Portfile	2011-02-10 19:41:51 UTC (rev 75855)
+++ trunk/dports/gnome/evince/Portfile	2011-02-10 19:54:50 UTC (rev 75856)
@@ -34,6 +34,8 @@
                 port:intltool \
                 port:pkgconfig
 
+patchfiles      patch-poppler-0.16-API-changes.diff
+
 configure.args  --disable-scrollkeeper \
                 --disable-schemas-install \
                 --disable-introspection \

Added: trunk/dports/gnome/evince/files/patch-poppler-0.16-API-changes.diff
===================================================================
--- trunk/dports/gnome/evince/files/patch-poppler-0.16-API-changes.diff	                        (rev 0)
+++ trunk/dports/gnome/evince/files/patch-poppler-0.16-API-changes.diff	2011-02-10 19:54:50 UTC (rev 75856)
@@ -0,0 +1,46 @@
+--- backend/pdf/ev-poppler.cc	2010-06-24 10:19:28.000000000 +0200
++++ backend/pdf/ev-poppler.cc	2011-02-02 10:46:54.000000000 +0100
+@@ -1974,12 +1974,18 @@
+ 				 EvRectangle     *points)
+ {
+ 	PopplerPage *poppler_page;
+-	PopplerRectangle r;
+-	double height;
+ 	char *retval;
+-	
++
+ 	poppler_page = POPPLER_PAGE (rc->page->backend_page);
+ 
++#ifdef HAVE_POPPLER_PAGE_GET_SELECTED_TEXT
++	retval = poppler_page_get_selected_text (poppler_page,
++						 (PopplerSelectionStyle)style,
++						 (PopplerRectangle *)points);
++#else
++	PopplerRectangle r;
++	double height;
++
+ 	poppler_page_get_size (poppler_page, NULL, &height);
+ 	r.x1 = points->x1;
+ 	r.y1 = height - points->y2;
+@@ -1989,6 +1995,7 @@
+ 	retval = poppler_page_get_text (poppler_page,
+ 					(PopplerSelectionStyle)style,
+ 					&r);
++#endif /* HAVE_POPPLER_PAGE_GET_SELECTED_TEXT */
+ 
+ 	return retval;
+ }
+--- configure.ac
++++ configure.ac
+@@ -493,9 +493,10 @@ if test "x$enable_pdf" = "xyes"; then
+ 	    evince_save_LIBS=$LIBS
+ 	    LIBS="$LIBS $POPPLER_LIBS"
+	    AC_CHECK_FUNCS(poppler_page_render)
+	    AC_CHECK_FUNCS(poppler_page_get_image)
+	    AC_CHECK_FUNCS(poppler_annot_file_attachment_get_attachment)
++	    AC_CHECK_FUNCS(poppler_page_get_selected_text)
+ 	    LIBS=$evince_save_LIBS
+
+ 	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
+ 	    if test x$enable_cairo_pdf = xyes; then
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110210/14698b36/attachment.html>