diff options
author | Ryan Hill <dirtyepic@gentoo.org> | 2009-07-26 20:52:01 +0000 |
---|---|---|
committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-07-26 20:52:01 +0000 |
commit | 8cc00d1ec09d06fb0de33b17582eadb85e9d44e1 (patch) | |
tree | 33e5b505778bbf74ec32a42e43954f553b1c072e /x11-wm/selectwm | |
parent | Fixed homepage, closes bug 279138. (diff) | |
download | gentoo-2-8cc00d1ec09d06fb0de33b17582eadb85e9d44e1.tar.gz gentoo-2-8cc00d1ec09d06fb0de33b17582eadb85e9d44e1.tar.bz2 gentoo-2-8cc00d1ec09d06fb0de33b17582eadb85e9d44e1.zip |
Fix building with glibc-2.10 (bug #273994).
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/selectwm')
-rw-r--r-- | x11-wm/selectwm/ChangeLog | 8 | ||||
-rw-r--r-- | x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch | 21 | ||||
-rw-r--r-- | x11-wm/selectwm/selectwm-0.4.1.ebuild | 5 |
3 files changed, 30 insertions, 4 deletions
diff --git a/x11-wm/selectwm/ChangeLog b/x11-wm/selectwm/ChangeLog index 97bcfaf52e2d..5260d93436f5 100644 --- a/x11-wm/selectwm/ChangeLog +++ b/x11-wm/selectwm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/selectwm -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/ChangeLog,v 1.21 2008/07/19 09:54:33 aballier Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/ChangeLog,v 1.22 2009/07/26 20:52:01 dirtyepic Exp $ + + 26 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> selectwm-0.4.1.ebuild, + +files/selectwm-0.4.1-glibc-2.10.patch: + Fix building with glibc-2.10 (bug #273994). 19 Jul 2008; Alexis Ballier <aballier@gentoo.org> selectwm-0.4.1.ebuild: keyword ~x86-fbsd thanks to Davide Italiano <dav_it@gentoo.org>, bug diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch b/x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch new file mode 100644 index 000000000000..4353d5e36662 --- /dev/null +++ b/x11-wm/selectwm/files/selectwm-0.4.1-glibc-2.10.patch @@ -0,0 +1,21 @@ +diff -Naurp selectwm-0.4.1-orig/src/options.c selectwm-0.4.1/src/options.c +--- selectwm-0.4.1-orig/src/options.c 2009-07-26 14:46:44.092880624 -0600 ++++ selectwm-0.4.1/src/options.c 2009-07-26 14:46:11.484940363 -0600 +@@ -32,7 +32,7 @@ + #include "miscui.h" + #include "modify.h" + +-static GString *getline (FILE *fichier) { ++static GString *selectwm_getline (FILE *fichier) { + GString *temp; + gchar buf[128]; + +@@ -64,7 +64,7 @@ static gint read_config_file (config *se + } + buf = g_string_new (""); + while (!feof (config)) { +- buf = getline (config); ++ buf = selectwm_getline (config); + + if (buf->len > 0 && buf->str[0] != '#') { + if (g_strrstr (buf->str, ":")) { diff --git a/x11-wm/selectwm/selectwm-0.4.1.ebuild b/x11-wm/selectwm/selectwm-0.4.1.ebuild index 91bc2e845b20..82165fa4ab5d 100644 --- a/x11-wm/selectwm/selectwm-0.4.1.ebuild +++ b/x11-wm/selectwm/selectwm-0.4.1.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/x11-wm/selectwm/selectwm-0.4.1.ebuild,v 1.9 2008/07/19 09:54:33 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/selectwm-0.4.1.ebuild,v 1.10 2009/07/26 20:52:01 dirtyepic Exp $ inherit eutils @@ -22,6 +22,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-enable-deprecated-gtk.patch + epatch "${FILESDIR}"/${P}-glibc-2.10.patch } src_compile() { |