Patch to build against glibc-2.10 thanks to Ryan Hill <dirtyepic@gentoo.org> bug #272505. Fix to doc path bug #241972

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 70 insertions, 7 deletions

diff --git a/dev-libs/mpatrol/ChangeLog b/dev-libs/mpatrol/ChangeLog
index dae520b91585..026fbac497d7 100644
--- a/dev-libs/mpatrol/ChangeLog
+++ b/dev-libs/mpatrol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/mpatrol
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.19 2008/11/21 22:44:12 keri Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/ChangeLog,v 1.20 2009/07/07 18:07:25 vostorga Exp $
+
+  07 Jul 2009; <vostorga@gentoo.org>
+  +files/mpatrol-1.4.8-gcc44-glibc210.patch, mpatrol-1.4.8-r2.ebuild:
+  Patch to compile with glibc-2.10 and gcc-4.4 thanks to Ryan Hill
+  <dirtyepic@gentoo.org> (bug #272505). Fix to documentation path (bug
+  #241972)
 
   21 Nov 2008; <keri@gentoo.org> mpatrol-1.4.8.ebuild,
   mpatrol-1.4.8-r1.ebuild, mpatrol-1.4.8-r2.ebuild:
diff --git a/dev-libs/mpatrol/files/mpatrol-1.4.8-gcc44-glibc210.patch b/dev-libs/mpatrol/files/mpatrol-1.4.8-gcc44-glibc210.patch
new file mode 100644
index 000000000000..8fe9315d8370
--- /dev/null
+++ b/dev-libs/mpatrol/files/mpatrol-1.4.8-gcc44-glibc210.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/272505
+
+--- mpatrol-orig/src/mptrace.c
++++ mpatrol/src/mptrace.c
+@@ -268,27 +268,27 @@
+ static XtResource resources[] =
+ {
+     {"alloc", XmCColor, XmRPixel, sizeof(Pixel),
+-     (Cardinal) &alcol, XmRString, (XtPointer) "black"},
++     (long) &alcol, XmRString, (XtPointer) "black"},
+     {"base", "Base", XmRInt, sizeof(void *),
+-     (Cardinal) &addrbase, XmRImmediate, (XtPointer) NULL},
++     (long) &addrbase, XmRImmediate, (XtPointer) NULL},
+     {"delay", "Delay", XmRInt, sizeof(unsigned long),
+-     (Cardinal) &delay, XmRImmediate, (XtPointer) 0},
++     (long) &delay, XmRImmediate, (XtPointer) 0},
+     {"free", XmCColor, XmRPixel, sizeof(Pixel),
+-     (Cardinal) &frcol, XmRString, (XtPointer) "white"},
++     (long) &frcol, XmRString, (XtPointer) "white"},
+     {"height", XmCHeight, XmRShort, sizeof(Dimension),
+-     (Cardinal) &height, XmRImmediate, (XtPointer) 512},
++     (long) &height, XmRImmediate, (XtPointer) 512},
+     {"internal", XmCColor, XmRPixel, sizeof(Pixel),
+-     (Cardinal) &incol, XmRString, (XtPointer) "red"},
++     (long) &incol, XmRString, (XtPointer) "red"},
+     {"space", "Space", XmRInt, sizeof(unsigned long),
+-     (Cardinal) &addrspace, XmRImmediate, (XtPointer) 4},
++     (long) &addrspace, XmRImmediate, (XtPointer) 4},
+     {"unalloc", XmCColor, XmRPixel, sizeof(Pixel),
+-     (Cardinal) &uncol, XmRString, (XtPointer) "blue"},
++     (long) &uncol, XmRString, (XtPointer) "blue"},
+     {"view-height", XmCHeight, XmRShort, sizeof(Dimension),
+-     (Cardinal) &vheight, XmRImmediate, (XtPointer) 256},
++     (long) &vheight, XmRImmediate, (XtPointer) 256},
+     {"view-width", XmCWidth, XmRShort, sizeof(Dimension),
+-     (Cardinal) &vwidth, XmRImmediate, (XtPointer) 256},
++     (long) &vwidth, XmRImmediate, (XtPointer) 256},
+     {"width", XmCWidth, XmRShort, sizeof(Dimension),
+-     (Cardinal) &width, XmRImmediate, (XtPointer) 512}
++     (long) &width, XmRImmediate, (XtPointer) 512}
+ };
+ 
+ 
+--- mpatrol-orig/tools/dmalloc.c
++++ mpatrol/tools/dmalloc.c
+@@ -395,7 +395,7 @@
+ char *
+ bytestring(char *b, size_t s, char *p, size_t l)
+ {
+-    char *t;
++    const char *t;
+     size_t i, n;
+ 
+     for (i = n = 0; (i < s) && (i < l); i++)
diff --git a/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild b/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
index 2141fb30dfc9..62dc397a59d2 100644
--- a/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
+++ b/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild,v 1.4 2008/11/21 22:44:12 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpatrol/mpatrol-1.4.8-r2.ebuild,v 1.5 2009/07/07 18:07:25 vostorga Exp $
 
 inherit eutils flag-o-matic
 
@@ -24,11 +24,14 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch "${FILESDIR}"/${PN}-1.4.8-soname.patch || die "patching failed"
+	epatch "${FILESDIR}/${P}-soname.patch"
+
+	#bug 272505
+	epatch "${FILESDIR}/${P}-gcc44-glibc210.patch"
 
 	cd ${S}/src
 	# [Bug 176592] textrel fix for dev-libs/mpatrol
-	epatch "${FILESDIR}"/${PN}-textrel-fix.patch || die "patching failed"
+	epatch "${FILESDIR}/${PN}-textrel-fix.patch"
 
 	sed -i \
 		-e 's:#define MP_SYMBOL_LIBS , MP_LIBNAME(bfd), MP_LIBNAME(iberty):#define MP_SYMBOL_LIBS , MP_LIBNAME(bfd):' config.h \
@@ -96,7 +99,7 @@ src_install () {
 	docinto images
 	dodoc images/*.{eps,pdf}
 
-	insinto /usr/share/doc/${F}/html/images
+	insinto /usr/share/doc/${PF}/html/images
 	doins images/*.jpg
 }