Author: jw Date: 2006-03-09 14:55:46 +0100 (Thu, 09 Mar 2006) New Revision: 894 Added: crux-2.2/ports/opt/eterm/eterm-0.9.3-gcc4.patch Modified: crux-2.2/ports/opt/eterm/.md5sum crux-2.2/ports/opt/eterm/Pkgfile Log: 2.2: gcc4 fix for eterm Modified: crux-2.2/ports/opt/eterm/.md5sum =================================================================== --- crux-2.2/ports/opt/eterm/.md5sum 2006-03-09 12:25:09 UTC (rev 893) +++ crux-2.2/ports/opt/eterm/.md5sum 2006-03-09 13:55:46 UTC (rev 894) @@ -1,2 +1,3 @@ dd089fa7768f945341d721dd4942c702 Eterm-0.9.3.tar.gz da95c4485e2244c440ece3da5a9dfca3 eterm-0.9.3-deadkeys.patch +9a9a163d99af109f688f84b04d1e83e8 eterm-0.9.3-gcc4.patch Modified: crux-2.2/ports/opt/eterm/Pkgfile =================================================================== --- crux-2.2/ports/opt/eterm/Pkgfile 2006-03-09 12:25:09 UTC (rev 893) +++ crux-2.2/ports/opt/eterm/Pkgfile 2006-03-09 13:55:46 UTC (rev 894) @@ -6,13 +6,14 @@ name=eterm version=0.9.3 -release=1 +release=2 source=(http://www.eterm.org/download/Eterm-$version.tar.gz - eterm-0.9.3-deadkeys.patch) + eterm-0.9.3-deadkeys.patch eterm-0.9.3-gcc4.patch) build() { cd Eterm-$version patch -p0 < $SRC/eterm-0.9.3-deadkeys.patch + patch -p1 < $SRC/eterm-0.9.3-gcc4.patch ./configure --prefix=/usr --disable-nls make make DESTDIR=$PKG install Added: crux-2.2/ports/opt/eterm/eterm-0.9.3-gcc4.patch =================================================================== --- crux-2.2/ports/opt/eterm/eterm-0.9.3-gcc4.patch 2006-03-09 12:25:09 UTC (rev 893) +++ crux-2.2/ports/opt/eterm/eterm-0.9.3-gcc4.patch 2006-03-09 13:55:46 UTC (rev 894) @@ -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");