summaryrefslogtreecommitdiff
path: root/extra/seahorse
diff options
context:
space:
mode:
authorJoshua I. Haase H. (xihh) <hahj87@gmail.com>2012-07-09 01:32:50 -0500
committerJoshua I. Haase H. (xihh) <hahj87@gmail.com>2012-07-09 01:32:50 -0500
commit6eefbbf4300e680dc93487c11a1ae35ee8299f06 (patch)
tree18dcda1a0631ddcdb3c1cfd963c353802b19a075 /extra/seahorse
parentff0d4f0f770b963217a41019cc606ac4a05c0a5f (diff)
Commiting libre package seahorse-3.4.1-1
Diffstat (limited to 'extra/seahorse')
-rw-r--r--extra/seahorse/10_gpgme_keyring_finalize_typo.patch21
-rw-r--r--extra/seahorse/PKGBUILD10
2 files changed, 2 insertions, 29 deletions
diff --git a/extra/seahorse/10_gpgme_keyring_finalize_typo.patch b/extra/seahorse/10_gpgme_keyring_finalize_typo.patch
deleted file mode 100644
index 86e9e23c3..000000000
--- a/extra/seahorse/10_gpgme_keyring_finalize_typo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5286af2304b3a59a2deeb508433c13d96fe2287c Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@gnome.org>
-Date: Mon, 30 Apr 2012 18:29:42 +0000
-Subject: Fix typo in finalizing of GPGME keyring
-
----
-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 */
---
-cgit v0.9.0.2
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index 20a0148b5..dfd7ff235 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -18,18 +18,12 @@ options=('!libtool' '!emptydirs')
groups=('gnome-extra')
install=seahorse.install
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- seahorse-ssh-askpass.sh
- 10_gpgme_keyring_finalize_typo.patch)
+ seahorse-ssh-askpass.sh)
sha256sums=('841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa'
- '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c'
- '5bdbe26d89dc256923cd26601a5639e5596ed488a2294618c1754d96de5f7d1c')
+ '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
build() {
cd "$pkgname-$pkgver"
-
- # From Debian.
- patch -p1 -i "$srcdir/10_gpgme_keyring_finalize_typo.patch"
-
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--enable-ldap --enable-hkp \