diff options
| author | drochner <drochner> | 2010-06-15 16:32:11 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2010-06-15 16:32:11 +0000 |
| commit | 496cae7294c2dd963babf321463e2178f2d34f40 (patch) | |
| tree | ca1f19b1a815a39db47f247c0f92d9f81cfe8305 /security | |
| parent | cab5e21deef0b5a5a7ee5cd7d60a022310f18779 (diff) | |
| download | pkgsrc-496cae7294c2dd963babf321463e2178f2d34f40.tar.gz | |
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 (limited to 'security')
| -rw-r--r-- | security/seahorse/Makefile | 5 | ||||
| -rw-r--r-- | security/seahorse/distinfo | 3 | ||||
| -rw-r--r-- | security/seahorse/patches/patch-ac | 13 |
3 files changed, 18 insertions, 3 deletions
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index c055cb15d8d..58d215729b7 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -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 @@ GCONF_SCHEMAS= seahorse.schemas .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 --git a/security/seahorse/distinfo b/security/seahorse/distinfo index 71fbcfff44e..343a4b3ef47 100644 --- a/security/seahorse/distinfo +++ b/security/seahorse/distinfo @@ -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 --git a/security/seahorse/patches/patch-ac b/security/seahorse/patches/patch-ac new file mode 100644 index 00000000000..6d63d37d7cc --- /dev/null +++ b/security/seahorse/patches/patch-ac @@ -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)); + |