Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 164750 | Differences between
and this patch

Collapse All | Expand All

(-)/trunk/configure.in (+7 lines)
Lines 44-49 Link Here
44
AC_SUBST(DEPS_CFLAGS)
44
AC_SUBST(DEPS_CFLAGS)
45
AC_SUBST(DEPS_LIBS)
45
AC_SUBST(DEPS_LIBS)
46
46
47
dnl Special case for poppler-glib < 0.6
48
case $($PKG_CONFIG --modversion poppler-glib) in
49
	0.5.*)
50
		AC_DEFINE(OLD_POPPLER,"1","Using poppler < 0.6");;
51
esac
52
53
47
dnl I18n
54
dnl I18n
48
GETTEXT_PACKAGE=$PACKAGE
55
GETTEXT_PACKAGE=$PACKAGE
49
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",GETTEXT_PACKAGE)
56
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",GETTEXT_PACKAGE)
(-)/trunk/src/Document.C (-2 / +10 lines)
Lines 18-26 Link Here
18
#include <libgnomevfsmm.h>
18
#include <libgnomevfsmm.h>
19
#include <glibmm/i18n.h>
19
#include <glibmm/i18n.h>
20
#include "ucompose.hpp"
20
#include "ucompose.hpp"
21
22
#include <poppler.h>
21
#include <poppler.h>
23
22
23
#include "config.h"
24
24
#include "Utility.h"
25
#include "Utility.h"
25
#include "Library.h"
26
#include "Library.h"
26
#include "TagList.h"
27
#include "TagList.h"
Lines 28-33 Link Here
28
29
29
#include "Document.h"
30
#include "Document.h"
30
31
32
31
Glib::RefPtr<Gdk::Pixbuf> Document::defaultthumb_;
33
Glib::RefPtr<Gdk::Pixbuf> Document::defaultthumb_;
32
Glib::RefPtr<Gdk::Pixbuf> Document::thumbframe_;
34
Glib::RefPtr<Gdk::Pixbuf> Document::thumbframe_;
33
Glib::RefPtr<Gnome::UI::ThumbnailFactory> Document::thumbfac_;
35
Glib::RefPtr<Gnome::UI::ThumbnailFactory> Document::thumbfac_;
Lines 393-399 Link Here
393
		rect->y2 = height;
395
		rect->y2 = height;
394
396
395
		// FIXME: add something before/after appending text to signal pagebreak?
397
		// FIXME: add something before/after appending text to signal pagebreak?
396
		textdump += poppler_page_get_text (page, rect);
398
		#ifdef OLD_POPPLER
399
			#warning Using poppler <= 0.5
400
			textdump += poppler_page_get_text (page, rect);
401
		#else
402
			#warning Using poppler >= 0.6
403
			textdump += poppler_page_get_text (page, POPPLER_SELECTION_GLYPH, rect);
404
		#endif
397
405
398
		poppler_rectangle_free (rect);
406
		poppler_rectangle_free (rect);
399
		g_object_unref (page);
407
		g_object_unref (page);

Return to bug 164750