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

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 73 insertions, 9 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/Manifest b/dev-libs/mpatrol/Manifest
index d24c3e446d3f..a88bb40b983e 100644
--- a/dev-libs/mpatrol/Manifest
+++ b/dev-libs/mpatrol/Manifest
@@ -1,8 +1,9 @@
+AUX mpatrol-1.4.8-gcc44-glibc210.patch 2213 RMD160 394294d0674603dff0136348aa5edb2f135ff781 SHA1 f9d8b7d8ba4aec4c0cc6ce706f76845442e87852 SHA256 ea72642d04a4b07f4c3a3b5605ca3258f1ded8fd4ddcf72e61f7f6dc12bf7c6c
 AUX mpatrol-1.4.8-soname.patch 1097 RMD160 d0d767d24c51b8804691b416ac47d59bee8d4c2f SHA1 8878f286ac66f6fd3e757ba9fe627bd34a6c3f3a SHA256 f7e63160f3df250151bb9d8de13e252394a02beb89b9c905a0034907061498b2
 AUX mpatrol-textrel-fix.patch 529 RMD160 e0ef6ab28b24c2261a88e682d1f59ed0c681a328 SHA1 e6b65eb79fc334cb1f82214ed3c0000890e1e876 SHA256 23566db6fe6e035870db35e7311f42c2a367a50ec1a24b044a465fa7fe81f30b
 DIST mpatrol_1.4.8.tar.gz 4413896 RMD160 5caa6a31f1a53578f28ff597e62c010d68320bc0 SHA1 26b3ef60a718f80486f10f74468cb33b5fcf75dd SHA256 2a58512cb355bf46b08e85683a2ad872bdd4cad5f7a40c87117c7f5badd9f232
 EBUILD mpatrol-1.4.8-r1.ebuild 2491 RMD160 be3c28d0a72b67b27e5a19a819826f748c6f8956 SHA1 1e487cc5a2b5c0a8cafafd7e4925cfddb2d64908 SHA256 e5a47aa2ea786866269df89681a41f5baddc2dec989f1a6295e9b80ac9b7b536
-EBUILD mpatrol-1.4.8-r2.ebuild 2740 RMD160 10604ecc9cb2f4743a29cb02de366852cc03fdd7 SHA1 24a18a9b783c7ecc3ee863feafaa9b0b35fbb50f SHA256 6480a134b62fb842ca702dfb2fc99013eb1b445e51e091006f34fd0a0bfd3791
+EBUILD mpatrol-1.4.8-r2.ebuild 2750 RMD160 b5184cdde9ae87654d181a5686da9ab67c32bc95 SHA1 c81a57d4e866aa310cedd59d872239964716ccfb SHA256 831251e72ce5ffdc12f29c5895498cfd8f641f7a29fe88e0b09ed660bdc53010
 EBUILD mpatrol-1.4.8.ebuild 2252 RMD160 c13853d4297b5afa478d9f36f98bd78894548e7f SHA1 c651eb855b4cde40039b8db16cae2c99ad48b423 SHA256 791193ae77cb97df6df1890d6e2f58ba6a5d75d5eed66051620714543f95eeb0
-MISC ChangeLog 1872 RMD160 7a441709f6494ee447e8bf10336ea301f78e69b4 SHA1 458606663e6ca4ec0895cb1f1df7e93b20ac45b8 SHA256 04b83b1545f46d73bfbd847abcdc847ad84031b2c0354db65ac35b4b16450403
+MISC ChangeLog 2133 RMD160 00d7ef6a5aefb722f35029046de2b96cae8dd7d4 SHA1 6c7f33b0b1cb1274a09afbe1f686d13b04f43164 SHA256 b76bcb5aa8b11a5a3e067a47cd522370405caecd70037505ea29a0594496714a
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
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
 }