|
 |
1b60d7 |
From 22b047c3db84a34fc5fb5076474640bcd3917c73 Mon Sep 17 00:00:00 2001
|
|
|
1b60d7 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
1b60d7 |
Date: Fri, 17 Feb 2017 09:28:18 +0000
|
|
|
1b60d7 |
Subject: [PATCH] Revert "Bump poppler requirements to 0.33.0"
|
|
|
1b60d7 |
|
|
|
1b60d7 |
This reverts commit 5a4912bdbbf3c8000e77a093cf366276eeb56283.
|
|
|
1b60d7 |
---
|
|
|
1b60d7 |
backend/pdf/ev-poppler.cc | 4 ++++
|
|
|
1b60d7 |
configure.ac | 7 ++++++-
|
|
|
1b60d7 |
2 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
1b60d7 |
|
|
|
1b60d7 |
diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
|
|
|
1b60d7 |
index 214094f..f3a6510 100644
|
|
|
1b60d7 |
--- a/backend/pdf/ev-poppler.cc
|
|
|
1b60d7 |
+++ b/backend/pdf/ev-poppler.cc
|
|
|
1b60d7 |
@@ -3508,7 +3508,11 @@ pdf_document_annotations_save_annotation (EvDocumentAnnotations *document_annota
|
|
|
1b60d7 |
poppler_rect.y2 = height - ev_rect.y1;
|
|
|
1b60d7 |
|
|
|
1b60d7 |
if (poppler_annot_markup_has_popup (markup))
|
|
|
1b60d7 |
+#ifdef HAVE_POPPLER_ANNOT_MARKUP_SET_POPUP_RECTANGLE
|
|
|
1b60d7 |
poppler_annot_markup_set_popup_rectangle (markup, &poppler_rect);
|
|
|
1b60d7 |
+#else
|
|
|
1b60d7 |
+ poppler_annot_markup_set_popup (markup, &poppler_rect);
|
|
|
1b60d7 |
+#endif
|
|
|
1b60d7 |
else
|
|
|
1b60d7 |
poppler_annot_markup_set_popup (markup, &poppler_rect);
|
|
|
1b60d7 |
}
|
|
|
1b60d7 |
diff --git a/configure.ac b/configure.ac
|
|
|
1b60d7 |
index 23a390f..a01392a 100644
|
|
|
1b60d7 |
--- a/configure.ac
|
|
|
1b60d7 |
+++ b/configure.ac
|
|
|
1b60d7 |
@@ -536,7 +536,7 @@ AC_ARG_ENABLE([pdf],
|
|
|
1b60d7 |
[enable_pdf=yes])
|
|
|
1b60d7 |
|
|
|
1b60d7 |
if test "x$enable_pdf" = "xyes"; then
|
|
|
1b60d7 |
- POPPLER_REQUIRED=0.33.0
|
|
|
1b60d7 |
+ POPPLER_REQUIRED=0.24.0
|
|
|
1b60d7 |
PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no)
|
|
|
1b60d7 |
|
|
|
1b60d7 |
if test "x$enable_pdf" = "xyes"; then
|
|
|
1b60d7 |
@@ -549,6 +549,11 @@ if test "x$enable_pdf" = "xyes"; then
|
|
|
1b60d7 |
if test x$enable_cairo_ps = xyes; then
|
|
|
1b60d7 |
AC_DEFINE([HAVE_CAIRO_PS], [1], [defined if cairo-ps is available])
|
|
|
1b60d7 |
fi
|
|
|
1b60d7 |
+
|
|
|
1b60d7 |
+ evince_save_LIBS=$LIBS
|
|
|
1b60d7 |
+ LIBS="$LIBS $POPPLER_LIBS"
|
|
|
1b60d7 |
+ AC_CHECK_FUNCS(poppler_annot_markup_set_popup_rectangle)
|
|
|
1b60d7 |
+ LIBS=$evince_save_LIBS
|
|
|
1b60d7 |
else
|
|
|
1b60d7 |
AC_MSG_ERROR("PDF support is disabled since poppler-glib library version $POPPLER_REQUIRED or newer not found")
|
|
|
1b60d7 |
fi
|
|
|
1b60d7 |
--
|
|
|
1b60d7 |
2.9.3
|
|
|
1b60d7 |
|