From eef1142c415b7769dd7ea44a8e5f735acb6b9f04 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Sat, 4 Jan 2020 01:20:07 +0100
Subject: office/evince: Updated for version 3.34.2.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 office/evince/evince.SlackBuild | 25 +++----------------------
 office/evince/evince.info       |  6 +++---
 office/evince/shim.h            | 25 -------------------------
 3 files changed, 6 insertions(+), 50 deletions(-)
 delete mode 100644 office/evince/shim.h

(limited to 'office')

diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild
index a1f6e48489c80..b944aacad0d99 100644
--- a/office/evince/evince.SlackBuild
+++ b/office/evince/evince.SlackBuild
@@ -33,7 +33,7 @@
 #   some fugly hackery to work, see shim.h for gory details and polemic.
 
 PRGNAM=evince
-VERSION=${VERSION:-3.28.5}
+VERSION=${VERSION:-3.34.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -89,20 +89,6 @@ if [ "$NLS" != "YES" ]; then
       -e 's/ENABLE_NLS 1/ENABLE_NLS 0/g' configure
 fi
 
-# 20200101 bkw: "shim" to let us actually compile with gtk+-3.18 and
-# glib-2.46.2. Supposedly these versions are supported by evince-3.28.5,
-# but upstream uses a couple of functions that are new in gtk+-3.22
-# and glib-2.52. Fortunately it's stuff we can work around with a few
-# #defines.
-SLKCFLAGS="$SLKCFLAGS -include $CWD/shim.h"
-
-# 20200101 bkw: 14.2's mime stuff identifies djvu files as
-# image/vnd.djvu only, but evince wants image/vnd.djvu+multipage.
-sed -i '/^ *DJVU_MIME_TYPES/s|="|&image/vnd.djvu;|' configure
-
-# If we were building 3.30.x, we'd need this:
-# --without-gspell \
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -126,23 +112,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --disable-nautilus \
   --disable-maintainer-mode \
+  --without-gspell \
   --with-systemduserunitdir=no \
   --build=$ARCH-slackware-linux
 
-# ugh. glib-genmarshal's flags changed gratuitously.
-sed -i 's,--prototypes,--header,' libview/Makefile
-
 make V=1
 make install-strip DESTDIR=$PKG
 
-# Fix desktop entry
-sed -i "/NoDisplay=true/d" $PKG/usr/share/applications/evince.desktop
-
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 rm -rf $PKG/{usr/share/gtk-doc,etc}
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README.md MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/evince/evince.info b/office/evince/evince.info
index 91a6eca4f1b7a..a5814eea748f0 100644
--- a/office/evince/evince.info
+++ b/office/evince/evince.info
@@ -1,8 +1,8 @@
 PRGNAM="evince"
-VERSION="3.28.5"
+VERSION="3.34.2"
 HOMEPAGE="http://projects.gnome.org/evince/"
-DOWNLOAD="https://download.gnome.org/sources/evince/3.28/evince-3.28.5.tar.xz"
-MD5SUM="855600d64544a959add349e32f5185e0"
+DOWNLOAD="https://download.gnome.org/sources/evince/3.34/evince-3.34.2.tar.xz"
+MD5SUM="9e9e82fa8f6045ad7817157d9335d185"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/evince/shim.h b/office/evince/shim.h
deleted file mode 100644
index 8439c34ac571a..0000000000000
--- a/office/evince/shim.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 20191231 bkw: This seems like stupidity: g_content_type_is_mime_type
-   is a new function in glib-2.52, which literally just calls the
-   g_content_type_is_a function from older glibs, and returns its
-   result. Here's the function from the glib-2.52 source:
-
-   gboolean
-   g_content_type_is_mime_type (const gchar *type,
-                                const gchar *mime_type)
-   {
-     return g_content_type_is_a (type, mime_type);
-   }
-
-   The docs describe it as a "convenience wrapper" but there's
-   nothing more or less convenient about it, except that it breaks builds
-   with older glib versions. Why does it even exist?
- */
-#define g_content_type_is_mime_type(x,y) g_content_type_is_a(x,y)
-
-/* 20191231 bkw: We'd need gtk+-3.22 to have gtk_popover_popup and
-   gtk_popover_popdown. They're functionally the same as gtk_widget_show
-   and gtk_widget_hide, except they have a "transition" (fade-in/out).
-   Some folks might actually prefer it without the fade.
- */
-#define gtk_popover_popup(x) gtk_widget_show(GTK_WIDGET(x))
-#define gtk_popover_popdown(x) gtk_widget_hide(GTK_WIDGET(x))
-- 
cgit v1.2.3