From 983f9b7fc788dcaee77ff3bbbfcee4258fb915af Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Mon, 26 Apr 2010 13:48:58 +0000 Subject: [PATCH] Apply ubuntu patch to finally solve bug #281729 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- app-crypt/seahorse-plugins/ChangeLog | 12 ++- app-crypt/seahorse-plugins/Manifest | 14 ++- ...e-plugins-2.28.1-gpgme_check_version.patch | 53 +++++++++++ .../seahorse-plugins-2.28.1-r1.ebuild | 87 +++++++++++++++++++ 4 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 app-crypt/seahorse-plugins/files/seahorse-plugins-2.28.1-gpgme_check_version.patch create mode 100644 app-crypt/seahorse-plugins/seahorse-plugins-2.28.1-r1.ebuild diff --git a/app-crypt/seahorse-plugins/ChangeLog b/app-crypt/seahorse-plugins/ChangeLog index 2049998e86c6..c9303ae7128d 100644 --- a/app-crypt/seahorse-plugins/ChangeLog +++ b/app-crypt/seahorse-plugins/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-crypt/seahorse-plugins # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.18 2010/02/12 19:59:58 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.19 2010/04/26 13:48:58 pacho Exp $ + +*seahorse-plugins-2.28.1-r1 (26 Apr 2010) + + 26 Apr 2010; Pacho Ramos + +seahorse-plugins-2.28.1-r1.ebuild, + +files/seahorse-plugins-2.28.1-gpgme_check_version.patch: + Revision bump to apply ubuntu patch to call gpgme_check_version () as + required by current stable and newer gpgme versions (see bug #281729). + Thanks to Sebastien Bacher for the patch, Patrick Beckmann and Alexander + Bezrukov for reporting. 12 Feb 2010; Raúl Porcel seahorse-plugins-2.26.2-r1.ebuild: diff --git a/app-crypt/seahorse-plugins/Manifest b/app-crypt/seahorse-plugins/Manifest index 6bcdd6131e11..1bbb3392b49f 100644 --- a/app-crypt/seahorse-plugins/Manifest +++ b/app-crypt/seahorse-plugins/Manifest @@ -1,10 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2b40525f543741dc0a453a8241e3b7c83f45da6f SHA256 2e70cbb034fde8ddd5c69baf97570ad706bec2e04bd7dd2c86f462b9a594e3c6 AUX seahorse-plugins-2.26.2-agent-gpg-compat.patch 5004 RMD160 81811be3be4f250d142d66db0f80d97087ce8a68 SHA1 8f58e2858a6b5923809e5fcedb2028fb670cf20b SHA256 740478d2596c59e95b34ababc8d1703eacd38b5cca0fb3e42d0470b5c85de0d6 AUX seahorse-plugins-2.26.2-gpgme-lfs.patch 1242 RMD160 b4f34f654629110855c750452d7bf91ccffe1e8f SHA1 7df11de75c2557da8b899d25c5f54c910b3be175 SHA256 c757c40d705174df3e01b572b64a97fe0599555b943658adbc4278eedf79e807 +AUX seahorse-plugins-2.28.1-gpgme_check_version.patch 2515 RMD160 ee0bc86476404c990dbe32bde8bc9ef655c5c80d SHA1 a9d56918e3de90a97e86dfdbadce24dc440c93ab SHA256 a7f53b2ae76137490b910b82ca63be7186937f57832f448a9b788f8a8f06c4a4 DIST seahorse-plugins-2.26.2.tar.bz2 1318153 RMD160 99659c47d880a02b5ab25289f1d459c7d1472c51 SHA1 df5cae9c19cd106fafc65d95b8d0d57bbd6a12db SHA256 c98fd6c0cf35b1628fa758d31da3f4f53d8861ec41ddee361256ff27f7b2cdb0 DIST seahorse-plugins-2.28.1.tar.bz2 1315429 RMD160 3eaa7a504241be8c8361bb400f42067d67fc3b84 SHA1 4ec436a6f34f50a69d7403b829b59598b8e374db SHA256 e04f9bba2d0527951cb15367e285d0f75de6392b140ca4183a70cec3fef7e97e EBUILD seahorse-plugins-2.26.2-r1.ebuild 2336 RMD160 fe08a00eb10f8a1c28105361785c78a23fdd4216 SHA1 b92c715c1728d95494fcd52f3594c0ed60160fe9 SHA256 9d01c15b2f37cebf501f9e9180cf88b7267cacf1d6e9a288ad24936033efb2bb EBUILD seahorse-plugins-2.26.2.ebuild 2166 RMD160 d05dd2e4ee9e3734967c537dff440cf50bc866b0 SHA1 5ab7ef43d12214a8a37a2112c8d83a469830b6da SHA256 c9f3ff7685e5c9b86b2a62280e06393c82dd2c80a2eda45b2df528265d674f03 +EBUILD seahorse-plugins-2.28.1-r1.ebuild 2293 RMD160 909b7ac146140655f902ab11ea3a64d60dbb2d11 SHA1 51ae42b82ef8b1cd5b2c3054bf5f19de75f2790b SHA256 58e8b8ecaa9b453b8f28d197ae72637d12165641184836536474d2d417cd30b7 EBUILD seahorse-plugins-2.28.1.ebuild 2144 RMD160 f1d6017b0877abfc162aff3b7781205d8cc27d8a SHA1 a39dbd5d66e59411623105cc063b31e435f2fa70 SHA256 d93896ebf07a5c74bcdabbae6514ee9b847c4aa3475a370541b64aa980ffe585 -MISC ChangeLog 3201 RMD160 b16b74d8571b1f042b6b2e4646a93bb7847a1f94 SHA1 2c90943944048c0c0a96a99ccac2cb371cbea41c SHA256 19e3cf886fd5e0c9256f4fd725ea295b853d54d820a6ca1e3e930e6a7ddc3fb8 +MISC ChangeLog 3633 RMD160 491203c806c3ef13529b8642e4f577dd0ded5dfa SHA1 0cfe4989397e34071ad0a4546ef30094fb9bbcd8 SHA256 bc9f2df7ccb40f71b5eadfd8efeffe2531888534cd106d1dd33f5fb6fd1d0c01 MISC metadata.xml 635 RMD160 9e4ce86f6c12e7c519fcea74ed7dfd646b7458ca SHA1 2a6ec6e8f12bb2e887ebf8c9c38b105012f0a2af SHA256 3e1c53ae9351ecbdcbf7bf930f12d4eb9176acc408094f222babba1ed7b95aa5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvVmdAACgkQCaWpQKGI+9QloACeOoQ07OKeZ3EEDJlFc2Ur0qwQ +VqoAni7oPSjFBCqDSzeUlcRFCojBn4UN +=Y2hQ +-----END PGP SIGNATURE----- diff --git a/app-crypt/seahorse-plugins/files/seahorse-plugins-2.28.1-gpgme_check_version.patch b/app-crypt/seahorse-plugins/files/seahorse-plugins-2.28.1-gpgme_check_version.patch new file mode 100644 index 000000000000..78a992634562 --- /dev/null +++ b/app-crypt/seahorse-plugins/files/seahorse-plugins-2.28.1-gpgme_check_version.patch @@ -0,0 +1,53 @@ +# Description: use gpgme_check_version () since gpgme_new () requires it now +# Bug Gentoo: http://bugs.gentoo.org/show_bug.cgi?id=281729 +# Bug-Ubuntu: https://bugs.launchpad.net/bugs/514950 +# Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607423 +Index: seahorse-plugins-2.30.0/plugins/nautilus/seahorse-tool.c +=================================================================== +--- seahorse-plugins-2.30.0.orig/plugins/nautilus/seahorse-tool.c 2010-02-13 15:31:34.000000000 +0100 ++++ seahorse-plugins-2.30.0/plugins/nautilus/seahorse-tool.c 2010-04-08 02:46:54.000000000 +0200 +@@ -170,6 +170,9 @@ + recips = cryptui_prompt_recipients (keyset, _("Choose Recipients"), &signer); + + if (recips) { ++ gpgme_check_version (NULL); ++ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); ++ g_return_val_if_fail (GPG_IS_OK (gerr), NULL); + + gerr = gpgme_new (&ctx); + g_return_val_if_fail (GPG_IS_OK (gerr), NULL); +@@ -328,6 +331,10 @@ + id = cryptui_keyset_key_raw_keyid (keyset, signer); + g_free (signer); + ++ gpgme_check_version (NULL); ++ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); ++ g_return_val_if_fail (GPG_IS_OK (gerr), NULL); ++ + gerr = gpgme_new (&ctx); + g_return_val_if_fail (GPG_IS_OK (gerr), NULL); + +Index: seahorse-plugins-2.30.0/agent/seahorse-agent-cache.c +=================================================================== +--- seahorse-plugins-2.30.0.orig/agent/seahorse-agent-cache.c 2010-01-25 03:06:50.000000000 +0100 ++++ seahorse-plugins-2.30.0/agent/seahorse-agent-cache.c 2010-04-08 02:46:54.000000000 +0200 +@@ -237,6 +237,7 @@ + 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)); + +Index: seahorse-plugins-2.30.0/libseahorse/seahorse-pgp-operation.c +=================================================================== +--- seahorse-plugins-2.30.0.orig/libseahorse/seahorse-pgp-operation.c 2010-01-25 03:06:50.000000000 +0100 ++++ seahorse-plugins-2.30.0/libseahorse/seahorse-pgp-operation.c 2010-04-08 02:46:54.000000000 +0200 +@@ -323,6 +323,7 @@ + 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 --git a/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1-r1.ebuild b/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1-r1.ebuild new file mode 100644 index 000000000000..e4c2afd5525b --- /dev/null +++ b/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/seahorse-plugins-2.28.1-r1.ebuild,v 1.1 2010/04/26 13:48:58 pacho Exp $ + +EAPI="2" + +inherit eutils gnome2 + +DESCRIPTION="A GNOME application for managing encryption keys" +HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="applet debug epiphany gedit libnotify nautilus test" + +RDEPEND=" + >=gnome-base/libglade-2.0 + >=gnome-base/gconf-2.0 + >=x11-libs/gtk+-2.10 + >=dev-libs/glib-2.16 + >=dev-libs/dbus-glib-0.72 + >=app-crypt/gpgme-1.0.0 + >=app-crypt/seahorse-2.25 + >=gnome-base/gnome-keyring-2.25 + >=gnome-extra/evolution-data-server-1.8 + + || ( + =app-crypt/gnupg-1.4* + =app-crypt/gnupg-2.0* ) + + nautilus? ( >=gnome-base/nautilus-2.12 ) + epiphany? ( + >=www-client/epiphany-2.24 + >=dev-libs/libxml2-2.6.0 ) + gedit? ( >=app-editors/gedit-2.16 ) + applet? ( >=gnome-base/gnome-panel-2.10 ) + libnotify? ( >=x11-libs/libnotify-0.3.2 )" +DEPEND="${RDEPEND} + sys-devel/gettext + >=app-text/gnome-doc-utils-0.3.2 + >=app-text/scrollkeeper-0.3 + >=dev-util/pkgconfig-0.20 + >=dev-util/intltool-0.35" + +pkg_setup() { + if use epiphany ; then + if has_version '>=www-client/epiphany-2.24.3-r10'; then + G2CONF="${G2CONF} --with-gecko=libxul-unstable" + else + # Now, epiphany could be using xul-1.8, xul-1.9 or ff-2 + # Let it auto-detect. + : + fi + fi + + G2CONF="${G2CONF} + --enable-agent + --disable-update-mime-database + --disable-static + $(use_enable applet) + $(use_enable debug) + $(use_enable epiphany) + $(use_enable gedit) + $(use_enable libnotify) + $(use_enable nautilus) + $(use_enable test tests)" +} + +src_prepare() { + gnome2_src_prepare + + # Use gpgme_engine_check_version() before gpgm_new() due current gpgme, bug #281729 + epatch "${FILESDIR}/${PN}-2.28.1-gpgme_check_version.patch" + + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" +} + +src_install() { + gnome2_src_install + + find "${D}" -name "*.la" -delete || die "remove of la files failed" + + exeinto /etc/X11/xinit/xinitrc.d/ + doexe "${FILESDIR}/70-seahorse-agent" || die "doexe failed" +} -- 2.26.2