summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini <ponce@slackbuilds.org>2012-09-23 17:40:40 +0200
committer Robby Workman <rworkman@slackbuilds.org>2012-09-24 22:53:30 -0500
commit1703497b56ac7ad4c537913be23abadbd4c7da89 (patch)
tree0cb3b8ada4f50f9f8da1d8f0af53a7f38517a5e5
parent80421d754320d66e0c7e67b5c72107c88728d972 (diff)
downloadslackbuilds-1703497b56ac7ad4c537913be23abadbd4c7da89.tar.gz
slackbuilds-1703497b56ac7ad4c537913be23abadbd4c7da89.tar.xz
system/seahorse: Updated for version 3.4.1.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--system/seahorse/doinst.sh11
-rw-r--r--system/seahorse/seahorse-3.4.1-g_clear_object.patch25
-rw-r--r--system/seahorse/seahorse.SlackBuild8
-rw-r--r--system/seahorse/seahorse.info8
4 files changed, 35 insertions, 17 deletions
diff --git a/system/seahorse/doinst.sh b/system/seahorse/doinst.sh
index caa93c72af..3e5691a052 100644
--- a/system/seahorse/doinst.sh
+++ b/system/seahorse/doinst.sh
@@ -1,13 +1,3 @@
-schema_install() {
- SCHEMA="$1"
- GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
- chroot . gconftool-2 --makefile-install-rule \
- /etc/gconf/schemas/$SCHEMA \
- 1>/dev/null
-}
-
-schema_install seahorse.schemas
-
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
@@ -17,4 +7,3 @@ 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
-
diff --git a/system/seahorse/seahorse-3.4.1-g_clear_object.patch b/system/seahorse/seahorse-3.4.1-g_clear_object.patch
new file mode 100644
index 0000000000..1ae6915b2e
--- /dev/null
+++ b/system/seahorse/seahorse-3.4.1-g_clear_object.patch
@@ -0,0 +1,25 @@
+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 3fa9911ba6..9f0bfeb502 100644
--- a/system/seahorse/seahorse.SlackBuild
+++ b/system/seahorse/seahorse.SlackBuild
@@ -5,7 +5,7 @@
# Written by Andrew Rowland (darowland@ieee.org)
PRGNAM=seahorse
-VERSION=${VERSION:-2.32.0}
+VERSION=${VERSION:-3.4.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -42,7 +42,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@@ -51,6 +51,9 @@ 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 \
@@ -61,6 +64,7 @@ CXXFLAGS="$SLKCFLAGS" \
--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 0707d611f4..35424a5b5f 100644
--- a/system/seahorse/seahorse.info
+++ b/system/seahorse/seahorse.info
@@ -1,10 +1,10 @@
PRGNAM="seahorse"
-VERSION="2.32.0"
+VERSION="3.4.1"
HOMEPAGE="http://projects.gnome.org/seahorse/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.32/seahorse-2.32.0.tar.bz2"
-MD5SUM="bffb5ba78efb7eae760e05d8473ee7ad"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.4/seahorse-3.4.1.tar.xz"
+MD5SUM="0d5215a1b6d5747afe0909f4d91f53b9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="libcryptui"
MAINTAINER="Andrew Rowland"
EMAIL="darowland@ieee.org"