diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-02 17:36:40 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-02 17:36:40 +0100 |
commit | 171a011ad3a131671aeb5a98b9e3adf219ad2865 (patch) | |
tree | 0c877a3d1a37f10e37ad7168cfc52054aa0948a7 /x11-terms/kterm/files | |
parent | 75fc75ae1f0481ffdb78450e801a9b443ba641bd (diff) |
gentoo resync : 02.04.2018
Diffstat (limited to 'x11-terms/kterm/files')
-rw-r--r-- | x11-terms/kterm/files/kterm-6.2.0-gentoo.patch | 51 | ||||
-rw-r--r-- | x11-terms/kterm/files/kterm-Xaw3d.patch (renamed from x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch) | 10 | ||||
-rw-r--r-- | x11-terms/kterm/files/kterm-ad-gentoo.patch (renamed from x11-terms/kterm/files/kterm-ad-gentoo.diff) | 4 | ||||
-rw-r--r-- | x11-terms/kterm/files/kterm-gentoo.patch | 43 | ||||
-rw-r--r-- | x11-terms/kterm/files/kterm-openpty.patch (renamed from x11-terms/kterm/files/kterm-6.2.0-openpty.patch) | 20 | ||||
-rw-r--r-- | x11-terms/kterm/files/kterm-underline.patch (renamed from x11-terms/kterm/files/6.2.0-underline.patch) | 4 |
6 files changed, 59 insertions, 73 deletions
diff --git a/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch b/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch deleted file mode 100644 index f05a0b135371..000000000000 --- a/x11-terms/kterm/files/kterm-6.2.0-gentoo.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur kterm-6.2.0/main.c kterm-6.2.0-gentoo/main.c ---- kterm-6.2.0/main.c 1996-07-12 14:01:38.000000000 +0900 -+++ kterm-6.2.0-gentoo/main.c 2002-05-21 08:37:31.000000000 +0900 -@@ -75,9 +75,12 @@ - #include <X11/Xos.h> - #include <X11/cursorfont.h> - #include <X11/Xaw/SimpleMenu.h> -+/* - #ifndef NO_XPOLL_H - #include <X11/Xpoll.h> - #endif -+*/ -+#include <termios.h> - #include <X11/Xlocale.h> - #include <pwd.h> - #include <ctype.h> -@@ -283,7 +286,7 @@ - #include <lastlog.h> - # endif - #endif --#include <sys/param.h> /* for NOFILE */ -+//#include <sys/param.h> /* for NOFILE */ - - #ifdef PUCC_PTYD - #include <local/openpty.h> -diff -Naur kterm-6.2.0/screen.c kterm-6.2.0-gentoo/screen.c ---- kterm-6.2.0/screen.c 1996-06-23 17:00:26.000000000 +0900 -+++ kterm-6.2.0-gentoo/screen.c 2002-05-21 08:30:55.000000000 +0900 -@@ -46,7 +46,8 @@ - #include <sys/ptem.h> - #endif - --extern Char *calloc(), *malloc(), *realloc(); -+//extern Char *calloc(), *malloc(), *realloc(); -+extern void *calloc(), *malloc(), *realloc(); - extern void free(); - - ScrnBuf Allocate (nrow, ncol, addr) -diff -Naur kterm-6.2.0/scrollbar.c kterm-6.2.0-gentoo/scrollbar.c ---- kterm-6.2.0/scrollbar.c 1996-07-12 14:01:39.000000000 +0900 -+++ kterm-6.2.0-gentoo/scrollbar.c 2002-05-21 08:30:39.000000000 +0900 -@@ -324,7 +324,8 @@ - register TScreen *screen = &xw->screen; - register int border = 2 * screen->border; - register int i; -- Char *realloc(), *calloc(); -+// Char *realloc(), *calloc(); -+ void *realloc(), *calloc(); - - if(screen->scrollbar) - return; diff --git a/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch b/x11-terms/kterm/files/kterm-Xaw3d.patch index cda8856a8cff..2b0192817735 100644 --- a/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch +++ b/x11-terms/kterm/files/kterm-Xaw3d.patch @@ -1,6 +1,5 @@ -diff -Naur kterm-6.2.0/Imakefile kterm-6.2.0-Xaw3d/Imakefile ---- kterm-6.2.0/Imakefile 2003-12-13 15:35:05.000000000 +0900 -+++ kterm-6.2.0-Xaw3d/Imakefile 2003-12-13 23:10:24.000000000 +0900 +--- a/Imakefile ++++ b/Imakefile @@ -23,6 +23,10 @@ PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */ PTYLIB = -lpucc @@ -12,9 +11,8 @@ diff -Naur kterm-6.2.0/Imakefile kterm-6.2.0-Xaw3d/Imakefile OSMAJORVERSION = OSMajorVersion OSMINORVERSION = OSMinorVersion -diff -Naur kterm-6.2.0/kterm.h kterm-6.2.0-Xaw3d/kterm.h ---- kterm-6.2.0/kterm.h 2003-12-13 15:35:05.000000000 +0900 -+++ kterm-6.2.0-Xaw3d/kterm.h 2003-12-13 15:35:55.000000000 +0900 +--- a/kterm.h ++++ b/kterm.h @@ -36,6 +36,6 @@ #define KTERM_KINPUT2 /* Kinput2 protocol */ #define KTERM_COLOR /* color sequence */ diff --git a/x11-terms/kterm/files/kterm-ad-gentoo.diff b/x11-terms/kterm/files/kterm-ad-gentoo.patch index a502bac0eb73..b62fbc607b0d 100644 --- a/x11-terms/kterm/files/kterm-ad-gentoo.diff +++ b/x11-terms/kterm/files/kterm-ad-gentoo.patch @@ -1,5 +1,5 @@ ---- KTerm.ad.orig 2004-01-07 06:25:15.000000000 +0900 -+++ KTerm.ad 2004-01-07 06:27:43.550017672 +0900 +--- a/KTerm.ad ++++ b/KTerm.ad @@ -125,3 +125,18 @@ *VT100*translations: #override Shift<Key>space: \ diff --git a/x11-terms/kterm/files/kterm-gentoo.patch b/x11-terms/kterm/files/kterm-gentoo.patch new file mode 100644 index 000000000000..dda78137e9fd --- /dev/null +++ b/x11-terms/kterm/files/kterm-gentoo.patch @@ -0,0 +1,43 @@ +--- a/main.c ++++ b/main.c +@@ -75,9 +75,7 @@ + #include <X11/Xos.h> + #include <X11/cursorfont.h> + #include <X11/Xaw/SimpleMenu.h> +-#ifndef NO_XPOLL_H +-#include <X11/Xpoll.h> +-#endif ++#include <termios.h> + #include <X11/Xlocale.h> + #include <pwd.h> + #include <ctype.h> +@@ -283,7 +281,6 @@ + #include <lastlog.h> + # endif + #endif +-#include <sys/param.h> /* for NOFILE */ + + #ifdef PUCC_PTYD + #include <local/openpty.h> +--- a/screen.c ++++ b/screen.c +@@ -46,7 +46,7 @@ + #include <sys/ptem.h> + #endif + +-extern Char *calloc(), *malloc(), *realloc(); ++extern void *calloc(), *malloc(), *realloc(); + extern void free(); + + ScrnBuf Allocate (nrow, ncol, addr) +--- a/scrollbar.c ++++ b/scrollbar.c +@@ -324,7 +324,7 @@ + register TScreen *screen = &xw->screen; + register int border = 2 * screen->border; + register int i; +- Char *realloc(), *calloc(); ++ void *realloc(), *calloc(); + + if(screen->scrollbar) + return; diff --git a/x11-terms/kterm/files/kterm-6.2.0-openpty.patch b/x11-terms/kterm/files/kterm-openpty.patch index ee8bc1814ae0..0174b746e529 100644 --- a/x11-terms/kterm/files/kterm-6.2.0-openpty.patch +++ b/x11-terms/kterm/files/kterm-openpty.patch @@ -1,6 +1,5 @@ -diff -ru kterm-orig/Imakefile kterm-6.2.0/Imakefile ---- kterm-orig/Imakefile 2004-10-12 01:23:25.000000000 +0200 -+++ kterm-6.2.0/Imakefile 2004-10-12 01:37:59.100764752 +0200 +--- a/Imakefile ++++ b/Imakefile @@ -23,6 +23,11 @@ PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */ PTYLIB = -lpucc @@ -13,9 +12,8 @@ diff -ru kterm-orig/Imakefile kterm-6.2.0/Imakefile OSMAJORVERSION = OSMajorVersion OSMINORVERSION = OSMinorVersion -diff -ru kterm-orig/button.c kterm-6.2.0/button.c ---- kterm-orig/button.c 1996-07-02 07:01:46.000000000 +0200 -+++ kterm-6.2.0/button.c 2004-10-12 01:29:59.420687208 +0200 +--- a/button.c ++++ b/button.c @@ -41,8 +41,6 @@ #include "error.h" #include "menu.h" @@ -25,9 +23,8 @@ diff -ru kterm-orig/button.c kterm-6.2.0/button.c extern void DoSecureKeyboard(); #define KeyState(x) (((x) & (ShiftMask|ControlMask)) + (((x) & Mod1Mask) ? 2 : 0)) -diff -ru kterm-orig/charproc.c kterm-6.2.0/charproc.c ---- kterm-orig/charproc.c 2004-10-12 01:23:25.000000000 +0200 -+++ kterm-6.2.0/charproc.c 2004-10-12 01:30:29.640093160 +0200 +--- a/charproc.c ++++ b/charproc.c @@ -102,8 +102,6 @@ extern XtAppContext app_con; extern Widget toplevel; @@ -37,9 +34,8 @@ diff -ru kterm-orig/charproc.c kterm-6.2.0/charproc.c extern fd_set Select_mask; extern fd_set X_mask; extern fd_set pty_mask; -diff -ru kterm-orig/main.c kterm-6.2.0/main.c ---- kterm-orig/main.c 2004-10-12 01:23:25.000000000 +0200 -+++ kterm-6.2.0/main.c 2004-10-12 01:32:56.697737000 +0200 +--- a/main.c ++++ b/main.c @@ -143,6 +143,7 @@ #define HAS_UTMP_UT_HOST #define LASTLOG diff --git a/x11-terms/kterm/files/6.2.0-underline.patch b/x11-terms/kterm/files/kterm-underline.patch index 5324c4cfa3f8..456b9f32c9dd 100644 --- a/x11-terms/kterm/files/6.2.0-underline.patch +++ b/x11-terms/kterm/files/kterm-underline.patch @@ -1,5 +1,5 @@ ---- charproc.c.orig 2005-08-28 17:55:50.000000000 +0900 -+++ charproc.c 2005-08-28 18:30:14.000000000 +0900 +--- a/charproc.c ++++ b/charproc.c @@ -1897,6 +1897,19 @@ case 7: term->flags |= INVERSE; |