diff options
Diffstat (limited to 'jfbterm/patches')
| -rw-r--r-- | jfbterm/patches/001-asm.patch | 11 | ||||
| -rw-r--r-- | jfbterm/patches/002-main.patch | 25 | ||||
| -rw-r--r-- | jfbterm/patches/003-iconv.patch | 11 | ||||
| -rw-r--r-- | jfbterm/patches/004-ioperm.patch | 11 | ||||
| -rw-r--r-- | jfbterm/patches/005-term.patch | 10 | ||||
| -rw-r--r-- | jfbterm/patches/007-sigchld.patch | 20 |
6 files changed, 88 insertions, 0 deletions
diff --git a/jfbterm/patches/001-asm.patch b/jfbterm/patches/001-asm.patch new file mode 100644 index 0000000..8b98284 --- /dev/null +++ b/jfbterm/patches/001-asm.patch @@ -0,0 +1,11 @@ +--- a/fbcommon.c 2010-06-19 22:33:15.744920495 +0400 ++++ b/fbcommon.c 2010-06-19 22:33:36.347047734 +0400 +@@ -46,7 +46,7 @@ + #endif + #include <linux/vt.h> + #include <linux/fb.h> +-#include <asm/page.h> ++#include <asm-generic/page.h> + + #include "mytypes.h" + #include "fbcommon.h" diff --git a/jfbterm/patches/002-main.patch b/jfbterm/patches/002-main.patch new file mode 100644 index 0000000..9ba3152 --- /dev/null +++ b/jfbterm/patches/002-main.patch @@ -0,0 +1,25 @@ +--- a/main.c 2010-06-20 12:41:23.797920527 +0400 ++++ b/main.c 2010-06-20 22:08:46.443043724 +0400 +@@ -185,6 +185,7 @@ + p->gConfFile = FILE_JFBTERM_CONF; + p->gConfEncoding = NULL; + ++ signal(SIGCHLD, sigchld); + atexit(tapp_final_at_exit); + } + +@@ -193,10 +194,12 @@ + struct vt_stat vts; + int cfd; + int vfd; +- int vtNum; ++ int vtNum = 0; + int child; + char vtty[128]; +- int mode; ++ int mode = 0; ++ ++ memset(&vts, 0, sizeof(struct vt_stat)); + + cfd = util_privilege_open("/dev/console", O_WRONLY); + if (cfd < 0 && diff --git a/jfbterm/patches/003-iconv.patch b/jfbterm/patches/003-iconv.patch new file mode 100644 index 0000000..488365a --- /dev/null +++ b/jfbterm/patches/003-iconv.patch @@ -0,0 +1,11 @@ +--- a/vterm.c 2010-06-20 11:45:25.027920481 +0400 ++++ b/vterm.c 2010-06-20 11:45:32.394920713 +0400 +@@ -795,7 +795,7 @@ + tvterm_put_otherCS_char(TVterm *p, u_char ch) + { + int rev; +- char *inbuf; ++ const char *inbuf; + size_t inbuflen; + char *outbuf; + size_t outbuflen; diff --git a/jfbterm/patches/004-ioperm.patch b/jfbterm/patches/004-ioperm.patch new file mode 100644 index 0000000..1599803 --- /dev/null +++ b/jfbterm/patches/004-ioperm.patch @@ -0,0 +1,11 @@ +--- a/configure.in 2010-06-20 12:48:58.356043542 +0400 ++++ b/configure.in 2010-06-20 12:48:47.550195355 +0400 +@@ -33,7 +33,7 @@ + AC_FUNC_MMAP + AC_TYPE_SIGNAL + AC_FUNC_VPRINTF +-AC_CHECK_FUNCS(select strdup strerror ioperm) ++AC_CHECK_FUNCS(select strdup strerror) + + dnl setup options. + AC_PATH_PROGS(jfb_gzip_path, gunzip, :) diff --git a/jfbterm/patches/005-term.patch b/jfbterm/patches/005-term.patch new file mode 100644 index 0000000..07ab236 --- /dev/null +++ b/jfbterm/patches/005-term.patch @@ -0,0 +1,10 @@ +--- a/term.h 2010-06-20 20:22:20.620998681 +0400 ++++ b/term.h 2010-06-20 20:22:48.435043158 +0400 +@@ -45,6 +45,7 @@ + + void tterm_start(TTerm* p, const char* tn, const char* en); + ++void sigchld(int sig); + extern TTerm gTerm; + + #endif /* INCLUDE_TERM_H */ diff --git a/jfbterm/patches/007-sigchld.patch b/jfbterm/patches/007-sigchld.patch new file mode 100644 index 0000000..b36c75a --- /dev/null +++ b/jfbterm/patches/007-sigchld.patch @@ -0,0 +1,20 @@ +--- a/term.c 2010-06-20 22:10:17.197918007 +0400 ++++ b/term.c 2010-06-21 16:16:36.829840350 +0400 +@@ -100,7 +100,7 @@ + + void tterm_final(TTerm* p) + { +- tterm_reset_utmp(p); ++ //tterm_reset_utmp(p); + tvterm_final(&(p->vterm)); + } + +@@ -172,7 +172,7 @@ + exit(1); + } + /* parent */ +- tterm_set_utmp(p); ++ //tterm_set_utmp(p); + signal(SIGCHLD, sigchld); + atexit(application_final); + |
