Wed May 16 14:18:11 2018 UTC ()
atril: Requires gdbus-codegen. Fix non-epub build.


(jperkin)
diff -r1.26 -r1.27 pkgsrc/print/atril/Makefile
diff -r1.4 -r1.5 pkgsrc/print/atril/distinfo
diff -r0 -r1.1 pkgsrc/print/atril/patches/patch-libview_ev-jobs.c
cvs diff -r1.26 -r1.27 pkgsrc/print/atril/Makefile (expand / switch to unified diff)

--- pkgsrc/print/atril/Makefile 2018/05/14 12:22:42 1.26
+++ pkgsrc/print/atril/Makefile 2018/05/16 14:18:11 1.27
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1# $NetBSD: Makefile,v 1.26 2018/05/14 12:22:42 youri Exp $ 1# $NetBSD: Makefile,v 1.27 2018/05/16 14:18:11 jperkin Exp $
2 2
3.include "../../meta-pkgs/mate/Makefile.common" 3.include "../../meta-pkgs/mate/Makefile.common"
4 4
5DISTNAME= atril-${VERSION:R}.1 5DISTNAME= atril-${VERSION:R}.1
6CATEGORIES= print 6CATEGORIES= print
7 7
8COMMENT= Simple multi-page document viewer for the MATE environment 8COMMENT= Simple multi-page document viewer for the MATE environment
9 9
10USE_LANGUAGES= c c++ 10USE_LANGUAGES= c c++
11 11
 12TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 13
12PKGCONFIG_OVERRIDE+= atril-document.pc.in 14PKGCONFIG_OVERRIDE+= atril-document.pc.in
13PKGCONFIG_OVERRIDE+= atril-view.pc.in 15PKGCONFIG_OVERRIDE+= atril-view.pc.in
14 16
15CONFIGURE_ARGS+= --disable-introspection 17CONFIGURE_ARGS+= --disable-introspection
16 18
17.include "options.mk" 19.include "options.mk"
18 20
19.include "../../devel/glib2/schemas.mk" 21.include "../../devel/glib2/schemas.mk"
20 22
21.include "../../sysutils/caja/buildlink3.mk" 23.include "../../sysutils/caja/buildlink3.mk"
22.include "../../x11/mate-desktop/buildlink3.mk" 24.include "../../x11/mate-desktop/buildlink3.mk"
23.include "../../devel/zlib/buildlink3.mk" 25.include "../../devel/zlib/buildlink3.mk"
24.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 26.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/print/atril/distinfo (expand / switch to unified diff)

--- pkgsrc/print/atril/distinfo 2018/05/14 12:22:42 1.4
+++ pkgsrc/print/atril/distinfo 2018/05/16 14:18:11 1.5
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.4 2018/05/14 12:22:42 youri Exp $ 1$NetBSD: distinfo,v 1.5 2018/05/16 14:18:11 jperkin Exp $
2 2
3SHA1 (atril-1.20.1.tar.xz) = 16e508a469d1ed7850b75ddb9d9a1faf764379a9 3SHA1 (atril-1.20.1.tar.xz) = 16e508a469d1ed7850b75ddb9d9a1faf764379a9
4RMD160 (atril-1.20.1.tar.xz) = 6695e587bc1260fe8f5f8e0ab776b246cbd5c346 4RMD160 (atril-1.20.1.tar.xz) = 6695e587bc1260fe8f5f8e0ab776b246cbd5c346
5SHA512 (atril-1.20.1.tar.xz) = 7a1216ff3302e1dd8caf09d8ff840e51d729c7e886ff3b2a4f7e4f860a46f1d5ac1ab7e7979aa3dac60d13c0ee316966309657462c35c815f6d5d93460ff26ed 5SHA512 (atril-1.20.1.tar.xz) = 7a1216ff3302e1dd8caf09d8ff840e51d729c7e886ff3b2a4f7e4f860a46f1d5ac1ab7e7979aa3dac60d13c0ee316966309657462c35c815f6d5d93460ff26ed
6Size (atril-1.20.1.tar.xz) = 1754572 bytes 6Size (atril-1.20.1.tar.xz) = 1754572 bytes
7SHA1 (patch-libview_ev-jobs.c) = 906b9d469d7ec2593540f15849432ab5d2a10f8f 7SHA1 (patch-libview_ev-jobs.c) = e435e6d3703829f46b1708ac72825fbac3c7a8b2
File Added: pkgsrc/print/atril/patches/Attic/patch-libview_ev-jobs.c
$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)
 {