summaryrefslogtreecommitdiff
path: root/office
diff options
context:
space:
mode:
authorMichiel van Wessem <michiel@slackbuilds.org>2011-03-30 15:11:49 +0100
committerRobby Workman <rworkman@slackbuilds.org>2011-03-30 22:52:25 -0500
commitdfc85e26ef349c75ab760807cf11ceafe25542c9 (patch)
treeb23511479a7257e33b37c098569b34ea8584196d /office
parent436dfa2612ff082d9f006097c4ceefa9660b846d (diff)
downloadslackbuilds-dfc85e26ef349c75ab760807cf11ceafe25542c9.tar.gz
office/evince: Added patch to fix building on 13.37.
Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/evince/evince.SlackBuild6
-rw-r--r--office/evince/evince_poppler016.patch55
2 files changed, 60 insertions, 1 deletions
diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild
index 90558d71ae..a538d350a0 100644
--- a/office/evince/evince.SlackBuild
+++ b/office/evince/evince.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for evince
# Copyright 2009 Andrew Brouwers <abrouwers@gmail.com>
-# Copyright 2009, Michiel van Wessem, Manchester, United Kingdom.
+# Copyright 2009-2011, Michiel van Wessem, Manchester, United Kingdom.
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -79,6 +79,10 @@ if [ "$NLS" != "YES" ]; then
-e 's/ENABLE_NLS 1/ENABLE_NLS 0/g' configure
fi
+# Make evince compile against the newer poppler. Patch with
+# much thanks to Niels Horn.
+patch -p1 < $CWD/evince_poppler016.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/office/evince/evince_poppler016.patch b/office/evince/evince_poppler016.patch
new file mode 100644
index 0000000000..db13cc9681
--- /dev/null
+++ b/office/evince/evince_poppler016.patch
@@ -0,0 +1,55 @@
+--- evince-2.28.2/backend/pdf/ev-poppler.cc 2010-06-24 10:19:28.000000000 +0200
++++ evince-2.28.2_patched/backend/pdf/ev-poppler.cc 2011-02-02 10:46:54.000000000 +0100
+@@ -1923,12 +1923,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;
+@@ -1938,6 +1944,7 @@
+ retval = poppler_page_get_text (poppler_page,
+ (PopplerSelectionStyle)style,
+ &r);
++#endif /* HAVE_POPPLER_PAGE_GET_SELECTED_TEXT */
+
+ return retval;
+ }
+--- evince-2.28.2/config.h.in 2009-12-14 18:04:12.000000000 -0200
++++ evince-2.28.2_patched/config.h.in 2011-03-11 14:32:31.000000000 -0300
+@@ -88,6 +88,9 @@
+ /* Define to 1 if you have the `poppler_page_render' function. */
+ #undef HAVE_POPPLER_PAGE_RENDER
+
++/* Define to 1 if you have the `poppler_page_get_selected_text' function. */
++#undef HAVE_POPPLER_PAGE_GET_SELECTED_TEXT
++
+ /* Have libspectre */
+ #undef HAVE_SPECTRE
+
+--- evince-2.28.2/configure 2009-12-14 18:04:12.000000000 -0200
++++ evince-2.28.2_patched/configure 2011-03-23 13:32:27.000000000 -0300
+@@ -23503,7 +23503,7 @@
+ done
+
+
+-for ac_func in poppler_page_get_image
++for ac_func in poppler_page_get_image poppler_page_get_selected_text
+ do
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5