Backport patch to use Mono.Data.Sqlite, thanks Loren Bandiera <lorenb@lbtechservices.com> in bug #343023

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

3 files changed, 138 insertions, 1 deletions

diff --git a/net-misc/gnome-rdp/ChangeLog b/net-misc/gnome-rdp/ChangeLog
index 5ce57eb080d5..8fdcc8528e61 100644
--- a/net-misc/gnome-rdp/ChangeLog
+++ b/net-misc/gnome-rdp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/gnome-rdp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-rdp/ChangeLog,v 1.2 2010/11/22 13:34:58 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-rdp/ChangeLog,v 1.3 2010/11/22 13:41:38 voyageur Exp $
+
+*gnome-rdp-0.2.3-r1 (22 Nov 2010)
+
+  22 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +gnome-rdp-0.2.3-r1.ebuild, +files/gnome-rdp-0.2.3-mono-2.8.patch:
+  Backport patch to use Mono.Data.Sqlite, thanks Loren Bandiera
+  <lorenb@lbtechservices.com> in bug #343023
 
   03 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org>
   gnome-rdp-0.2.3.ebuild:
diff --git a/net-misc/gnome-rdp/files/gnome-rdp-0.2.3-mono-2.8.patch b/net-misc/gnome-rdp/files/gnome-rdp-0.2.3-mono-2.8.patch
new file mode 100644
index 000000000000..336cd71e9e80
--- /dev/null
+++ b/net-misc/gnome-rdp/files/gnome-rdp-0.2.3-mono-2.8.patch
@@ -0,0 +1,78 @@
+diff -u ../gnome-rdp-0.2.3//gnome-rdp.build gnome-rdp-0.2.4//gnome-rdp.build
+--- ../gnome-rdp-0.2.3//gnome-rdp.build	2008-06-28 02:48:17.000000000 -0400
++++ gnome-rdp-0.2.4//gnome-rdp.build	2010-11-06 13:52:29.260000069 -0400
+@@ -65,6 +65,7 @@
+ 				<include name="src/*.cs" />
+ 			</sources>
+ 			<pkg-references>
++				<package name="glib-sharp-2.0" />
+ 				<package name="gtk-sharp-2.0" />
+ 				<package name="vte-sharp-0.16" />
+ 				<package name="glade-sharp-2.0" />
+@@ -75,7 +76,7 @@
+ 				<include name="System.dll" />
+ 				<include name="System.Data.dll" />
+ 				<include name="Mono.Posix.dll" />
+-				<include name="Mono.Data.SqliteClient.dll" />
++				<include name="Mono.Data.Sqlite.dll" />
+ 			</references>
+ 		</csc>
+ 	</target>
+diff -u ../gnome-rdp-0.2.3/src/Configuration.cs gnome-rdp-0.2.4/src/Configuration.cs
+--- ../gnome-rdp-0.2.3/src/Configuration.cs	2008-06-28 02:48:17.000000000 -0400
++++ gnome-rdp-0.2.4/src/Configuration.cs	2010-11-06 13:35:59.468000070 -0400
+@@ -24,7 +24,7 @@
+ using System.Collections.Generic;
+ using System.IO;
+ 
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using Mono.Unix;
+ 
+ namespace GnomeRDP
+Only in gnome-rdp-0.2.4/src: Defines.cs
+diff -u ../gnome-rdp-0.2.3/src/Main.cs gnome-rdp-0.2.4/src/Main.cs
+--- ../gnome-rdp-0.2.3/src/Main.cs	2008-06-28 02:48:17.000000000 -0400
++++ gnome-rdp-0.2.4/src/Main.cs	2010-11-06 13:43:01.960000069 -0400
+@@ -22,7 +22,7 @@
+ using Glade;
+ using System.Diagnostics;
+ using System.Data;
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using System.Threading;
+ using Mono.Unix;
+ using System.Collections;
+@@ -71,6 +71,7 @@
+  
+ 			if (this.ParseArguments(args))
+ 			{	
++				if (!GLib.Thread.Supported) GLib.Thread.Init ();
+ 				Gdk.Threads.Init();
+ 				Application.Init ();
+ 	
+diff -u ../gnome-rdp-0.2.3/src/Options.cs gnome-rdp-0.2.4/src/Options.cs
+--- ../gnome-rdp-0.2.3/src/Options.cs	2008-06-28 02:48:17.000000000 -0400
++++ gnome-rdp-0.2.4/src/Options.cs	2010-11-06 13:36:03.985000070 -0400
+@@ -19,7 +19,7 @@
+ 
+ using System;
+ using System.Data;
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using Mono.Unix;
+ using Gtk;
+ 
+diff -u ../gnome-rdp-0.2.3/src/Sqlite.cs gnome-rdp-0.2.4/src/Sqlite.cs
+--- ../gnome-rdp-0.2.3/src/Sqlite.cs	2008-06-28 02:48:17.000000000 -0400
++++ gnome-rdp-0.2.4/src/Sqlite.cs	2010-11-06 13:35:53.697000068 -0400
+@@ -21,7 +21,7 @@
+ using Glade;
+ using System.Diagnostics;
+ using System.Data;
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using System.Threading;
+ using Mono.Unix;
+ 
+
diff --git a/net-misc/gnome-rdp/gnome-rdp-0.2.3-r1.ebuild b/net-misc/gnome-rdp/gnome-rdp-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..5980929c000c
--- /dev/null
+++ b/net-misc/gnome-rdp/gnome-rdp-0.2.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-rdp/gnome-rdp-0.2.3-r1.ebuild,v 1.1 2010/11/22 13:41:38 voyageur Exp $
+
+EAPI=2
+
+inherit eutils gnome2 mono
+
+DESCRIPTION="Remote Desktop Client for the GNOME desktop"
+HOMEPAGE="http://sourceforge.net/projects/gnome-rdp"
+SRC_URI="mirror://sourceforge/gnome-rdp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rdesktop +vnc"
+
+RDEPEND=">=dev-db/sqlite-2.8
+		>=dev-libs/glib-2.0
+		>=dev-dotnet/glade-sharp-2.10
+		>=dev-dotnet/gtk-sharp-2.0
+		>=dev-dotnet/gnome-keyring-sharp-1.0.0
+		>=dev-dotnet/gnome-sharp-2.16
+		>=dev-dotnet/vte-sharp-2.16
+		>=x11-libs/gtk+-2.4
+		>=net-misc/openssh-3
+		>=x11-terms/gnome-terminal-2
+		rdesktop? ( >=net-misc/rdesktop-1.3 )
+		vnc? ( >=net-misc/tightvnc-1.2 )"
+
+DEPEND="${RDEPEND}
+		dev-dotnet/nant
+		>=dev-util/intltool-0.21"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	sed -i -e "s/gnome-keyring-sharp/gnome-keyring-sharp-1.0/" gnome-rdp.build || die "sed failed"
+	epatch "${FILESDIR}"/${P}-mono-2.8.patch
+}
+
+src_configure() {
+	default
+}
+
+src_compile() {
+	nant -D:DESTDIR="${D}" || die
+}
+
+src_install() {
+	nant -D:DESTDIR="${D}" install|| die
+}