app-text/evince: Install previewer

Had been disabled due to a build failure with USE=-cups, but this is now
fixed upstream by the patch we pull in.

Signed-off-by: Matt Turner <mattst88@gentoo.org>

3 files changed, 66 insertions, 4 deletions

diff --git a/app-text/evince/evince-40.1.ebuild b/app-text/evince/evince-40.1-r1.ebuild
index 05e5b8fd667b..34dc2484fd95 100644
--- a/app-text/evince/evince-40.1.ebuild
+++ b/app-text/evince/evince-40.1-r1.ebuild
@@ -66,6 +66,8 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PV}-build-Fix-t1lib-detection.patch
+	"${FILESDIR}"/${PV}-previewer-Fix-build-regression-when-gtk_unix_print-i.patch
 	"${FILESDIR}"/40.0-internal-synctex.patch
 )
 
@@ -75,9 +77,6 @@ src_prepare() {
 	# Do not depend on adwaita-icon-theme, bug #326855, #391859
 	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
 	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-
-	# https://gitlab.gnome.org/GNOME/evince/-/merge_requests/336
-	sed -i -e 's:T1_initLib:T1_InitLib:' meson.build || die
 }
 
 src_configure() {
@@ -85,7 +84,7 @@ src_configure() {
 		-Dplatform=gnome
 
 		-Dviewer=true
-		-Dpreviewer=false
+		-Dpreviewer=true
 		-Dthumbnailer=true
 		$(meson_use nsplugin browser_plugin)
 		$(meson_use nautilus)
diff --git a/app-text/evince/files/40.1-build-Fix-t1lib-detection.patch b/app-text/evince/files/40.1-build-Fix-t1lib-detection.patch
new file mode 100644
index 000000000000..5e46649e2536
--- /dev/null
+++ b/app-text/evince/files/40.1-build-Fix-t1lib-detection.patch
@@ -0,0 +1,30 @@
+From bb3c826f134c47c505ad4fd93b1c97f67da5350c Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 12 Apr 2021 23:47:14 -0400
+Subject: [PATCH] build: Fix t1lib detection
+
+Without this, Meson always fails to detect t1lib. Autotools looked for
+the correct function name. See the check at the time of removal in
+commit b27189bb ("build: Remove autotools")
+
+Fixes: d69158ec ("build: Port to Meson build system")
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index abee124d..0d7fd4d4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -365,7 +365,7 @@ if enable_dvi
+   endforeach
+ 
+   t1_dep = cc.find_library('t1', required: get_option('t1lib'))
+-  enable_t1lib = t1_dep.found() and cc.has_function('T1_initLib', dependencies: t1_dep)
++  enable_t1lib = t1_dep.found() and cc.has_function('T1_InitLib', dependencies: t1_dep)
+   config_h.set('WITH_TYPE1_FONTS', enable_t1lib)
+ 
+   backends += {'dvi': mime_types_list.get('dvi')}
+-- 
+2.26.3
+
diff --git a/app-text/evince/files/40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch b/app-text/evince/files/40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch
new file mode 100644
index 000000000000..bfc650947d44
--- /dev/null
+++ b/app-text/evince/files/40.1-previewer-Fix-build-regression-when-gtk_unix_print-i.patch
@@ -0,0 +1,33 @@
+From 4a94fad803f5041b44477f0a2933cb447d81d82f Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Wed, 14 Apr 2021 02:15:40 +0000
+Subject: [PATCH] previewer: Fix build regression when gtk_unix_print is
+ disabled
+
+Restore guard around ev_previewer_window_print because
+that function requires GTKUNIXPRINT_ENABLED, without the
+guard, makes the gtk_unix_print unusable.
+
+In the commit 65bfd21c ("previewer: Use GtkHeaderBar in print preview"), the GTKUNIXPRINT_ENABLED preprocessor guard around
+the usage of ev_previewer_window_print was lost.
+---
+ previewer/ev-previewer-window.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
+index 6678aa75..7d3bd394 100644
+--- a/previewer/ev-previewer-window.c
++++ b/previewer/ev-previewer-window.c
+@@ -263,7 +263,9 @@ ev_previewer_window_print (GSimpleAction *action,
+ #endif
+ 
+ static const GActionEntry actions[] = {
++#if GTKUNIXPRINT_ENABLED
+ 	{ "print", ev_previewer_window_print },
++#endif
+ 	{ "go-previous-page", ev_previewer_window_previous_page },
+ 	{ "go-next-page", ev_previewer_window_next_page },
+ 	{ "select-page", ev_previewer_window_focus_page_selector },
+-- 
+2.26.3
+