diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-08-01 19:29:44 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-08-01 19:29:44 +0000 |
| commit | 0811090e407bc42b4e83e4d2618ed6bb6a947abd (patch) | |
| tree | 5ff6793497699168182b2ad138bd362bd800d810 /security/seahorse-plugins | |
| parent | Add a note to UPDATING about nouveau users needing to update their (diff) | |
Fix portability issues with newer gpgme.
Notes
Notes:
svn path=/head/; revision=238732
Diffstat (limited to 'security/seahorse-plugins')
4 files changed, 44 insertions, 1 deletions
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile index 10e2400db4f1..a6043f5e2eb2 100644 --- a/security/seahorse-plugins/Makefile +++ b/security/seahorse-plugins/Makefile @@ -8,7 +8,7 @@ PORTNAME= seahorse-plugins PORTVERSION= 2.26.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c b/security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c new file mode 100644 index 000000000000..70d1c926104c --- /dev/null +++ b/security/seahorse-plugins/files/patch-agent_seahorse-agent-cache.c @@ -0,0 +1,10 @@ +--- agent/seahorse-agent-cache.c.orig 2009-08-01 15:25:55.000000000 -0400 ++++ agent/seahorse-agent-cache.c 2009-08-01 15:23:38.000000000 -0400 +@@ -237,6 +237,7 @@ seahorse_agent_cache_init () + g_cache = + g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item); + ++ gpgme_check_version (NULL); + err = gpgme_engine_check_version (proto); + g_return_if_fail (GPG_IS_OK (err)); + diff --git a/security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c b/security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c new file mode 100644 index 000000000000..16c64303be80 --- /dev/null +++ b/security/seahorse-plugins/files/patch-libseahorse_seahorse-pgp-operation.c @@ -0,0 +1,10 @@ +--- libseahorse/seahorse-pgp-operation.c.orig 2009-08-01 15:26:28.000000000 -0400 ++++ libseahorse/seahorse-pgp-operation.c 2009-08-01 15:23:41.000000000 -0400 +@@ -323,6 +323,7 @@ seahorse_pgp_operation_init (SeahorsePGP + gpgme_error_t err; + gpgme_ctx_t ctx; + ++ gpgme_check_version (NULL); + err = gpgme_engine_check_version (proto); + g_return_if_fail (GPG_IS_OK (err)); + diff --git a/security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c b/security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c new file mode 100644 index 000000000000..f871ce6a9e32 --- /dev/null +++ b/security/seahorse-plugins/files/patch-plugins_nautilus_seahorse-tool.c @@ -0,0 +1,23 @@ +--- plugins/nuatilus/seahorse-tool.c.orig 2009-08-01 15:27:07.000000000 -0400 ++++ plugins/nuatilus/seahorse-tool.c 2009-08-01 15:23:46.000000000 -0400 +@@ -171,6 +171,9 @@ prompt_recipients (gpgme_key_t *signkey) + + if (recips) { + ++ gpgme_check_version (NULL); ++ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); ++ g_return_val_if_fail (GPG_IS_OK (gerr), NULL); + gerr = gpgme_new (&ctx); + g_return_val_if_fail (GPG_IS_OK (gerr), NULL); + +@@ -327,6 +330,10 @@ prompt_signer () + + id = cryptui_keyset_key_raw_keyid (keyset, signer); + g_free (signer); ++ ++ gpgme_check_version (NULL); ++ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); ++ g_return_val_if_fail (GPG_IS_OK (gerr), NULL); + + gerr = gpgme_new (&ctx); + g_return_val_if_fail (GPG_IS_OK (gerr), NULL); |