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 | |
| 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')
| -rw-r--r-- | security/seahorse/Makefile | 2 | ||||
| -rw-r--r-- | security/seahorse/files/patch-daemon_seahorse-hkp-server.c | 13 | ||||
| -rw-r--r-- | security/seahorse/files/patch-pgp_seahorse-gpgme-source.c | 10 |
3 files changed, 24 insertions, 1 deletions
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index d9fb84368cdd..56c3406a2513 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -8,7 +8,7 @@ PORTNAME= seahorse PORTVERSION= 2.26.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/security/seahorse/files/patch-daemon_seahorse-hkp-server.c b/security/seahorse/files/patch-daemon_seahorse-hkp-server.c new file mode 100644 index 000000000000..1880aad325a3 --- /dev/null +++ b/security/seahorse/files/patch-daemon_seahorse-hkp-server.c @@ -0,0 +1,13 @@ +--- daemon/seahorse-hkp-server.c.orig 2009-08-01 15:25:02.000000000 -0400 ++++ daemon/seahorse-hkp-server.c 2009-08-01 15:23:27.000000000 -0400 +@@ -467,7 +467,9 @@ seahorse_hkp_server_start(GError **err) + /* Initialize GPGME context */ + if (gpgme_ctx == NULL) { + gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP; +- gpgme_error_t err = gpgme_engine_check_version (proto); ++ gpgme_error_t err; ++ gpgme_check_version (NULL); ++ err = gpgme_engine_check_version (proto); + g_return_val_if_fail (GPG_IS_OK (err), FALSE); + + err = gpgme_new (&gpgme_ctx); diff --git a/security/seahorse/files/patch-pgp_seahorse-gpgme-source.c b/security/seahorse/files/patch-pgp_seahorse-gpgme-source.c new file mode 100644 index 000000000000..b036a81571df --- /dev/null +++ b/security/seahorse/files/patch-pgp_seahorse-gpgme-source.c @@ -0,0 +1,10 @@ +--- pgp/seahorse-gpgme-source.c.orig 2009-08-01 15:24:28.000000000 -0400 ++++ pgp/seahorse-gpgme-source.c 2009-08-01 15:23:24.000000000 -0400 +@@ -139,6 +139,7 @@ init_gpgme (gpgme_ctx_t *ctx) + gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP; + gpgme_error_t err; + ++ gpgme_check_version (NULL); + err = gpgme_engine_check_version (proto); + g_return_val_if_fail (GPG_IS_OK (err), err); + |