summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/eterm/ChangeLog6
-rw-r--r--x11-terms/eterm/eterm-0.9.3-r4.ebuild3
-rw-r--r--x11-terms/eterm/files/eterm-0.9.3-gcc4.patch17
3 files changed, 24 insertions, 2 deletions
diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index c8c1abfa1048..5bef07cb38f2 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-terms/eterm
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.33 2005/05/11 00:31:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.34 2005/05/14 18:08:28 vapier Exp $
+
+ 14 May 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/eterm-0.9.3-gcc4.patch, eterm-0.9.3-r4.ebuild:
+ Fix building with gcc-4 by Aaron Walker #92485.
*eterm-0.9.3-r4 (11 May 2005)
diff --git a/x11-terms/eterm/eterm-0.9.3-r4.ebuild b/x11-terms/eterm/eterm-0.9.3-r4.ebuild
index 940214869599..59bae618da98 100644
--- a/x11-terms/eterm/eterm-0.9.3-r4.ebuild
+++ b/x11-terms/eterm/eterm-0.9.3-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.3-r4.ebuild,v 1.1 2005/05/11 00:31:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.3-r4.ebuild,v 1.2 2005/05/14 18:08:28 vapier Exp $
inherit eutils
@@ -31,6 +31,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-pixmap-colmod.patch
epatch "${FILESDIR}"/${P}-CARD64.patch #76324
epatch "${FILESDIR}"/${P}-deadkeys.patch
+ epatch "${FILESDIR}"/${P}-gcc4.patch #92485
unpack Eterm-bg-${PV}.tar.gz
sed -i 's:Tw/Tw_1\.h:Tw/Tw1.h:' src/libscream.c || die
}
diff --git a/x11-terms/eterm/files/eterm-0.9.3-gcc4.patch b/x11-terms/eterm/files/eterm-0.9.3-gcc4.patch
new file mode 100644
index 000000000000..4b72fd38eb78
--- /dev/null
+++ b/x11-terms/eterm/files/eterm-0.9.3-gcc4.patch
@@ -0,0 +1,17 @@
+Fix building with GCC4. Patch by Aaron Walker.
+http://bugs.gentoo.org/92485
+
+--- Eterm-0.9.3/src/command.c
++++ Eterm-0.9.3/src/command.c
+@@ -3002,9 +3002,9 @@
+ Xfd = XConnectionNumber(Xdisplay);
+ D_CMD(("Xfd = %d\n", Xfd));
+ cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
+- AT_LEAST((int) num_fds, Xfd + 1);
++ AT_LEAST(num_fds, Xfd + 1);
+ if (pipe_fd >= 0) {
+- AT_LEAST((int) num_fds, pipe_fd + 1);
++ AT_LEAST(num_fds, pipe_fd + 1);
+ }
+ if ((cmd_fd = command_func(argv)) < 0) {
+ print_error("Unable to run sub-command.\n");