system/seahorse: Updated for version 3.8.1.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

6 files changed, 20 insertions, 45 deletions

diff --git a/system/seahorse/README b/system/seahorse/README
index 17768e8eb8..b7bf789c64 100644
--- a/system/seahorse/README
+++ b/system/seahorse/README
@@ -1,7 +1,3 @@
 Seahorse is a GNOME application for managing encryption keys. It also
 integrates with nautilus, gedit and other places for encryption 
 operations.
-
-This is the GTK+2 version of Seahorse.  Scrollkeeper support is
-disabled as Rarian is the replacement for Scrollkeeper and Rarian
-is not supported by this version of Seahorse.
diff --git a/system/seahorse/doinst.sh b/system/seahorse/doinst.sh
index 3e5691a052..0254ea06d8 100644
--- a/system/seahorse/doinst.sh
+++ b/system/seahorse/doinst.sh
@@ -7,3 +7,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
+
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
diff --git a/system/seahorse/seahorse-3.4.1-g_clear_object.patch b/system/seahorse/seahorse-3.4.1-g_clear_object.patch
deleted file mode 100644
index 1ae6915b2e..0000000000
--- a/system/seahorse/seahorse-3.4.1-g_clear_object.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5286af2304b3a59a2deeb508433c13d96fe2287c Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Mon, 30 Apr 2012 20:29:42 +0200
-Subject: [PATCH] Fix typo in finalizing of GPGME keyring
-
----
- pgp/seahorse-gpgme-keyring.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pgp/seahorse-gpgme-keyring.c b/pgp/seahorse-gpgme-keyring.c
-index 79ff39b..579ab09 100644
---- a/pgp/seahorse-gpgme-keyring.c
-+++ b/pgp/seahorse-gpgme-keyring.c
-@@ -859,7 +859,7 @@ seahorse_gpgme_keyring_finalize (GObject *object)
- {
- 	SeahorseGpgmeKeyring *self = SEAHORSE_GPGME_KEYRING (object);
- 
--	g_clear_object (self->pv->actions);
-+	g_clear_object (&self->pv->actions);
- 	g_hash_table_destroy (self->pv->keys);
- 
- 	/* All monitoring and scheduling should be done */
--- 
-1.7.8.6
-
diff --git a/system/seahorse/seahorse.SlackBuild b/system/seahorse/seahorse.SlackBuild
index 9f0bfeb502..ef355ee627 100644
--- a/system/seahorse/seahorse.SlackBuild
+++ b/system/seahorse/seahorse.SlackBuild
@@ -2,17 +2,20 @@
 
 # Slackware build script for seahorse
 
-# Written by Andrew Rowland (darowland@ieee.org)
+# Written by Andrew Rowland (weibullguy@gmail.com)
+# Updated to version 3.8.1 by Andrew Rowland
 
 PRGNAM=seahorse
-VERSION=${VERSION:-3.4.1}
+VERSION=${VERSION:-3.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -42,7 +45,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -51,9 +54,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Thanks gentoo for this
-patch -p1 < $CWD/seahorse-3.4.1-g_clear_object.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -63,8 +63,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-scrollkeeper \
-  --enable-debug=no \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/system/seahorse/seahorse.info b/system/seahorse/seahorse.info
index 35424a5b5f..cd26dc5883 100644
--- a/system/seahorse/seahorse.info
+++ b/system/seahorse/seahorse.info
@@ -1,10 +1,10 @@
 PRGNAM="seahorse"
-VERSION="3.4.1"
+VERSION="3.8.1"
 HOMEPAGE="http://projects.gnome.org/seahorse/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.4/seahorse-3.4.1.tar.xz"
-MD5SUM="0d5215a1b6d5747afe0909f4d91f53b9"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.8/seahorse-3.8.1.tar.xz"
+MD5SUM="5f80effb99f418d09fffaf701409620c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libcryptui"
+REQUIRES="itstool libsecret"
 MAINTAINER="Andrew Rowland"
-EMAIL="darowland@ieee.org"
+EMAIL="weibullguy@gmail.com"
diff --git a/system/seahorse/slack-desc b/system/seahorse/slack-desc
index c4b18180a4..d44ad6c0a3 100644
--- a/system/seahorse/slack-desc
+++ b/system/seahorse/slack-desc
@@ -12,8 +12,8 @@ seahorse: Seahorse is a GNOME application for managing encryption keys. It also
 seahorse: integrates with nautilus, gedit and other places for encryption 
 seahorse: operations.
 seahorse:
-seahorse: This is the GTK+2 version of Seahorse.  Scrollkeeper support is
-seahorse: disabled as Rarian is the replacement for Scrollkeeper and Rarian
-seahorse: is not supported by this version of Seahorse.
+seahorse:
+seahorse:
+seahorse:
 seahorse:
 seahorse: