diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-04-08 17:46:58 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-08 17:46:58 +0000 |
commit | 1091df97fad438970e875c4bf908e2dd354a6845 (patch) | |
tree | d002a1752b940367a04aec62f8921a622e0b6fac /x11-terms/eterm | |
parent | sparc stable wrt #215722 (diff) | |
download | gentoo-2-1091df97fad438970e875c4bf908e2dd354a6845.tar.gz gentoo-2-1091df97fad438970e875c4bf908e2dd354a6845.tar.bz2 gentoo-2-1091df97fad438970e875c4bf908e2dd354a6845.zip |
old
Diffstat (limited to 'x11-terms/eterm')
-rw-r--r-- | x11-terms/eterm/eterm-0.9.3-r4.ebuild | 65 | ||||
-rw-r--r-- | x11-terms/eterm/files/eterm-0.9.3-CARD64.patch | 32 | ||||
-rw-r--r-- | x11-terms/eterm/files/eterm-0.9.3-deadkeys.patch | 127 | ||||
-rw-r--r-- | x11-terms/eterm/files/eterm-0.9.3-gcc4.patch | 17 | ||||
-rw-r--r-- | x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch | 42 |
5 files changed, 0 insertions, 283 deletions
diff --git a/x11-terms/eterm/eterm-0.9.3-r4.ebuild b/x11-terms/eterm/eterm-0.9.3-r4.ebuild deleted file mode 100644 index dd26595ea97a..000000000000 --- a/x11-terms/eterm/eterm-0.9.3-r4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2008 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.13 2008/03/31 05:05:56 ricmm Exp $ - -inherit eutils - -MY_P=Eterm-${PV} -DESCRIPTION="A vt102 terminal emulator for X" -HOMEPAGE="http://www.eterm.org/" -SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz - !minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz ) - mirror://sourceforge/eterm/${MY_P}.tar.gz - !minimal? ( mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="escreen etwin minimal mmx unicode" - -DEPEND="x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - x11-proto/xextproto - x11-proto/xproto - >=x11-libs/libast-0.6.1 - media-libs/imlib2 - etwin? ( app-misc/twin ) - escreen? ( app-misc/screen )" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${MY_P}.tar.gz - cd "${S}" - epatch "${FILESDIR}"/${P}-pixmap-colmod.patch - epatch "${FILESDIR}"/${P}-CARD64.patch #76324 - epatch "${FILESDIR}"/${P}-deadkeys.patch - epatch "${FILESDIR}"/${P}-gcc4.patch #92485 - use minimal || unpack Eterm-bg-${PV}.tar.gz - sed -i 's:Tw/Tw_1\.h:Tw/Tw1.h:' src/libscream.c || die -} - -src_compile() { - export TIC="true" - econf \ - $(use_enable escreen) \ - $(use_enable etwin) \ - --with-imlib \ - --enable-trans \ - $(use_enable mmx) \ - $(use_enable unicode multi-charset) \ - --with-delete=execute \ - --with-backspace=auto \ - || die "conf failed" - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - dodoc ChangeLog README ReleaseNotes - use escreen && dodoc doc/README.Escreen - dodoc bg/README.backgrounds -} diff --git a/x11-terms/eterm/files/eterm-0.9.3-CARD64.patch b/x11-terms/eterm/files/eterm-0.9.3-CARD64.patch deleted file mode 100644 index 5de6065ad781..000000000000 --- a/x11-terms/eterm/files/eterm-0.9.3-CARD64.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: src/command.h -=================================================================== -RCS file: /cvsroot/enlightenment/eterm/Eterm/src/command.h,v -retrieving revision 1.20 -diff -u -r1.20 command.h ---- src/command.h 18 Apr 2005 20:01:55 -0000 1.20 -+++ src/command.h 20 Apr 2005 23:06:09 -0000 -@@ -303,6 +303,15 @@ - - /************ Structures ************/ - /* Motif window hints */ -+# ifdef LONG64 -+typedef struct _mwmhints { -+ CARD64 flags; -+ CARD64 functions; -+ CARD64 decorations; -+ INT64 input_mode; -+ CARD64 status; -+} MWMHints; -+# else - typedef struct _mwmhints { - CARD32 flags; - CARD32 functions; -@@ -310,6 +319,8 @@ - INT32 input_mode; - CARD32 status; - } MWMHints; -+# endif -+ - # ifdef HAVE_TERMIOS_H - typedef struct termios ttymode_t; - # else diff --git a/x11-terms/eterm/files/eterm-0.9.3-deadkeys.patch b/x11-terms/eterm/files/eterm-0.9.3-deadkeys.patch deleted file mode 100644 index f28b7496a633..000000000000 --- a/x11-terms/eterm/files/eterm-0.9.3-deadkeys.patch +++ /dev/null @@ -1,127 +0,0 @@ -http://bugs.gentoo.org/91878 - - Tue Mar 15 16:44:09 2005 Michael Jennings (mej) - - Reverted part of a patch from Chris Schoeneman <crs23@bigfoot.com> - (changelog entry "Fri Jun 25 17:48:24 2004") which broke dead keys and - compose-key sequences. - - Fixed error in saving of cut_chars attribute. - -Index: src/misc.c -=================================================================== -RCS file: /cvsroot/enlightenment/eterm/Eterm/src/misc.c,v -retrieving revision 1.25 -retrieving revision 1.26 -diff -u -r1.25 -r1.26 ---- src/misc.c 11 Jan 2004 22:10:29 -0000 1.25 -+++ src/misc.c 15 Mar 2005 21:48:02 -0000 1.26 -@@ -223,6 +223,53 @@ - return (pnew - str); - } - -+spif_charptr_t -+escape_string(spif_charptr_t str, spif_char_t quote, spif_int32_t maxlen) -+{ -+ spif_charptr_t buff, s = str, pbuff; -+ -+ D_STRINGS(("escape_string(%s %c %ld)\n", (char *) str, quote, maxlen)); -+ if (! quote) { -+ quote = '\"'; -+ } -+ -+ /* The escaped string will be at most twice the length of the original. */ -+ buff = SPIF_CAST(charptr) MALLOC(strlen(SPIF_CAST_PTR(char) str) * 2 + 1); -+ -+ /* Copy and escape the string from str into buff. */ -+ for (pbuff = buff; (*s); s++, pbuff++) { -+ if (*s == quote) { -+ D_STRINGS(("Double-escaping \'%c\' at position %d\n", *s, s - str)); -+ *pbuff = '\\'; -+ pbuff++; -+ *pbuff = '\\'; -+ pbuff++; -+ } else { -+ if (quote == '\"') { -+ if ((*s == '\\') || (*s == '`')) { -+ D_STRINGS(("Escaping \'%c\' at position %d\n", *s, s - str)); -+ *pbuff = '\\'; -+ pbuff++; -+ } -+ } -+ } -+ D_STRINGS(("Copying \'%c\' at position %d\n", *s, s - str)); -+ *pbuff = *s; -+ } -+ *pbuff = 0; -+ -+ if (maxlen) { -+ /* Given maxlen, we know "str" can hold at least "maxlen" chars. */ -+ if (!spiftool_safe_strncpy(str, buff, maxlen)) { -+ str[maxlen] = 0; -+ } -+ FREE(buff); -+ return str; -+ } else { -+ return buff; -+ } -+} -+ - char * - safe_print_string(const char *str, unsigned long len) - { -Index: src/misc.h -=================================================================== -RCS file: /cvsroot/enlightenment/eterm/Eterm/src/misc.h,v -retrieving revision 1.15 -retrieving revision 1.16 -diff -u -r1.15 -r1.16 ---- src/misc.h 11 Jan 2004 22:10:29 -0000 1.15 -+++ src/misc.h 15 Mar 2005 21:48:02 -0000 1.16 -@@ -40,6 +40,7 @@ - extern unsigned long str_leading_match(register const char *, register const char *); - extern char *str_trim(char *str); - extern int parse_escaped_string(char *str); -+extern spif_charptr_t escape_string(spif_charptr_t str, spif_char_t quote, spif_int32_t maxlen); - extern char *safe_print_string(const char *buff, unsigned long len); - extern unsigned long add_carriage_returns(unsigned char *buff, unsigned long cnt); - extern unsigned char mkdirhier(const char *); -Index: src/options.c -=================================================================== -RCS file: /cvsroot/enlightenment/eterm/Eterm/src/options.c,v -retrieving revision 1.135 -retrieving revision 1.136 -diff -u -r1.135 -r1.136 ---- src/options.c 23 Feb 2005 20:38:19 -0000 1.135 -+++ src/options.c 15 Mar 2005 21:48:02 -0000 1.136 -@@ -3850,7 +3863,10 @@ - } - #ifdef CUTCHAR_OPTION - if (rs_cutchars) { -- fprintf(fp, " cut_chars '%s'\n", rs_cutchars); -+ spif_charptr_t cut_chars_escaped; -+ -+ cut_chars_escaped = escape_string(SPIF_CAST(charptr) rs_cutchars, '\"', 0); -+ fprintf(fp, " cut_chars \"%s\"\n", (char *) cut_chars_escaped); - } - #endif - fprintf(fp, "end misc\n\n"); -Index: src/windows.c -=================================================================== -RCS file: /cvsroot/enlightenment/eterm/Eterm/src/windows.c,v -retrieving revision 1.68 -retrieving revision 1.69 -diff -u -r1.68 -r1.69 ---- src/windows.c 14 Dec 2004 23:24:33 -0000 1.68 -+++ src/windows.c 15 Mar 2005 21:48:12 -0000 1.69 -@@ -473,9 +473,7 @@ - XClearWindow(Xdisplay, TermWin.vt); - } - XDefineCursor(Xdisplay, TermWin.vt, TermWin_cursor); -- TermWin.mask = (KeyPressMask | EnterWindowMask | LeaveWindowMask | ExposureMask -- | ButtonPressMask | ButtonReleaseMask | Button1MotionMask -- | Button2MotionMask | Button3MotionMask); -+ TermWin.mask = (EnterWindowMask | LeaveWindowMask | ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask | Button2MotionMask | Button3MotionMask); - XSelectInput(Xdisplay, TermWin.vt, TermWin.mask); - - /* If the user wants a specific desktop, tell the WM that */ diff --git a/x11-terms/eterm/files/eterm-0.9.3-gcc4.patch b/x11-terms/eterm/files/eterm-0.9.3-gcc4.patch deleted file mode 100644 index 4b72fd38eb78..000000000000 --- a/x11-terms/eterm/files/eterm-0.9.3-gcc4.patch +++ /dev/null @@ -1,17 +0,0 @@ -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"); diff --git a/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch b/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch deleted file mode 100644 index 79f1abd53266..000000000000 --- a/x11-terms/eterm/files/eterm-0.9.3-pixmap-colmod.patch +++ /dev/null @@ -1,42 +0,0 @@ -Patch taken from upstream cvs to fix funky blue tinting. - ---- src/pixmap.c -+++ src/pixmap.c -@@ -54,2 +54,7 @@ - -+/* FIXME: Workaround for older versions of libast. */ -+#ifndef WORDS_BIGENDIAN -+# define WORDS_BIGENDIAN 0 -+#endif -+ - /* Assembler routines */ -@@ -1636,3 +1641,3 @@ - --# ifdef WORDS_BIGENDIAN -+# if WORDS_BIGENDIAN - r = (ptr[x + 1] * rm) >> 8; -@@ -1659,3 +1664,3 @@ - --# ifdef WORDS_BIGENDIAN -+# if WORDS_BIGENDIAN - r = (ptr[x + 1] * rm) >> 8; -@@ -1671,3 +1676,3 @@ - b |= (!(b >> 8) - 1); --# ifdef WORDS_BIGENDIAN -+# if WORDS_BIGENDIAN - ptr[x + 1] = r; -@@ -1701,3 +1706,3 @@ - --# ifdef WORDS_BIGENDIAN -+# if WORDS_BIGENDIAN - r = (ptr[x + 0] * rm) >> 8; -@@ -1724,3 +1729,3 @@ - --# ifdef WORDS_BIGENDIAN -+# if WORDS_BIGENDIAN - r = (ptr[x + 0] * rm) >> 8; -@@ -1736,3 +1741,3 @@ - b |= (!(b >> 8) - 1); --# ifdef WORDS_BIGENDIAN -+# if WORDS_BIGENDIAN - ptr[x + 0] = r; |