Tue Apr 5 14:26:38 UTC 2011

4 files changed, 133 insertions, 0 deletions

diff --git a/extra/seahorse-plugins/PKGBUILD b/extra/seahorse-plugins/PKGBUILD
new file mode 100644
index 000000000..d081ed186
--- /dev/null
+++ b/extra/seahorse-plugins/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 112893 2011-03-07 15:53:09Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=seahorse-plugins
+pkgver=2.30.1
+pkgrel=3
+pkgdesc="Seahorse plugins"
+arch=(i686 x86_64)
+license=('GPL')
+depends=('seahorse>=2.30.1' 'desktop-file-utils')
+makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'pkgconfig' 'gedit>=2.30.2' 'nautilus>=2.30.1' 'gnome-panel-bonobo>=2.32.0')
+optdepends=('gnome-panel-bonobo: applet support')
+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.30/${pkgname}-${pkgver}.tar.bz2
+        gpgme-init.patch
+        seahorse-plugins-2.30.1-libnotify-0.7.patch)
+sha256sums=('1fdfed1aef2c22a29a9abc00eae67752854e466a66cee2a8c1c278277e832d66'
+            '418d67892b348d02885e968c5299416baf545b12cf8f58b23579f79e87776ab2'
+            '9da8c5552217a56f4b7d12e28a425b3980b20953d8312c3017378e5a71536905')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gpgme-init.patch"
+  patch -Np0 -i "${srcdir}/seahorse-plugins-2.30.1-libnotify-0.7.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-scrollkeeper \
+      --disable-update-mime-database \
+      --disable-static
+  make
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain seahorse-plugins ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
diff --git a/extra/seahorse-plugins/gpgme-init.patch b/extra/seahorse-plugins/gpgme-init.patch
new file mode 100644
index 000000000..7e2e94be2
--- /dev/null
+++ b/extra/seahorse-plugins/gpgme-init.patch
@@ -0,0 +1,43 @@
+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) {
+             
++            gpgme_check_version (NULL);
+             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);
+         
diff --git a/extra/seahorse-plugins/seahorse-plugins-2.30.1-libnotify-0.7.patch b/extra/seahorse-plugins/seahorse-plugins-2.30.1-libnotify-0.7.patch
new file mode 100644
index 000000000..060340707
--- /dev/null
+++ b/extra/seahorse-plugins/seahorse-plugins-2.30.1-libnotify-0.7.patch
@@ -0,0 +1,26 @@
+--- libseahorse/seahorse-notification.c
++++ libseahorse/seahorse-notification.c
+@@ -34,6 +34,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ /* -----------------------------------------------------------------------------
+@@ -213,7 +216,12 @@
+     heading = format_key_text (snotif->heading);
+     message = format_key_text (snotif->message);
+     
+-    notif = notify_notification_new (heading, message, snotif->icon, attachto);
++    notif = notify_notification_new (heading, message, snotif->icon
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    );
++#else
++    , attachto);
++#endif
+     
+     g_free (heading);
+     g_free (message);
diff --git a/extra/seahorse-plugins/seahorse-plugins.install b/extra/seahorse-plugins/seahorse-plugins.install
new file mode 100644
index 000000000..3f36ff2a2
--- /dev/null
+++ b/extra/seahorse-plugins/seahorse-plugins.install
@@ -0,0 +1,26 @@
+pkgname=seahorse-plugins
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime >/dev/null 2>&1
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime
+}