diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-14 18:08:28 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-14 18:08:28 +0000 |
| commit | b680d10de7965530a8b9973d3652f1ccbdc2db9c (patch) | |
| tree | d32d22a342f577207f398d8e51e5678ceffee889 /x11-terms/eterm | |
| parent | add --enable-extendedapdu #92614 by Alon Bar-Lev (diff) | |
| download | historical-b680d10de7965530a8b9973d3652f1ccbdc2db9c.tar.gz historical-b680d10de7965530a8b9973d3652f1ccbdc2db9c.tar.bz2 historical-b680d10de7965530a8b9973d3652f1ccbdc2db9c.zip | |
Fix building with gcc-4 by Aaron Walker #92485.
Package-Manager: portage-2.0.51.21-r1
Diffstat (limited to 'x11-terms/eterm')
| -rw-r--r-- | x11-terms/eterm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-terms/eterm/Manifest | 5 | ||||
| -rw-r--r-- | x11-terms/eterm/eterm-0.9.3-r4.ebuild | 3 | ||||
| -rw-r--r-- | x11-terms/eterm/files/eterm-0.9.3-gcc4.patch | 17 |
4 files changed, 27 insertions, 4 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/Manifest b/x11-terms/eterm/Manifest index 9912e5f1fa74..e48684ce378f 100644 --- a/x11-terms/eterm/Manifest +++ b/x11-terms/eterm/Manifest @@ -1,5 +1,5 @@ -MD5 46db1c09d55181da4f347395c26854df ChangeLog 5307 -MD5 bfcd1b681d21d39db9d56f949bfb2d1c eterm-0.9.3-r4.ebuild 1616 +MD5 57dc2a8c50b4b95457ecc5e4612da020 ChangeLog 5464 +MD5 cec945340826396a59c928b4f95d7e6c eterm-0.9.3-r4.ebuild 1661 MD5 c97cacef51ce9af2ed721636c4436fe1 metadata.xml 631 MD5 24f01dc7e30eedc98613d041c4709ba7 eterm-0.9.2-r6.ebuild 1544 MD5 3c477c1ead38e157044cf5aebb2a4c3c eterm-9999.ebuild 1650 @@ -11,5 +11,6 @@ MD5 309a7b42f0c4a1580943f0078f90bd50 files/digest-eterm-0.9.2-r6 129 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-eterm-9999 0 MD5 0cb62ade9b1d35746c7d8a55949137a1 files/eterm-0.9.3-pixmap-colmod.patch 1004 MD5 1ae3058201549b1de7fb8df2753712e0 files/eterm-0.9.3-CARD64.patch 767 +MD5 9a9a163d99af109f688f84b04d1e83e8 files/eterm-0.9.3-gcc4.patch 570 MD5 da95c4485e2244c440ece3da5a9dfca3 files/eterm-0.9.3-deadkeys.patch 4673 MD5 c40df349d427482025208b7bea5bcb0a files/digest-eterm-0.9.3-r3 130 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"); |