diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-17 11:32:40 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-17 11:32:40 +0200 |
| commit | f82f89398d1f66131d8ff22c17d0353635cac405 (patch) | |
| tree | 3361f99bc56ecd8455083dae5a232061364328b5 /extra/seahorse | |
| parent | 53babe5dd7052f275ddebd9916b97df316ba7beb (diff) | |
Fix seahorse build.
Diffstat (limited to 'extra/seahorse')
| -rw-r--r-- | extra/seahorse/10_gpgme_keyring_finalize_typo.patch | 21 | ||||
| -rw-r--r-- | extra/seahorse/PKGBUILD | 10 |
2 files changed, 29 insertions, 2 deletions
diff --git a/extra/seahorse/10_gpgme_keyring_finalize_typo.patch b/extra/seahorse/10_gpgme_keyring_finalize_typo.patch new file mode 100644 index 000000000..86e9e23c3 --- /dev/null +++ b/extra/seahorse/10_gpgme_keyring_finalize_typo.patch @@ -0,0 +1,21 @@ +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 dfd7ff235..20a0148b5 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -18,12 +18,18 @@ 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) + seahorse-ssh-askpass.sh + 10_gpgme_keyring_finalize_typo.patch) sha256sums=('841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa' - '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') + '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c' + '5bdbe26d89dc256923cd26601a5639e5596ed488a2294618c1754d96de5f7d1c') 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 \ |