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

[Giovanni Scafora]

    Date: Tuesday, October 13, 2009 @ 07:32:48
  Author: giovanni
Revision: 55502

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

........
  r55480 | jgc | 2009-10-13 00:08:02 -0700 (mar, 13 ott 2009) | 2 lines
  
  upgpkg: seahorse-plugins 2.28.0-2
      Fix gpgme initialization (FS#16406)
........

Added:
  seahorse-plugins/repos/extra-i686/gpgme-init.patch
    (from rev 55480, seahorse-plugins/trunk/gpgme-init.patch)
Modified:
  seahorse-plugins/repos/extra-i686/	(properties)
  seahorse-plugins/repos/extra-i686/PKGBUILD

------------------+
 PKGBUILD         |    9 ++++++---
 gpgme-init.patch |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-13 11:21:07 UTC (rev 55501)
+++ extra-i686/PKGBUILD	2009-10-13 11:32:48 UTC (rev 55502)
@@ -3,7 +3,7 @@
 
 pkgname=seahorse-plugins
 pkgver=2.28.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Seahorse plugins"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,11 +13,14 @@
 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)
-sha256sums=('39322b8d8b919f9f2bf6a622999817cb4769977e1ed8945ff1f8001a42fdad80')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2
+        gpgme-init.patch)
+sha256sums=('39322b8d8b919f9f2bf6a622999817cb4769977e1ed8945ff1f8001a42fdad80'
+            'd02ad99e7707690b65b5513732795180354af4c72445771f29820ec5b89f57d9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gpgme-init.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper \
       --disable-update-mime-database \

Copied: seahorse-plugins/repos/extra-i686/gpgme-init.patch (from rev 55480, seahorse-plugins/trunk/gpgme-init.patch)
===================================================================
--- extra-i686/gpgme-init.patch	                        (rev 0)
+++ extra-i686/gpgme-init.patch	2009-10-13 11:32:48 UTC (rev 55502)
@@ -0,0 +1,21 @@
+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 @@
+         
+         if (recips) {
+             
++            gerr = gpgme_engine_check_version (proto);
++            g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
++
+             gerr = gpgme_new (&ctx);
+             g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
+