From 2d6fbeaf0b30aa5e3515e1655e9715995491661b Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Fri, 2 Apr 2010 14:30:33 +0000 Subject: [PATCH] Fix compatibility with Mono 2.6. Fixes bug 310371. Package-Manager: portage-2.1.7.17/cvs/Linux x86_64 --- gnome-extra/gnome-do-plugins/ChangeLog | 11 +++- gnome-extra/gnome-do-plugins/Manifest | 12 ++-- .../files/gnome-do-plugins-0.8.2-mono26.patch | 17 ++++++ .../gnome-do-plugins-0.8.2-r1.ebuild | 61 +++++++++++++++++++ 4 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono26.patch create mode 100644 gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.2-r1.ebuild diff --git a/gnome-extra/gnome-do-plugins/ChangeLog b/gnome-extra/gnome-do-plugins/ChangeLog index 2151d40efddd..7ea8042f0770 100644 --- a/gnome-extra/gnome-do-plugins/ChangeLog +++ b/gnome-extra/gnome-do-plugins/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/gnome-do-plugins -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/ChangeLog,v 1.16 2009/08/29 07:26:30 graaff Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/ChangeLog,v 1.17 2010/04/02 14:30:33 graaff Exp $ + +*gnome-do-plugins-0.8.2-r1 (02 Apr 2010) + + 02 Apr 2010; Hans de Graaff + +gnome-do-plugins-0.8.2-r1.ebuild, + +files/gnome-do-plugins-0.8.2-mono26.patch: + Fix compatibility with Mono 2.6. Fixes bug 310371. 29 Aug 2009; Hans de Graaff gnome-do-plugins-0.8.2.ebuild: diff --git a/gnome-extra/gnome-do-plugins/Manifest b/gnome-extra/gnome-do-plugins/Manifest index 9c67e49235aa..cf78460a4d55 100644 --- a/gnome-extra/gnome-do-plugins/Manifest +++ b/gnome-extra/gnome-do-plugins/Manifest @@ -1,14 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX gnome-do-plugins-0.8.2-mono26.patch 546 RMD160 20b7f6eb0a59e1f359d581bd81e485e43e159137 SHA1 1930930812a5013eee2ad3fbf98ffd5d5b360ac5 SHA256 91f08225399a244ad3d9f4ae23e21c8b23319d71ba3411c0704b6a5ee36ad9b6 DIST gnome-do-plugins-0.8.2.tar.gz 4406332 RMD160 f236a907e88d514b0b78ef9537acced652598f67 SHA1 897a2949d126201505701e64b07a3a89232362d3 SHA256 b3707f5a61a344825dd079ee76b7037b396952c208414d523cb117bf522147b5 +EBUILD gnome-do-plugins-0.8.2-r1.ebuild 1864 RMD160 87892290f9bfc3bd860af3803f1ae58ff7d37c22 SHA1 c2b6731b0ff72539007c3c01a80f211b78b603c5 SHA256 12e2a8bda3a6816e68b7bac18636efc9f4f426842016d6cbc639ae0f8a33ab8f EBUILD gnome-do-plugins-0.8.2.ebuild 1819 RMD160 da81597359a248eadcb093ab975d321f8ff6f4ee SHA1 f8025d4be3e35ea57c264284bbb7afc46b355da6 SHA256 3b80c42fb8e7d27b15829cc574bb9599c34e9a9ff4f73ff08dec5bf39b9a2fe9 -MISC ChangeLog 3872 RMD160 27b028592ada64498a8e6cab0d230cb7cd260c8e SHA1 ded30bfdeee37a431f5c7938391768cde27df144 SHA256 eee770a1df1528df67f76acf396d4980899b7519aa9fd2ee8721e77796162415 +MISC ChangeLog 4101 RMD160 65d0b0ba590e63c80aef0550e38c1dfd3332ba43 SHA1 07b3d42850a8d09d4df6a8743a76aca3f1768b5a SHA256 72da61af6690f50987bfda2552db34c45c8e1df2381126f27a9856929ddd46a8 MISC metadata.xml 368 RMD160 fefd4c049a6c58b0320511ecb4190dd6b260c3e9 SHA1 1a909ca76ceed1888a91de07d18e60e98b34203b SHA256 62a86408147679f6686568a3152b6bbb736c5ba70bc2910c505f03299ba5676e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkqY2CsACgkQVYU2Ai8K93fR6ACdHTyO/3BzI6vuDQDJteLK0dmG -kQMAoJxV+oeqqIlT6QDWtfFHqq2DBsw1 -=fgOL +iEYEARECAAYFAku1/5YACgkQeM7EJeUH71PikACeKoZNlEFddrlWjNrtccVOEzQ1 +SXcAnAqiD6zsXzR5FeZevGV9Mu3ePrje +=3ZRx -----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono26.patch b/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono26.patch new file mode 100644 index 000000000000..e4aa8f2e695f --- /dev/null +++ b/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono26.patch @@ -0,0 +1,17 @@ +Upstream revision 678 fixes compilation with mono 2.6. + +=== modified file 'Evolution/src/ContactItemSource.cs' +--- Evolution/src/ContactItemSource.cs 2009-06-22 04:05:16 +0000 ++++ Evolution/src/ContactItemSource.cs 2010-02-12 01:08:47 +0000 +@@ -32,8 +32,8 @@ + { + public struct ContactAttribute + { +- public string Detail { get; protected set; } +- public string Key { get; protected set; } ++ public string Detail { get; private set; } ++ public string Key { get; private set; } + + public ContactAttribute (string key, string detail) + { + diff --git a/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.2-r1.ebuild b/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.2-r1.ebuild new file mode 100644 index 000000000000..d2f134f5c581 --- /dev/null +++ b/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.2-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.2-r1.ebuild,v 1.1 2010/04/02 14:30:33 graaff Exp $ + +EAPI=2 + +inherit eutils autotools gnome2 mono versionator + +MY_PN="do-plugins" +PVC=$(get_version_component_range 1-3) + +DESCRIPTION="Plugins to put the Do in Gnome Do" +HOMEPAGE="http://do.davebsd.com/" +SRC_URI="https://launchpad.net/${MY_PN}/0.8/${PVC}/+download/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="banshee evo" + +RDEPEND=">=gnome-extra/gnome-do-${PV} + dev-dotnet/wnck-sharp + banshee? ( >=media-sound/banshee-1.4.2 ) + evo? ( dev-dotnet/evolution-sharp )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_prepare() { + # Filed upstream as https://bugs.launchpad.net/do/+bug/392422 + use banshee || sed -i -r -e "/(BANSHEE_INDEXER_DLL)/d" BundledLibraries/Makefile.am + + epatch "${FILESDIR}/${P}-mono26.patch" + + eautomake +} + +src_configure() { + econf --enable-debug=no --enable-release=yes \ + $(use banshee) \ + $(use evo evolution) \ + --disable-flickr || die "configure failed" +} + +src_compile() +{ + # The make system is unfortunately broken for parallel builds and + # upstream indicated on IRC that they have no intention to fix + # that. + emake -j1 || die "make failed" +} + +pkg_postinst() +{ + ewarn "Plugin handling has changed since gnome-do 0.4." + ewarn "If you install the gnome-do-plugins package you will have local copies" + ewarn "of the plugins, but you still need to manually enable them in Preferences." + ewarn "Also note that plugins installed from upstream may not be compatible with" + ewarn "your system. When in doubt check the output from gnome-do itself". + ewarn "Old plugins may not be compatible either." + ewarn "Check ~/.local/share/gnome-do/ if you have problems with plugins." +} -- 2.26.2