Fix building with GLIBC 2.10+ wrt #274218, thanks to Alexander Meinke for patch.

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

4 files changed, 62 insertions, 15 deletions

diff --git a/x11-misc/gbdfed/ChangeLog b/x11-misc/gbdfed/ChangeLog
index 92006a9d70a5..25727d17de8e 100644
--- a/x11-misc/gbdfed/ChangeLog
+++ b/x11-misc/gbdfed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/gbdfed
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gbdfed/ChangeLog,v 1.2 2008/12/16 09:11:32 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gbdfed/ChangeLog,v 1.3 2009/08/08 12:55:52 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> gbdfed-1.4.ebuild,
+  +files/gbdfed-1.4-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #274218, thanks to Alexander Meinke for
+  patch.
 
   16 Dec 2008; Peter Volkov <pva@gentoo.org> gbdfed-1.4.ebuild:
   Some GTK+ types/functions used in gbdfed were deprecated thus drop all
diff --git a/x11-misc/gbdfed/Manifest b/x11-misc/gbdfed/Manifest
index 97960e31209b..9a914f52ec5e 100644
--- a/x11-misc/gbdfed/Manifest
+++ b/x11-misc/gbdfed/Manifest
@@ -1,4 +1,5 @@
+AUX gbdfed-1.4-glibc-2.10.patch 1033 RMD160 65e8bdf3ab0800285ccaeaa5f1bde9f790066ab7 SHA1 89cef53415b79d86377857331d1ca92bc3c3d367 SHA256 bafda7299ca8b71fb595c42214cf3e49e7f265d3921611095b85f8048be0b805
 DIST gbdfed-1.4.tbz2 228556 RMD160 9faa2ee2fbf34c6eaea1662231266233052bff56 SHA1 0e6fadefbb470e89d7045f6d640606100c96e5c2 SHA256 53e088f3f237bc1ad5f7bf84fe09a596a03588512c6471012c9281987f90bb91
-EBUILD gbdfed-1.4.ebuild 748 RMD160 691b08757afecedfeb5eb4084817d924bcb97d7b SHA1 e81bdf7a3406b74eede1978a894dfa8a88216e15 SHA256 a1f8168bfccaef3f2470006e520a9aeca798a431c5cb476e31992c7ecd943849
-MISC ChangeLog 598 RMD160 8b24ba8a7878d85f5856fc29904273507b22e889 SHA1 eda84ab1869b2a0cea3fd4253d5b67569c2d83c2 SHA256 e5eafd13391ac9b812322454d1976c348780a4ab24b9fb539250d970589b7bf5
+EBUILD gbdfed-1.4.ebuild 801 RMD160 eb28e3e2fc3a6c8d8a4899510f540e438847ec5f SHA1 840e52c5c23d83e5ff1f51257b2071e532af9d50 SHA256 aa19756d3fc7bc8dcee5d53d56e4870b1627ea9b41582de054cb586725e024c2
+MISC ChangeLog 801 RMD160 0746d9fae948720dc1af04fb1eb7fd8707d58cf5 SHA1 04effcbe78c540404f77dceb96195aa21095c069 SHA256 d14528b5db7b2ffdbea749ddfe600d9236ce46af1f9d6d510b73a7213a735622
 MISC metadata.xml 159 RMD160 e9d6dae6266cd59331aaa78481fd5a67fc2ed725 SHA1 152e7ea08489d788f3f1c4c59be552a5f94b2d02 SHA256 952d89bc3335f3d2f69460945016b173913db58759fe7d906f3927909120c890
diff --git a/x11-misc/gbdfed/files/gbdfed-1.4-glibc-2.10.patch b/x11-misc/gbdfed/files/gbdfed-1.4-glibc-2.10.patch
new file mode 100644
index 000000000000..5a4f690da70b
--- /dev/null
+++ b/x11-misc/gbdfed/files/gbdfed-1.4-glibc-2.10.patch
@@ -0,0 +1,39 @@
+--- bdfgname.c
++++ bdfgname.c
+@@ -39,7 +39,7 @@
+ #define MAX_GLYPH_NAME_LEN 127
+ 
+ static int
+-getline(FILE *in, char *buf, int limit)
++bdf_getline(FILE *in, char *buf, int limit)
+ {
+     int c, i;
+ 
+@@ -78,11 +78,11 @@
+ 
+     while (!feof(in)) {
+         pos = ftell(in);
+-        (void) getline(in, buf, 256);
++        (void) bdf_getline(in, buf, 256);
+         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+             buf[0] = 0;
+             pos = ftell(in);
+-            (void) getline(in, buf, 256);
++            (void) bdf_getline(in, buf, 256);
+         }
+ 
+         if (buf[0] == 0)
+@@ -139,11 +139,11 @@
+ 
+     while (!feof(in)) {
+         pos = ftell(in);
+-        (void) getline(in, buf, 256);
++        (void) bdf_getline(in, buf, 256);
+         while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+             buf[0] = 0;
+             pos = ftell(in);
+-            (void) getline(in, buf, 256);
++            (void) bdf_getline(in, buf, 256);
+         }
+ 
+         if (adobe_names_used == adobe_names_size) {
diff --git a/x11-misc/gbdfed/gbdfed-1.4.ebuild b/x11-misc/gbdfed/gbdfed-1.4.ebuild
index 385838f24376..91f3bee03ee1 100644
--- a/x11-misc/gbdfed/gbdfed-1.4.ebuild
+++ b/x11-misc/gbdfed/gbdfed-1.4.ebuild
@@ -1,6 +1,9 @@
-# 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/x11-misc/gbdfed/gbdfed-1.4.ebuild,v 1.2 2008/12/16 09:11:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gbdfed/gbdfed-1.4.ebuild,v 1.3 2009/08/08 12:55:52 ssuominen Exp $
+
+EAPI=2
+inherit eutils
 
 DESCRIPTION="gbdfed Bitmap Font Editor"
 HOMEPAGE="http://www.math.nmsu.edu/~mleisher/Software/gbdfed/"
@@ -11,19 +14,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=x11-libs/gtk+-2.6
-		>=media-libs/freetype-2.0
-		x11-libs/libX11
-		x11-libs/pango"
-RDEPEND="${DEPEND}"
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=media-libs/freetype-2
+	x11-libs/libX11
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 	sed "s:-D.*_DISABLE_DEPRECATED::" -i Makefile.in #248562
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failure"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README NEWS
 }