Fix compilation with mono 2.8.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 86 insertions, 7 deletions

diff --git a/gnome-extra/gnome-do/ChangeLog b/gnome-extra/gnome-do/ChangeLog
index 1739df497e4c..fd61790f5a57 100644
--- a/gnome-extra/gnome-do/ChangeLog
+++ b/gnome-extra/gnome-do/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-do
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.22 2010/10/09 09:29:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/ChangeLog,v 1.23 2010/10/24 07:57:16 graaff Exp $
+
+  24 Oct 2010; Hans de Graaff <graaff@gentoo.org> gnome-do-0.8.3.1.ebuild,
+  +files/gnome-do-0.8.3.1-mono-2.8.patch:
+  Fix compilation with mono 2.8.
 
   09 Oct 2010; Hans de Graaff <graaff@gentoo.org> -gnome-do-0.8.2.ebuild:
   Remove old version.
diff --git a/gnome-extra/gnome-do/Manifest b/gnome-extra/gnome-do/Manifest
index 403a67af2910..38757e6a6788 100644
--- a/gnome-extra/gnome-do/Manifest
+++ b/gnome-extra/gnome-do/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnome-do-0.8.3.1-mono-2.8.patch 3390 RMD160 e4d95f0daac0ef9d4a480f8ec88f23780c4cada1 SHA1 cf9812c64e58d6ce112cb4cabc0529ae0c51fff7 SHA256 3bf46487d2f87daff17f1150a2e988689af270d3998465ee1652132a1ab60e29
 DIST gnome-do-0.8.3.1.tar.gz 1264294 RMD160 7b894129759383bf6e82f3ed8ab61f0e72aa7d98 SHA1 d4c19dded07e4f728c849c03e2284ddda325fabc SHA256 aa263b02193f8a403d906005e135c7315e6b02bf3a170ab3ff8409ed5acbe467
-EBUILD gnome-do-0.8.3.1.ebuild 1405 RMD160 3d293f0c6be99b5ff7c220f04e6cbbe3c087b48a SHA1 27588bcbad596e0f310409fb1098c53a7d9e80b9 SHA256 349024e939e323795f085474da5f0fb76b49204f281b869c4dd5d5472c66b490
-MISC ChangeLog 4337 RMD160 dcdaf2f012cf8508405d4c483cdd00c7fd1ce44f SHA1 69c7925b26071303e10d3eaecd0b50b03f75ae1e SHA256 00e4f90e746b78184eaf4085f21e3f440c709e43ff6976165847b31ebd9ce84e
+EBUILD gnome-do-0.8.3.1.ebuild 1466 RMD160 f0e29cf816ad687989c0eca52786c90bea248266 SHA1 b7b27e2fa1d201a91f3323690b176759932a685e SHA256 e7280b7886c700cff4543907542890d63cdf0909165f9c4d4c5953aeabde9ea1
+MISC ChangeLog 4488 RMD160 559d5e59333c75592e8dadcdc423a4bf17d93965 SHA1 4b4998cb12712d2c648ae6b5717e977fd9858da1 SHA256 a4861fe5d86c2fd7950c7b4a55a321897ff42e576124d91511a429d7543981d3
 MISC metadata.xml 659 RMD160 9f0be777455f361ebf48aaf4a7f2c9eda7d1e38f SHA1 f2a4936ced71c9dc7187c06df2145dec10a43ad0 SHA256 d30200e9c3f2404ab3a9ae9850854eea4dd5bc9391e4b5aa0b728e047865aec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkywNfsACgkQZihJkut28St1ewD/fo6n6uLi94Zsl/NjvVR7yF3S
-mu862oeq56RlvCp3/T0A/imB1mScfLNtWEDMFmCwtTizz9o5aKnNqeoM/Xc/Irtl
-=S8/D
+iF4EAREIAAYFAkzD5uIACgkQZihJkut28SvxXAD/RJ6gu/ucn9un+tHKkFCXGO56
+ibV4tTbJxFp2pV2eY28BAIasBX/6G9zP4j70I5oFdmQkFNbRyWUYHpMyy4jV0aKN
+=8lNl
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch
new file mode 100644
index 000000000000..2e492a87edde
--- /dev/null
+++ b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch
@@ -0,0 +1,70 @@
+https://bugs.launchpad.net/do/+bug/634556
+https://bugs.launchpad.net/do/+bug/634550
+
+Patches by Andrew Jorgensen
+
+--- Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs	2010-09-01 13:11:53.000000000 -0600
+@@ -45,12 +45,12 @@
+ 		
+ 		public TextRenderContext (Cairo.Context cr, string text, int width)
+ 		{
+-			Context = cr;
+-			Text = text;
+-			Alignment = Alignment.Left;
+-			MaximumWidth = width;
+-			WrapMode = WrapMode.WordChar;
+-			EllipsizeMode = EllipsizeMode.End;
++			this.Context = cr;
++			this.Text = text;
++			this.Alignment = Alignment.Left;
++			this.MaximumWidth = width;
++			this.WrapMode = WrapMode.WordChar;
++			this.EllipsizeMode = EllipsizeMode.End;
+ 		}
+ 	}
+ }
+--- Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs	2010-09-01 13:58:26.000000000 -0600
+@@ -57,7 +57,7 @@
+             Stetic.Gui.Initialize(this);
+             // Widget Do.UI.ColorConfigurationWidget
+             Stetic.BinContainer.Attach(this);
+-            this.Name = "Do.UI.ColorConfigurationWidget";
++            base.Name = "Do.UI.ColorConfigurationWidget";
+             // Container child Do.UI.ColorConfigurationWidget.Gtk.Container+ContainerChild
+             this.vbox2 = new Gtk.VBox();
+             this.vbox2.Name = "vbox2";
+--- Do/gtk-gui/Do.UI.GeneralPreferencesWidget.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.GeneralPreferencesWidget.cs	2010-09-01 13:58:43.000000000 -0600
+@@ -33,7 +33,7 @@
+             Stetic.Gui.Initialize(this);
+             // Widget Do.UI.GeneralPreferencesWidget
+             Stetic.BinContainer.Attach(this);
+-            this.Name = "Do.UI.GeneralPreferencesWidget";
++            base.Name = "Do.UI.GeneralPreferencesWidget";
+             // Container child Do.UI.GeneralPreferencesWidget.Gtk.Container+ContainerChild
+             this.alignment4 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
+             this.alignment4.Name = "alignment4";
+--- Do/gtk-gui/Do.UI.KeybindingsPreferencesWidget.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.KeybindingsPreferencesWidget.cs	2010-09-01 13:59:08.000000000 -0600
+@@ -27,7 +27,7 @@
+             Stetic.Gui.Initialize(this);
+             // Widget Do.UI.KeybindingsPreferencesWidget
+             Stetic.BinContainer.Attach(this);
+-            this.Name = "Do.UI.KeybindingsPreferencesWidget";
++            base.Name = "Do.UI.KeybindingsPreferencesWidget";
+             // Container child Do.UI.KeybindingsPreferencesWidget.Gtk.Container+ContainerChild
+             this.vbox2 = new Gtk.VBox();
+             this.vbox2.Name = "vbox2";
+--- Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs	2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs	2010-09-01 13:59:19.000000000 -0600
+@@ -43,7 +43,7 @@
+             Stetic.Gui.Initialize(this);
+             // Widget Do.UI.ManagePluginsPreferencesWidget
+             Stetic.BinContainer.Attach(this);
+-            this.Name = "Do.UI.ManagePluginsPreferencesWidget";
++            base.Name = "Do.UI.ManagePluginsPreferencesWidget";
+             // Container child Do.UI.ManagePluginsPreferencesWidget.Gtk.Container+ContainerChild
+             this.vbox3 = new Gtk.VBox();
+             this.vbox3.Name = "vbox3";
diff --git a/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild b/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild
index 336c3ac41f4d..e565879f1557 100644
--- a/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild
+++ b/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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/gnome-do-0.8.3.1.ebuild,v 1.3 2010/07/10 07:48:46 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do/gnome-do-0.8.3.1.ebuild,v 1.4 2010/10/24 07:57:16 graaff Exp $
 
 # TODO: GNOME Do defaults to a debug build; to disable, --enable-release must
 # be passed. However, when doing this the build fails; figure out why.
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND}
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-mono-2.8.patch
+}
+
 src_configure() {
 	gnome2_src_configure
 }