[pkgsrc/trunk]: pkgsrc/security/seahorse fix build against gnome-keyring-2.30...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3d1fb533102
branches:  trunk
changeset: 576632:b3d1fb533102
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Jun 15 16:32:11 2010 +0000

description:
fix build against gnome-keyring-2.30, should fix PR pkg/43479
by Greg Oster
being here, disable avahi support which is mostly useless

diffstat:

 security/seahorse/Makefile         |   5 +++--
 security/seahorse/distinfo         |   3 ++-
 security/seahorse/patches/patch-ac |  13 +++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r 26b4647f8866 -r b3d1fb533102 security/seahorse/Makefile
--- a/security/seahorse/Makefile        Tue Jun 15 16:25:42 2010 +0000
+++ b/security/seahorse/Makefile        Tue Jun 15 16:32:11 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2010/06/13 22:45:20 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2010/06/15 16:32:11 drochner Exp $
 
 DISTNAME=      seahorse-2.28.1
 PKGREVISION=   2
@@ -43,8 +43,9 @@
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf/schemas.mk"
 #.include "../../devel/libglade/buildlink3.mk"
-.include "../../net/avahi/buildlink3.mk"
+#.include "../../net/avahi/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gpgme+=  gpgme>=1.0.1nb2
 .include "../../security/gpgme/buildlink3.mk"
diff -r 26b4647f8866 -r b3d1fb533102 security/seahorse/distinfo
--- a/security/seahorse/distinfo        Tue Jun 15 16:25:42 2010 +0000
+++ b/security/seahorse/distinfo        Tue Jun 15 16:32:11 2010 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.31 2009/10/24 12:53:55 drochner Exp $
+$NetBSD: distinfo,v 1.32 2010/06/15 16:32:11 drochner Exp $
 
 SHA1 (seahorse-2.28.1.tar.bz2) = 8d849f9e95241be3eefb54f3b64a18017c7bb8fc
 RMD160 (seahorse-2.28.1.tar.bz2) = 40e33550233f81a7adf152d8ba72a095c3a822bd
 Size (seahorse-2.28.1.tar.bz2) = 2397687 bytes
 SHA1 (patch-ab) = 2c785a8088dec9786f6c9d9ebbdf7cc2102f609c
+SHA1 (patch-ac) = ab2cae2de896c0b9508dad5e056c2f64f0ac1d59
diff -r 26b4647f8866 -r b3d1fb533102 security/seahorse/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/seahorse/patches/patch-ac        Tue Jun 15 16:32:11 2010 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5 2010/06/15 16:32:12 drochner Exp $
+
+--- pkcs11/seahorse-pkcs11-operations.c.orig   2009-04-18 03:22:13.000000000 +0000
++++ pkcs11/seahorse-pkcs11-operations.c
+@@ -181,7 +181,7 @@ seahorse_pkcs11_refresher_constructor (G
+ 
+       /* Step 1. Load the session */
+       slot = seahorse_pkcs11_source_get_slot (self->source);
+-      gp11_slot_open_session_async (slot, CKF_RW_SESSION, self->cancellable, 
++      gp11_slot_open_session_async (slot, CKF_RW_SESSION, NULL, NULL, self->cancellable, 
+                                     (GAsyncReadyCallback)on_open_session, self);
+       seahorse_operation_mark_start (SEAHORSE_OPERATION (self));
+