ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

move eterm to attic

Browse Source
This commit is contained in:
Johannes Winkelmann 2006-03-21 17:03:43 +00:00
parent 043850640c
commit ec2416e39f
5 changed files with 0 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
eterm/.footprint
View File

@ -1,62 +0,0 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/Esetroot
-rwxr-xr-x root/root usr/bin/Etbg
-rwxr-xr-x root/root usr/bin/Etbg_update_list
-rwxr-xr-x root/root usr/bin/Etcolors
-rwxr-xr-x root/root usr/bin/Eterm
-rwxr-xr-x root/root usr/bin/Etsearch
-rwxr-xr-x root/root usr/bin/Ettable
-rwxr-xr-x root/root usr/bin/kEsetroot
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libEterm-0.9.3.so
-rw-r--r-- root/root usr/lib/libEterm.a
-rwxr-xr-x root/root usr/lib/libEterm.la
lrwxrwxrwx root/root usr/lib/libEterm.so -> libEterm-0.9.3.so
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/Eterm.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/Eterm/
drwxr-xr-x root/root usr/share/Eterm/pix/
-rw-r--r-- root/root usr/share/Eterm/pix/bar_horizontal_1.png
-rw-r--r-- root/root usr/share/Eterm/pix/bar_horizontal_2.png
-rw-r--r-- root/root usr/share/Eterm/pix/bar_horizontal_3.png
-rw-r--r-- root/root usr/share/Eterm/pix/bar_vertical_1.png
-rw-r--r-- root/root usr/share/Eterm/pix/bar_vertical_2.png
-rw-r--r-- root/root usr/share/Eterm/pix/bar_vertical_3.png
-rw-r--r-- root/root usr/share/Eterm/pix/button_arrow_down_1.png
-rw-r--r-- root/root usr/share/Eterm/pix/button_arrow_down_2.png
-rw-r--r-- root/root usr/share/Eterm/pix/button_arrow_down_3.png
-rw-r--r-- root/root usr/share/Eterm/pix/button_arrow_up_1.png
-rw-r--r-- root/root usr/share/Eterm/pix/button_arrow_up_2.png
-rw-r--r-- root/root usr/share/Eterm/pix/button_arrow_up_3.png
-rw-r--r-- root/root usr/share/Eterm/pix/exit.png
-rw-r--r-- root/root usr/share/Eterm/pix/help.png
-rw-r--r-- root/root usr/share/Eterm/pix/menu1.png
-rw-r--r-- root/root usr/share/Eterm/pix/menu2.png
-rw-r--r-- root/root usr/share/Eterm/pix/menu3.png
-rw-r--r-- root/root usr/share/Eterm/pix/pixmaps.list
drwxr-xr-x root/root usr/share/Eterm/pix/scale/
-rw-r--r-- root/root usr/share/Eterm/pix/scale/Neopolis-horizon.jpg
-rw-r--r-- root/root usr/share/Eterm/pix/thumb_1.png
-rw-r--r-- root/root usr/share/Eterm/pix/thumb_2.png
drwxr-xr-x root/root usr/share/Eterm/pix/tile/
-rw-r--r-- root/root usr/share/Eterm/pix/tile/circuit.jpg
drwxr-xr-x root/root usr/share/Eterm/themes/
drwxr-xr-x root/root usr/share/Eterm/themes/Escreen/
-rw-r--r-- root/root usr/share/Eterm/themes/Escreen/menus.cfg
lrwxrwxrwx root/root usr/share/Eterm/themes/Escreen/pixmaps.list -> ../../pix/pixmaps.list
-rw-r--r-- root/root usr/share/Eterm/themes/Escreen/theme.cfg
drwxr-xr-x root/root usr/share/Eterm/themes/Eterm/
-rw-r--r-- root/root usr/share/Eterm/themes/Eterm/menus.cfg
lrwxrwxrwx root/root usr/share/Eterm/themes/Eterm/pixmaps.list -> ../../pix/pixmaps.list
-rw-r--r-- root/root usr/share/Eterm/themes/Eterm/theme.cfg
drwxr-xr-x root/root usr/share/Eterm/themes/auto/
-rw-r--r-- root/root usr/share/Eterm/themes/auto/menus.cfg
lrwxrwxrwx root/root usr/share/Eterm/themes/auto/pixmaps.list -> ../../pix/pixmaps.list
-rw-r--r-- root/root usr/share/Eterm/themes/auto/theme.cfg
drwxr-xr-x root/root usr/share/Eterm/themes/trans/
-rw-r--r-- root/root usr/share/Eterm/themes/trans/menus.cfg
lrwxrwxrwx root/root usr/share/Eterm/themes/trans/pixmaps.list -> ../../pix/pixmaps.list
-rw-r--r-- root/root usr/share/Eterm/themes/trans/theme.cfg

3
eterm/.md5sum
View File

@ -1,3 +0,0 @@
dd089fa7768f945341d721dd4942c702 Eterm-0.9.3.tar.gz
da95c4485e2244c440ece3da5a9dfca3 eterm-0.9.3-deadkeys.patch
9a9a163d99af109f688f84b04d1e83e8 eterm-0.9.3-gcc4.patch

20
eterm/Pkgfile
View File

@ -1,20 +0,0 @@
# Description: The Enlightenment Terminal Emulator
# Maintainer: Johannes Winkelmann, jw at tks6 dot net
# Packager: Markus Ackermann <maol@symlink.ch>
# URL: http://www.eterm.org
# Depends: libast, imlib2
name=eterm
version=0.9.3
release=2
source=(http://www.eterm.org/download/Eterm-$version.tar.gz
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
}

127
eterm/eterm-0.9.3-deadkeys.patch
View File

@ -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 */

17
eterm/eterm-0.9.3-gcc4.patch
View File

@ -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");