diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-08 12:55:53 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-08 12:55:53 +0000 |
commit | 086ca6ee74c982ce2d4763c469e04e4534d196a6 (patch) | |
tree | 7a246658741222b5d9a7569f50f4c1d289bf5539 /x11-misc/gbdfed | |
parent | Version bump. Change SRC_URI to the only mirror that actually works. (diff) | |
download | gentoo-2-086ca6ee74c982ce2d4763c469e04e4534d196a6.tar.gz gentoo-2-086ca6ee74c982ce2d4763c469e04e4534d196a6.tar.bz2 gentoo-2-086ca6ee74c982ce2d4763c469e04e4534d196a6.zip |
Fix building with GLIBC 2.10+ wrt #274218, thanks to Alexander Meinke for patch.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/gbdfed')
-rw-r--r-- | x11-misc/gbdfed/ChangeLog | 9 | ||||
-rw-r--r-- | x11-misc/gbdfed/files/gbdfed-1.4-glibc-2.10.patch | 39 | ||||
-rw-r--r-- | x11-misc/gbdfed/gbdfed-1.4.ebuild | 24 |
3 files changed, 59 insertions, 13 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/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 } |