dev-util/mono-debugger: added patch that allows building against kernel >=2.6.19

Package-Manager: portage-2.1.2.7

4 files changed, 93 insertions, 20 deletions

diff --git a/dev-util/mono-debugger/ChangeLog b/dev-util/mono-debugger/ChangeLog
index 519260464c2d..411d2b03b4c4 100644
--- a/dev-util/mono-debugger/ChangeLog
+++ b/dev-util/mono-debugger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/mono-debugger
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.11 2007/06/23 02:17:35 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/ChangeLog,v 1.12 2007/06/27 09:28:55 jurek Exp $
+
+  27 Jun 2007; Jurek Bartuszek <jurek@gentoo.org>
+  +files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch,
+  mono-debugger-0.50.ebuild:
+  Added patch that allows building against kernel >=2.6.19. Credit goes to
+  Bernie Hackett <bernie.hackett@gmail.com> for providing the patch.
 
 *mono-debugger-0.50 (23 Jun 2007)
 
diff --git a/dev-util/mono-debugger/Manifest b/dev-util/mono-debugger/Manifest
index 1d90b7c7713d..c381369873ce 100644
--- a/dev-util/mono-debugger/Manifest
+++ b/dev-util/mono-debugger/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX mono-debugger-kernel-2.6.19-fix-i386-asm.patch 1551 RMD160 408196050a4efd54040ff334562819d6c8c6dd39 SHA1 e98ea33c19345c48fce5e8094785f12369e00da7 SHA256 690af9ee7bd6896ccce87fb85ac140b87813c3906eee9adfa51dc354ab7fc639
+MD5 afda5cbae6fc626db1dd419ba60bdaaf files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch 1551
+RMD160 408196050a4efd54040ff334562819d6c8c6dd39 files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch 1551
+SHA256 690af9ee7bd6896ccce87fb85ac140b87813c3906eee9adfa51dc354ab7fc639 files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch 1551
 DIST mono-debugger-0.50.tar.bz2 1587040 RMD160 da619e9c76f839feae0c440baf661d495a6b38c1 SHA1 71a533ba09fe17e171689a1a57f7f53dc547a146 SHA256 f3b270fc0bd424808a754fb6e604b6c691e0a975e15c8a7fbf37126e1d1d52be
-EBUILD mono-debugger-0.50.ebuild 649 RMD160 83dded11ad02fcb629d6198fde9e32169c8d6caf SHA1 b1dbd23e09543762d001f86167bc068ef675daa3 SHA256 c8c3c5059b2b94298a372b594138d7db62dfbfe369955f07a5671292530427a4
-MD5 f0b68c106f87f4b1aea7384ad784e786 mono-debugger-0.50.ebuild 649
-RMD160 83dded11ad02fcb629d6198fde9e32169c8d6caf mono-debugger-0.50.ebuild 649
-SHA256 c8c3c5059b2b94298a372b594138d7db62dfbfe369955f07a5671292530427a4 mono-debugger-0.50.ebuild 649
-MISC ChangeLog 386 RMD160 9bbdb9cb51808724639ec60d053c62080b353cb3 SHA1 87fe14560b9a33a70db1ba0fe494105ac80836df SHA256 9f7e0712ef6ff85f82c3dd2a179a7bd90b6c7a48df9f32842d6ee33878c8059d
-MD5 9f7a4b67d479c93bf60db53759b6c3e8 ChangeLog 386
-RMD160 9bbdb9cb51808724639ec60d053c62080b353cb3 ChangeLog 386
-SHA256 9f7e0712ef6ff85f82c3dd2a179a7bd90b6c7a48df9f32842d6ee33878c8059d ChangeLog 386
+EBUILD mono-debugger-0.50.ebuild 756 RMD160 37f051658bbe6c4f1887bd62a20aad53caa798c7 SHA1 f95cdc10c2b954ca8a2561bd9c5a1d838be9444d SHA256 2eb50c29f22eda6978191ab2eea86c6e932f5e9072a0fdfc36f7aa8a024f1633
+MD5 2620bb03a7c40a5ed01ff4a90bfe2920 mono-debugger-0.50.ebuild 756
+RMD160 37f051658bbe6c4f1887bd62a20aad53caa798c7 mono-debugger-0.50.ebuild 756
+SHA256 2eb50c29f22eda6978191ab2eea86c6e932f5e9072a0fdfc36f7aa8a024f1633 mono-debugger-0.50.ebuild 756
+MISC ChangeLog 667 RMD160 10c305609b6362af9973d366f9223756d862c2d8 SHA1 4278addf522cd23df47532fe4ea0d203f53ab3ba SHA256 03f057659c7b23248393aba615914585993df187eb724510c153cd7dcdee5aeb
+MD5 60bdb3311a536cee36b88c58a906bf96 ChangeLog 667
+RMD160 10c305609b6362af9973d366f9223756d862c2d8 ChangeLog 667
+SHA256 03f057659c7b23248393aba615914585993df187eb724510c153cd7dcdee5aeb ChangeLog 667
 MISC metadata.xml 180 RMD160 7ac60e084524daa1254f74ee4d205423cad05a07 SHA1 f308ed6ff4b2f100118f05813a82c55360c0cae9 SHA256 e0477caaddda9b7873977ba93988cae04203843a95a8b7348697554220f050ea
 MD5 5eb5a7c0cfa5c6d073d3e0a97ec9f0fb metadata.xml 180
 RMD160 7ac60e084524daa1254f74ee4d205423cad05a07 metadata.xml 180
@@ -17,10 +18,3 @@ SHA256 e0477caaddda9b7873977ba93988cae04203843a95a8b7348697554220f050ea metadata
 MD5 2e2790a69b4d8b86ddf8abe03b4357ae files/digest-mono-debugger-0.50 262
 RMD160 c95bf978cf75e86de446eda29bba7a713bb7293b files/digest-mono-debugger-0.50 262
 SHA256 2375fe3e4fa26f2bdb325c908c2ff50a7b51a747163beb4b7ac57b7ed2284fb3 files/digest-mono-debugger-0.50 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGf3uz/ejvha5XGaMRAiE5AKDsgJy5qCqKwMrDpb4+FI2liyYDQwCcDV88
-t8MtvGSVEqQkEjeulZRHFZ8=
-=bNNR
------END PGP SIGNATURE-----
diff --git a/dev-util/mono-debugger/files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch b/dev-util/mono-debugger/files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch
new file mode 100644
index 000000000000..744dec04a86d
--- /dev/null
+++ b/dev-util/mono-debugger/files/mono-debugger-kernel-2.6.19-fix-i386-asm.patch
@@ -0,0 +1,66 @@
+--- backend/server/i386-arch.h.orig	2007-06-26 09:14:11.000000000 -0400
++++ backend/server/i386-arch.h	2007-06-26 23:07:08.000000000 -0400
+@@ -2,12 +2,63 @@
+ #define __MONO_DEBUGGER_I386_ARCH_H__
+ 
+ #include <glib.h>
++#include <linux/version.h>
+ 
+ G_BEGIN_DECLS
+ 
+ #if defined(__i386__)
+ 
++/* 
++ * added because gentoo linux headers
++ * no longer include asm-i386/user.h
++ */
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
++
++    struct user_i387_struct {
++        long    cwd;
++        long    swd;
++        long    twd;
++        long    fip;
++        long    fcs;
++        long    foo;
++        long    fos;
++        long    st_space[20];
++    };
++
++    struct user_regs_struct {
++        long ebx, ecx, edx, esi, edi, ebp, eax;
++        unsigned short ds, __ds, es, __es;
++        unsigned short fs, __fs, gs, __gs;
++        long orig_eax, eip;
++        unsigned short cs, __cs;
++        long eflags, esp;
++        unsigned short ss, __ss;
++    };
++
++    struct user{
++	struct user_regs_struct regs;
++	int u_fpvalid;
++	struct user_i387_struct i387;
++	unsigned long int u_tsize;
++	unsigned long int u_dsize;
++	unsigned long int u_ssize;
++	unsigned long start_code;
++	unsigned long start_stack;
++	long int signal;
++	int reserved;
++	struct user_pt_regs * u_ar0;
++	struct user_i387_struct* u_fpstate;
++	unsigned long magic;
++	char u_comm[32];
++	int u_debugreg[8];
++    };
++
++#else
+ #include <asm/user.h>
++#endif
++
++/* end added structs */
+ 
+ #define INFERIOR_REGS_TYPE	struct user_regs_struct
+ #define INFERIOR_FPREGS_TYPE	struct user_i387_struct
diff --git a/dev-util/mono-debugger/mono-debugger-0.50.ebuild b/dev-util/mono-debugger/mono-debugger-0.50.ebuild
index b3867f79f4a5..f6992a79dd90 100644
--- a/dev-util/mono-debugger/mono-debugger-0.50.ebuild
+++ b/dev-util/mono-debugger/mono-debugger-0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/mono-debugger-0.50.ebuild,v 1.1 2007/06/23 02:17:35 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-debugger/mono-debugger-0.50.ebuild,v 1.2 2007/06/27 09:28:55 jurek Exp $
 
 inherit eutils mono
 
@@ -19,6 +19,13 @@ DEPEND=">=dev-lang/mono-1.2.4
 
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-kernel-2.6.19-fix-i386-asm.patch || die
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"