Date: Sunday, February 14, 2010 @ 11:00:29 Author: jgc Revision: 68845
upgpkg: seahorse-plugins 2.29.90-1 Update to 2.29.90 - update patch to fix more issues with gpgme Modified: seahorse-plugins/trunk/PKGBUILD seahorse-plugins/trunk/gpgme-init.patch ------------------+ PKGBUILD | 12 ++++++------ gpgme-init.patch | 40 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-02-14 15:31:24 UTC (rev 68844) +++ PKGBUILD 2010-02-14 16:00:29 UTC (rev 68845) @@ -2,21 +2,21 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=seahorse-plugins -pkgver=2.28.1 +pkgver=2.29.90 pkgrel=1 pkgdesc="Seahorse plugins" arch=(i686 x86_64) license=('GPL') -depends=('gnome-panel>=2.28.0' 'seahorse>=2.28.1' 'desktop-file-utils') -makedepends=('intltool' 'gnome-doc-utils>=0.18.0' 'pkgconfig' 'gedit>=2.28.0' 'nautilus>=2.28.0') +depends=('gnome-panel>=2.29.6' 'seahorse>=2.29.90' 'desktop-file-utils') +makedepends=('intltool' 'gnome-doc-utils>=0.18.0' 'pkgconfig' 'gedit>=2.29.6' 'nautilus>=2.29.90') groups=('gnome-extra') url="http://www.gnome.org"; options=(!libtool !emptydirs) install=seahorse-plugins.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.29/${pkgname}-${pkgver}.tar.bz2 gpgme-init.patch) -sha256sums=('e04f9bba2d0527951cb15367e285d0f75de6392b140ca4183a70cec3fef7e97e' - '58a84873173ac30e1ea6d1ebbe6debbd1339b7c985cc8a99343062437dc88936') +sha256sums=('f39134b404ce809c869544aa4fdcc51ffb750ad514f75585ef20e90b06b8961e' + '418d67892b348d02885e968c5299416baf545b12cf8f58b23579f79e87776ab2') build() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: gpgme-init.patch =================================================================== --- gpgme-init.patch 2010-02-14 15:31:24 UTC (rev 68844) +++ gpgme-init.patch 2010-02-14 16:00:29 UTC (rev 68845) @@ -1,7 +1,30 @@ -diff -ruN seahorse-plugins-2.28.0/plugins/nautilus/seahorse-tool.c seahorse-plugins-2.28.0.patched/plugins/nautilus/seahorse-tool.c ---- seahorse-plugins-2.28.0/plugins/nautilus/seahorse-tool.c 2009-09-03 13:20:15.000000000 +0200 -+++ seahorse-plugins-2.28.0.patched/plugins/nautilus/seahorse-tool.c 2009-10-13 09:03:34.000000000 +0200 -@@ -171,6 +172,7 @@ +diff -ruN seahorse-plugins-2.29.90.orig/agent/seahorse-agent-cache.c seahorse-plugins-2.29.90/agent/seahorse-agent-cache.c +--- seahorse-plugins-2.29.90.orig/agent/seahorse-agent-cache.c 2010-01-25 03:06:50.000000000 +0100 ++++ seahorse-plugins-2.29.90/agent/seahorse-agent-cache.c 2010-02-14 12:31:01.000000000 +0100 +@@ -236,6 +236,7 @@ + if (g_cache == NULL) { + 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 -ruN seahorse-plugins-2.29.90.orig/libseahorse/seahorse-pgp-operation.c seahorse-plugins-2.29.90/libseahorse/seahorse-pgp-operation.c +--- seahorse-plugins-2.29.90.orig/libseahorse/seahorse-pgp-operation.c 2010-01-25 03:06:50.000000000 +0100 ++++ seahorse-plugins-2.29.90/libseahorse/seahorse-pgp-operation.c 2010-02-14 12:31:25.000000000 +0100 +@@ -322,6 +322,8 @@ + gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP; + 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 -ruN seahorse-plugins-2.29.90.orig/plugins/nautilus/seahorse-tool.c seahorse-plugins-2.29.90/plugins/nautilus/seahorse-tool.c +--- seahorse-plugins-2.29.90.orig/plugins/nautilus/seahorse-tool.c 2010-01-25 03:06:50.000000000 +0100 ++++ seahorse-plugins-2.29.90/plugins/nautilus/seahorse-tool.c 2010-02-14 12:32:44.000000000 +0100 +@@ -171,6 +171,7 @@ if (recips) { @@ -9,3 +32,12 @@ gerr = gpgme_new (&ctx); g_return_val_if_fail (GPG_IS_OK (gerr), NULL); +@@ -328,6 +329,8 @@ + id = cryptui_keyset_key_raw_keyid (keyset, signer); + g_free (signer); + ++ gpgme_check_version (NULL); ++ + gerr = gpgme_new (&ctx); + g_return_val_if_fail (GPG_IS_OK (gerr), NULL); +
