[pkgsrc/trunk]: pkgsrc/print/atril atril: Requires gdbus-codegen. Fix non-epu...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fcb25a16d4ef
branches:  trunk
changeset: 380532:fcb25a16d4ef
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed May 16 14:18:11 2018 +0000

description:
atril: Requires gdbus-codegen. Fix non-epub build.

diffstat:

 print/atril/Makefile                        |   4 +++-
 print/atril/distinfo                        |   4 ++--
 print/atril/patches/patch-libview_ev-jobs.c |  24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r 6ac6f73a3895 -r fcb25a16d4ef print/atril/Makefile
--- a/print/atril/Makefile      Wed May 16 13:36:19 2018 +0000
+++ b/print/atril/Makefile      Wed May 16 14:18:11 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/05/14 12:22:42 youri Exp $
+# $NetBSD: Makefile,v 1.27 2018/05/16 14:18:11 jperkin Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
@@ -9,6 +9,8 @@
 
 USE_LANGUAGES= c c++
 
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+
 PKGCONFIG_OVERRIDE+=   atril-document.pc.in
 PKGCONFIG_OVERRIDE+=   atril-view.pc.in
 
diff -r 6ac6f73a3895 -r fcb25a16d4ef print/atril/distinfo
--- a/print/atril/distinfo      Wed May 16 13:36:19 2018 +0000
+++ b/print/atril/distinfo      Wed May 16 14:18:11 2018 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2018/05/14 12:22:42 youri Exp $
+$NetBSD: distinfo,v 1.5 2018/05/16 14:18:11 jperkin Exp $
 
 SHA1 (atril-1.20.1.tar.xz) = 16e508a469d1ed7850b75ddb9d9a1faf764379a9
 RMD160 (atril-1.20.1.tar.xz) = 6695e587bc1260fe8f5f8e0ab776b246cbd5c346
 SHA512 (atril-1.20.1.tar.xz) = 7a1216ff3302e1dd8caf09d8ff840e51d729c7e886ff3b2a4f7e4f860a46f1d5ac1ab7e7979aa3dac60d13c0ee316966309657462c35c815f6d5d93460ff26ed
 Size (atril-1.20.1.tar.xz) = 1754572 bytes
-SHA1 (patch-libview_ev-jobs.c) = 906b9d469d7ec2593540f15849432ab5d2a10f8f
+SHA1 (patch-libview_ev-jobs.c) = e435e6d3703829f46b1708ac72825fbac3c7a8b2
diff -r 6ac6f73a3895 -r fcb25a16d4ef print/atril/patches/patch-libview_ev-jobs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/atril/patches/patch-libview_ev-jobs.c       Wed May 16 14:18:11 2018 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-libview_ev-jobs.c,v 1.1 2018/05/16 14:18:11 jperkin Exp $
+
+Pull in upstream fix for non-epub build.
+
+--- libview/ev-jobs.c.orig     2018-03-22 15:13:28.000000000 +0000
++++ libview/ev-jobs.c
+@@ -876,8 +876,6 @@ snapshot_callback(WebKitWebView *webview
+       gtk_widget_destroy (gtk_widget_get_toplevel (GTK_WIDGET (webview)));
+ }
+ 
+-#endif  /* ENABLE_EPUB */
+-
+ static void
+ web_thumbnail_get_screenshot_cb (WebKitWebView  *webview,
+                                  WebKitLoadEvent event,
+@@ -910,6 +908,8 @@ webview_load_failed_cb (WebKitWebView  *
+       return TRUE;
+ }
+ 
++#endif  /* ENABLE_EPUB */
++
+ static gboolean
+ ev_job_thumbnail_run (EvJob *job)
+ {