office/evince: Updated for version 2.32.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

5 files changed, 10 insertions, 65 deletions

diff --git a/office/evince/README b/office/evince/README
index ddc6eca3cf..2cf86dd5dc 100644
--- a/office/evince/README
+++ b/office/evince/README
@@ -5,3 +5,6 @@ with a single simple application.
 
 Evince is specifically designed to support the file following formats.
 * PDF  * Postscript  * djvu  * tiff  * dvi
+
+This requires dconf to save settings 
+even then not ALL settings are saved.
\ No newline at end of file
diff --git a/office/evince/doinst.sh b/office/evince/doinst.sh
index 1f8ff67ded..f31099c904 100644
--- a/office/evince/doinst.sh
+++ b/office/evince/doinst.sh
@@ -8,3 +8,5 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   fi
 fi
 
+chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/
+
diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild
index a538d350a0..dce97bd9cd 100644
--- a/office/evince/evince.SlackBuild
+++ b/office/evince/evince.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=evince
-VERSION=${VERSION:-2.28.2}
+VERSION=${VERSION:-2.32.0}
 BUILD=${BUILD:-1}
 TAG=${TAG=_SBo}
 
@@ -81,7 +81,7 @@ fi
 
 # Make evince compile against the newer poppler. Patch with
 # much thanks to Niels Horn.
-patch -p1 < $CWD/evince_poppler016.patch
+# patch -p1 < $CWD/evince_poppler016.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -105,7 +105,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-impress \
   --disable-dvi \
   --disable-static \
-  --disable-schemas-install \
   --disable-scrollkeeper \
   --disable-nautilus \
   --disable-introspection \
@@ -118,10 +117,6 @@ make install DESTDIR=$PKG
 # Fix desktop entry
 sed -i "/NoDisplay=true/d" $PKG/usr/share/applications/evince.desktop
 
-# I thought we told you not to install these - that means we don't want
-# them AT ALL, and certainly not incorrectly placed... sheesh.
-rm -rf $PKG/*.schemas
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/office/evince/evince.info b/office/evince/evince.info
index 3862c460ed..b27a55e64f 100644
--- a/office/evince/evince.info
+++ b/office/evince/evince.info
@@ -1,8 +1,8 @@
 PRGNAM="evince"
-VERSION="2.28.2"
+VERSION="2.32.0"
 HOMEPAGE="http://projects.gnome.org/evince/"
-DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/evince/2.28/evince-2.28.2.tar.bz2"
-MD5SUM="f8b9a1ee6fe8cd0a1b7a51ad4db96e59"
+DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/evince/2.32/evince-2.32.0.tar.bz2"
+MD5SUM="ebc3ce6df8dcbf29cb9492f8dd031319"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
diff --git a/office/evince/evince_poppler016.patch b/office/evince/evince_poppler016.patch
deleted file mode 100644
index db13cc9681..0000000000
--- a/office/evince/evince_poppler016.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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