Add various patches to fix compilation with Mono 2.8, fixing bug 340785.

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

4 files changed, 60 insertions, 7 deletions

diff --git a/gnome-extra/gnome-do-plugins/ChangeLog b/gnome-extra/gnome-do-plugins/ChangeLog
index 9fe2bba956a6..ad1aff7971a4 100644
--- a/gnome-extra/gnome-do-plugins/ChangeLog
+++ b/gnome-extra/gnome-do-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-do-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/ChangeLog,v 1.18 2010/10/16 10:28:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/ChangeLog,v 1.19 2010/11/29 19:50:45 graaff Exp $
+
+  29 Nov 2010; Hans de Graaff <graaff@gentoo.org>
+  gnome-do-plugins-0.8.2-r1.ebuild,
+  +files/gnome-do-plugins-0.8.2-mono28.patch:
+  Add various patches to fix compilation with Mono 2.8, fixing bug 340785.
 
   16 Oct 2010; Hans de Graaff <graaff@gentoo.org>
   -gnome-do-plugins-0.8.2.ebuild:
diff --git a/gnome-extra/gnome-do-plugins/Manifest b/gnome-extra/gnome-do-plugins/Manifest
index 86bf216a8920..61219e078c9d 100644
--- a/gnome-extra/gnome-do-plugins/Manifest
+++ b/gnome-extra/gnome-do-plugins/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 AUX gnome-do-plugins-0.8.2-mono26.patch 546 RMD160 20b7f6eb0a59e1f359d581bd81e485e43e159137 SHA1 1930930812a5013eee2ad3fbf98ffd5d5b360ac5 SHA256 91f08225399a244ad3d9f4ae23e21c8b23319d71ba3411c0704b6a5ee36ad9b6
+AUX gnome-do-plugins-0.8.2-mono28.patch 1597 RMD160 126c006473eb5be1a95c50500c66e7e759bf69a8 SHA1 3be36dac97966aff3225ca817b491b782f62c7f8 SHA256 16f727d0a816c220c66e0f34864a2eae682e974f3dd61167626be896e1107a6c
 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
-MISC ChangeLog 4208 RMD160 816f83c1a2c069b80a91eeb4f475acbd1e954755 SHA1 c7630052f38175defadc2b19071aa0abc5981cf5 SHA256 247ac0fd9d1cab62972e8bc750e0fd5107635e688df670848a90de55401f24f1
+EBUILD gnome-do-plugins-0.8.2-r1.ebuild 2149 RMD160 3d732511b9dccc7f30ae063b30e8a353c2cf2fdd SHA1 370e4920c937144f9366eaacac58028bbc876876 SHA256 92439ca341bdd5bf302ec8dba5dd36459c721011a19c688808b4446a99a81d0c
+MISC ChangeLog 4416 RMD160 f53f1fd7a25c78cce12e24eae5990a35c46b3e9e SHA1 6214f8eec4c8a942bab82747bad1da3ffa201e23 SHA256 72ff13b53fff67a7c69f0b165ca35d9405453dbd54fdbaaeb0c3d89fb24c430f
 MISC metadata.xml 368 RMD160 fefd4c049a6c58b0320511ecb4190dd6b260c3e9 SHA1 1a909ca76ceed1888a91de07d18e60e98b34203b SHA256 62a86408147679f6686568a3152b6bbb736c5ba70bc2910c505f03299ba5676e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAky5fnAACgkQZihJkut28StSwwD/U8R/77oXXIk1jQPaoKCCnJtm
-dgOpybG5deQHrURMNaEBALf5FpiY90NTpVcbrWf3xOT/gvgcInYjxxL/mHGNQP0F
-=H+pY
+iF4EAREIAAYFAkz0BBsACgkQZihJkut28StChgD9GjesrEAcg5hwaogm+k46wjPp
+ZG+g1oOEpCV21pGpvQ4A/2dDmhbLUOn24sisgylLMl9Y3qG53Qu46VXrLLp+F8Pl
+=6q16
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono28.patch b/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono28.patch
new file mode 100644
index 000000000000..1dc125b39da5
--- /dev/null
+++ b/gnome-extra/gnome-do-plugins/files/gnome-do-plugins-0.8.2-mono28.patch
@@ -0,0 +1,42 @@
+https://bugs.launchpad.net/do-plugins/+bug/634564
+
+--- Evolution/src/ContactItemSource.cs	2010-11-04 16:32:32.000000000 -0600
++++ Evolution/src/ContactItemSource.cs	2010-11-04 16:34:25.000000000 -0600
+@@ -35,7 +35,7 @@
+ 		public string Detail { get; set; }
+ 		public string Key { get; set; }
+ 		
+-		public ContactAttribute (string key, string detail)
++		public ContactAttribute (string key, string detail) : this ()
+ 		{
+ 			Key = key;
+ 			Detail = detail;
+--- File/src/Do/Do.FilesAndFolders/IndexedFolder.cs	2009-10-12 14:30:04.000000000 -0600
++++ File/src/Do/Do.FilesAndFolders/IndexedFolder.cs	2010-11-04 16:34:45.000000000 -0600
+@@ -33,7 +33,7 @@
+ 		public uint Level { get; private set; }
+ 		public FolderStatus Status { get; private set; }
+ 		
+-		public IndexedFolder (string path, uint level, FolderStatus status)
++		public IndexedFolder (string path, uint level, FolderStatus status) : this ()
+ 		{
+ 			if (path == null) throw new ArgumentNullException ("path");
+ 			
+--- Pidgin/src/PidginContactItemSource.cs	2009-10-12 14:30:04.000000000 -0600
++++ Pidgin/src/PidginContactItemSource.cs	2010-09-01 16:41:10.000000000 -0600
+@@ -241,7 +241,7 @@
+ 					}
+ 					//if the alias is still null, let's try to get the server alias
+ 					if (string.IsNullOrEmpty (alias))
+-					    alias = Pidgin.GetBuddyServerAlias (protos[proto]) ?? null;
++					    alias = (string) Pidgin.GetBuddyServerAlias (protos[proto]) ?? null;
+ 					break;
+ 				//let's pick up the custom icon as the metacontact's icon
+ 				case "setting":
+@@ -278,4 +278,4 @@
+ 			return buddy;
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
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
index d2f134f5c581..75e696c6270f 100644
--- 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
@@ -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-plugins/gnome-do-plugins-0.8.2-r1.ebuild,v 1.1 2010/04/02 14:30:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.2-r1.ebuild,v 1.2 2010/11/29 19:50:45 graaff Exp $
 
 EAPI=2
 
@@ -30,6 +30,11 @@ src_prepare() {
 	use banshee || sed -i -r -e "/(BANSHEE_INDEXER_DLL)/d" BundledLibraries/Makefile.am
 
 	epatch "${FILESDIR}/${P}-mono26.patch"
+	epatch "${FILESDIR}/${P}-mono28.patch"
+
+	# Use the new Sqlite client instead of the deprecated one
+	# https://bugs.launchpad.net/do-plugins/+bug/682832
+	sed -i -e "s/SqliteClient/Sqlite/" Firefox/Makefile.am Firefox/src/PlacesItemSource.cs || die "Unable to use newer Sqlite client."
 
 	eautomake
 }