[patch] files/referencer-1.0.4-poppler.patch

referencer-1.0.4-poppler.patch (text/plain), 1.40 KB, created by Damien Thébault on 2008-01-17 21:58:43 UTC

--- /trunk/configure.in	2007/09/02 07:29:29	547
+++ trunk/configure.in	2007/09/08 18:30:24	548
@@ -44,6 +44,13 @@
 AC_SUBST(DEPS_CFLAGS)
 AC_SUBST(DEPS_LIBS)
 
+dnl Special case for poppler-glib < 0.6
+case $($PKG_CONFIG --modversion poppler-glib) in
+	0.5.*)
+		AC_DEFINE(OLD_POPPLER,"1","Using poppler < 0.6");;
+esac
+
+
 dnl I18n
 GETTEXT_PACKAGE=$PACKAGE
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",GETTEXT_PACKAGE)
--- /trunk/src/Document.C	2007/09/02 07:29:29	547
+++ trunk/src/Document.C	2007/09/08 18:30:24	548
@@ -18,9 +18,10 @@
 #include <libgnomevfsmm.h>
 #include <glibmm/i18n.h>
 #include "ucompose.hpp"
-
 #include <poppler.h>
 
+#include "config.h"
+
 #include "Utility.h"
 #include "Library.h"
 #include "TagList.h"
@@ -28,6 +29,7 @@
 
 #include "Document.h"
 
+
 Glib::RefPtr<Gdk::Pixbuf> Document::defaultthumb_;
 Glib::RefPtr<Gdk::Pixbuf> Document::thumbframe_;
 Glib::RefPtr<Gnome::UI::ThumbnailFactory> Document::thumbfac_;
@@ -393,7 +395,13 @@
 		rect->y2 = height;
 
 		// FIXME: add something before/after appending text to signal pagebreak?
-		textdump += poppler_page_get_text (page, rect);
+		#ifdef OLD_POPPLER
+			#warning Using poppler <= 0.5
+			textdump += poppler_page_get_text (page, rect);
+		#else
+			#warning Using poppler >= 0.6
+			textdump += poppler_page_get_text (page, POPPLER_SELECTION_GLYPH, rect);
+		#endif
 
 		poppler_rectangle_free (rect);
 		g_object_unref (page);