Fix building with GLIBC 2.10+ wrt #277574.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 40 insertions, 15 deletions

diff --git a/sci-visualization/xgraph/ChangeLog b/sci-visualization/xgraph/ChangeLog
index 1ff00c09882b..117140c6d49c 100644
--- a/sci-visualization/xgraph/ChangeLog
+++ b/sci-visualization/xgraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/xgraph
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/ChangeLog,v 1.9 2009/02/01 12:50:16 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/ChangeLog,v 1.10 2009/08/08 22:02:03 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> xgraph-12.1-r2.ebuild,
+  +files/xgraph-12.1-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #277574.
 
 *xgraph-12.1-r2 (01 Feb 2009)
 
diff --git a/sci-visualization/xgraph/Manifest b/sci-visualization/xgraph/Manifest
index 7b59a76fb961..3115250a047f 100644
--- a/sci-visualization/xgraph/Manifest
+++ b/sci-visualization/xgraph/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xgraph-12.1-glibc-2.10.patch 975 RMD160 6d6c70f0f6e750e6423e2ad4ed2c5a96b2e23030 SHA1 3650cb17abe27d7367592944c13e8048070a110e SHA256 ea2442a072e35c19eda63a606b05e6f3eb0542d6a995662e85341058fbf6f824
 AUX xgraph-makefile-gentoo.patch 514 RMD160 84346d114d2f1180c2daf0c8b1160a53ee072560 SHA1 0d9053fa98de1f05a7427b8dbea332036ed5639f SHA256 9860b8650414d6dcd82b49f465abb050174190f1d08cae63fe99ccf248ed7d2e
 DIST xgraph-12.1.tar.gz 145278 RMD160 54bdc337f98ccdb4ee5e7321d833d71d70391e45 SHA1 413e0790c57b9ce584e38848e652a00e6fd4bc23 SHA256 0aa17d3fa3abfa8b6679fc26812a988332a2a0f1f48973d17429089015672b08
 DIST xgraph_12.1-10.diff.gz 48172 RMD160 df91b059ee1d8079c6f9ce8acdb1fd9722227453 SHA1 0a6a7746d1c40ae0e9d776e64752c7dc86e44373 SHA256 5f0ee8dededaafb054b3d87431acc9b1b6486b8375775aac889d993e35f4e8d5
 EBUILD xgraph-12.1-r1.ebuild 1051 RMD160 789284aa0d177ff04feeee250e3cdfb9d9c68141 SHA1 85482dd8aa0ceda86f99c40b857c4c8a23ff1b34 SHA256 18e96aa25f9f9abc43ed42c12c67b2ae1dae163a3706272ffd87b187936b6051
-EBUILD xgraph-12.1-r2.ebuild 1155 RMD160 e642e254ae25504e8457509851ee8267c42fe4b4 SHA1 6855617081e058c98dae95f9a16001c1ade42a62 SHA256 73983f2bffb3ddd84936101704c34f23754c432baf58dae783cef20fcb7c8599
-MISC ChangeLog 1956 RMD160 7686b687538d18aa400da2ad1257f3d1bc3e513f SHA1 cd9975b7392c00a25135bb74acbd295e18c33dd4 SHA256 33c55e9425492a36220aa0f8e8fbb37057591037deba1eb009e8ff5da7ea6995
+EBUILD xgraph-12.1-r2.ebuild 1200 RMD160 9af3f46848860bc9cd5b3fcd1adbc5e800563a07 SHA1 54868de4bc444bd469d677ce9a23acd2df9a270a SHA256 925dba82dedce84ff815d1742bbff838302a92d4519aba1675a6b5d786805743
+MISC ChangeLog 2120 RMD160 143f3796e7de36b9863a77e5cebfbd930fe0679d SHA1 1185620a34bad64710429c71939a389719638caa SHA256 bb8cc20fd0cea81733f6ec3e6f0184e7bb96e4d1036382f89bfc5a512db4672c
 MISC metadata.xml 672 RMD160 814624a42995b899aa96afdc6b7fb8eb83bea5d7 SHA1 ee57db5839bede4a26ed0e137671d83f6834ea78 SHA256 80ef43932386e837edb5e5fbc41a0fe5293f7f4ca100802d92d3f2836f693e93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmFmyIACgkQ1ycZbhPLE2BVegCfeVDXgkPk6hrkTEWrh4j/j8eq
-saAAnR1osd9UHzoy28+uYifMBuQrfyxA
-=+Fqs
------END PGP SIGNATURE-----
diff --git a/sci-visualization/xgraph/files/xgraph-12.1-glibc-2.10.patch b/sci-visualization/xgraph/files/xgraph-12.1-glibc-2.10.patch
new file mode 100644
index 000000000000..e2514083c1d4
--- /dev/null
+++ b/sci-visualization/xgraph/files/xgraph-12.1-glibc-2.10.patch
@@ -0,0 +1,29 @@
+diff -ur xgraph-12.1.orig/dialog.c xgraph-12.1/dialog.c
+--- xgraph-12.1.orig/dialog.c	2009-08-09 01:02:01.000000000 +0300
++++ xgraph-12.1/dialog.c	2009-08-09 01:02:40.000000000 +0300
+@@ -775,7 +775,7 @@
+     memset(new_info->lines, 0, sizeof(Window) * E_LINES);
+ 
+     lineptr = text;
+-    while (getline(&lineptr, line)) {
++    while (get_line(&lineptr, line)) {
+ 	if (new_info->num_lines >= new_info->alloc_lines) {
+ 	    int old_alloc_lines_size = new_info->alloc_lines * sizeof(Window);
+ 	    new_info->alloc_lines *= 2;
+@@ -886,7 +886,7 @@
+ 
+ 
+ int 
+-getline(tptr, lptr)
++get_line(tptr, lptr)
+ char  **tptr;
+ char   *lptr;
+ 
+diff -ur xgraph-12.1.orig/dialog.h xgraph-12.1/dialog.h
+--- xgraph-12.1.orig/dialog.h	2009-08-09 01:02:01.000000000 +0300
++++ xgraph-12.1/dialog.h	2009-08-09 01:02:43.000000000 +0300
+@@ -1,3 +1,3 @@
+ extern void msg_box(char *, char *);
+-extern int getline(char **, char *);
++extern int get_line(char **, char *);
+ extern void do_error(char *);
diff --git a/sci-visualization/xgraph/xgraph-12.1-r2.ebuild b/sci-visualization/xgraph/xgraph-12.1-r2.ebuild
index b68b1e7494d1..0ae6d6e13f5f 100644
--- a/sci-visualization/xgraph/xgraph-12.1-r2.ebuild
+++ b/sci-visualization/xgraph/xgraph-12.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/xgraph-12.1-r2.ebuild,v 1.1 2009/02/01 12:50:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xgraph/xgraph-12.1-r2.ebuild,v 1.2 2009/08/08 22:02:03 ssuominen Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -21,6 +21,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_PR}.diff
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 	eautoreconf
 }