[arch-commits] Commit in seahorse-plugins/repos (3 files)

[Giovanni Scafora]

    Date: Friday, October 23, 2009 @ 21:20:59
  Author: giovanni
Revision: 56612

Merged revisions 56128 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/seahorse-plugins/trunk

........
  r56128 | jgc | 2009-10-19 13:21:16 -0700 (lun, 19 ott 2009) | 2 lines
  
  upgpkg: seahorse-plugins 2.28.1-1
      Fix gpgme init the way it should be
........

Modified:
  seahorse-plugins/repos/extra-i686/	(properties)
  seahorse-plugins/repos/extra-i686/PKGBUILD
  seahorse-plugins/repos/extra-i686/gpgme-init.patch

------------------+
 PKGBUILD         |   10 +++++-----
 gpgme-init.patch |   14 ++------------
 2 files changed, 7 insertions(+), 17 deletions(-)


Property changes on: seahorse-plugins/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /seahorse-plugins/trunk:1-55501
   + /seahorse-plugins/trunk:1-56611

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-24 00:17:34 UTC (rev 56611)
+++ extra-i686/PKGBUILD	2009-10-24 01:20:59 UTC (rev 56612)
@@ -2,12 +2,12 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=seahorse-plugins
-pkgver=2.28.0
-pkgrel=2
+pkgver=2.28.1
+pkgrel=1
 pkgdesc="Seahorse plugins"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gnome-panel>=2.28.0' 'seahorse>=2.28.0' 'desktop-file-utils')
+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')
 groups=('gnome-extra')
 url="http://www.gnome.org"
@@ -15,8 +15,8 @@
 install=seahorse-plugins.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2
         gpgme-init.patch)
-sha256sums=('39322b8d8b919f9f2bf6a622999817cb4769977e1ed8945ff1f8001a42fdad80'
-            'd02ad99e7707690b65b5513732795180354af4c72445771f29820ec5b89f57d9')
+sha256sums=('e04f9bba2d0527951cb15367e285d0f75de6392b140ca4183a70cec3fef7e97e'
+            '58a84873173ac30e1ea6d1ebbe6debbd1339b7c985cc8a99343062437dc88936')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: extra-i686/gpgme-init.patch
===================================================================
--- extra-i686/gpgme-init.patch	2009-10-24 00:17:34 UTC (rev 56611)
+++ extra-i686/gpgme-init.patch	2009-10-24 01:20:59 UTC (rev 56612)
@@ -1,21 +1,11 @@
 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
-@@ -153,6 +153,7 @@
- prompt_recipients (gpgme_key_t *signkey)
- {
-     gpgme_error_t gerr = GPG_OK;
-+    gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP;
-     CryptUIKeyset *keyset;
-     gpgme_ctx_t ctx;
-     gpgme_key_t key;
-@@ -171,6 +172,9 @@
+@@ -171,6 +172,7 @@
          
          if (recips) {
              
-+            gerr = gpgme_engine_check_version (proto);
-+            g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
-+
++            gpgme_check_version (NULL);
              gerr = gpgme_new (&ctx);
              g_return_val_if_fail (GPG_IS_OK (gerr), NULL);