From 8c82edbac23ec7191d4060e20de3fe0740b4764e0fd0a05099155cdc7639c6f8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Jan 2007 23:44:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=1 --- .gitattributes | 23 ++ .gitignore | 1 + 20x20ja.bdf.bz2 | 3 + 20x20ko.bdf.bz2 | 3 + Backarrow2BackSpace | 42 ++++ Backarrow2Delete | 42 ++++ README.SuSE | 5 + TODO | 3 + luitx | 2 + p_xterm-config.diff | 191 +++++++++++++++ p_xterm-settings.diff | 241 +++++++++++++++++++ p_xterm-sigwinch.diff | 11 + ready | 0 terminal.png | 3 + vttest.tar.gz | 3 + xterm.changes | 428 +++++++++++++++++++++++++++++++++ xterm.spec | 537 ++++++++++++++++++++++++++++++++++++++++++ xterm.tar.gz | 3 + 18 files changed, 1541 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 20x20ja.bdf.bz2 create mode 100644 20x20ko.bdf.bz2 create mode 100644 Backarrow2BackSpace create mode 100644 Backarrow2Delete create mode 100644 README.SuSE create mode 100644 TODO create mode 100644 luitx create mode 100644 p_xterm-config.diff create mode 100644 p_xterm-settings.diff create mode 100644 p_xterm-sigwinch.diff create mode 100644 ready create mode 100644 terminal.png create mode 100644 vttest.tar.gz create mode 100644 xterm.changes create mode 100644 xterm.spec create mode 100644 xterm.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/20x20ja.bdf.bz2 b/20x20ja.bdf.bz2 new file mode 100644 index 0000000..0ace69a --- /dev/null +++ b/20x20ja.bdf.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9544467830f809a51c8bead062a61c1e20de488c669744f6cbf1909780018a60 +size 480925 diff --git a/20x20ko.bdf.bz2 b/20x20ko.bdf.bz2 new file mode 100644 index 0000000..3f292e1 --- /dev/null +++ b/20x20ko.bdf.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c658b3131cac00ca939874b06f9779f8baadd26e66d273f5c79f78a6305d4e31 +size 538802 diff --git a/Backarrow2BackSpace b/Backarrow2BackSpace new file mode 100644 index 0000000..3c241ea --- /dev/null +++ b/Backarrow2BackSpace @@ -0,0 +1,42 @@ +#!/bin/bash +# +# Backarrow2BackSpace: Switch Backarrow key to BackSpace +# +# Copyright (c) 1998 S.u.S.E. GmbH Fuerth, Germany. +# please send bugfixes or comments to feedback@suse.de. +# +# Author: Werner Fink, + +# +# Some checks +# +case "$TERM" in + xterm*) ;; + *) echo "${0##*/}: TERM=$TERM is not for an xterm!" 1>&2 + exit 1 +esac +tty -s || { echo "{0##*/}: Not a tty!" 1>&2 ; exit 1; } + +# +# Restore default X key mapping for standard PC keyboards +# +case "$(uname -s)" in + Linux) + xmodmap -e 'keycode 22 = BackSpace BackSpace 3270_DeleteWord' + xmodmap -e 'keycode 107 = Delete' + ;; + *) + # Don't know +esac + +# +# Switch to Ctrl-H (ASCII BackSpace) for Backarrow key +# +echo -en '\033[?67h' > /dev/tty + +# +# Change terminal settings accordingly +# +stty erase '^H' < /dev/tty + +exit 0 diff --git a/Backarrow2Delete b/Backarrow2Delete new file mode 100644 index 0000000..25d3174 --- /dev/null +++ b/Backarrow2Delete @@ -0,0 +1,42 @@ +#!/bin/bash +# +# Backarrow2Delete: Switch Backarrow key to Delete +# +# Copyright (c) 1998 S.u.S.E. GmbH Fuerth, Germany. +# please send bugfixes or comments to feedback@suse.de. +# +# Author: Werner Fink, + +# +# Some checks +# +case "$TERM" in + xterm*) ;; + *) echo "${0##*/}: TERM=$TERM is not for an xterm!" 1>&2 + exit 1 +esac +tty -s || { echo "{0##*/}: Not a tty!" 1>&2 ; exit 1; } + +# +# Restore default X key mapping for standard PC keyboards +# +case "$(uname -s)" in + Linux) + xmodmap -e 'keycode 22 = BackSpace BackSpace 3270_DeleteWord' + xmodmap -e 'keycode 107 = Delete' + ;; + *) + # Don't know +esac + +# +# Switch to Ctrl-? (ASCII Delete) for Backarrow key +# +echo -en '\033[?67l' > /dev/tty + +# +# Change terminal settings accordingly +# +stty erase '^?' < /dev/tty + +exit 0 diff --git a/README.SuSE b/README.SuSE new file mode 100644 index 0000000..c07e89c --- /dev/null +++ b/README.SuSE @@ -0,0 +1,5 @@ +Backarrow2Backspace / Backarrow2Delete +-------------------------------------- + +Command line tools to switch BackArrow-Key inside xterm to Backspace +or Delete. diff --git a/TODO b/TODO new file mode 100644 index 0000000..e575455 --- /dev/null +++ b/TODO @@ -0,0 +1,3 @@ +- switch to configure instead of imake; might be problematic as the + upstream maintainer says, that configure is not maintained and he + doesn't seem to accept any autotools patches diff --git a/luitx b/luitx new file mode 100644 index 0000000..2cbecb0 --- /dev/null +++ b/luitx @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/luit -x ${1+"$@"} diff --git a/p_xterm-config.diff b/p_xterm-config.diff new file mode 100644 index 0000000..edc0e28 --- /dev/null +++ b/p_xterm-config.diff @@ -0,0 +1,191 @@ +--- ../xterm.old/Imakefile 2002-12-14 23:15:55.000000000 +0100 ++++ programs/xterm/Imakefile 2002-12-14 23:25:58.000000000 +0100 +@@ -13,8 +13,12 @@ + /* Uncomment SCROLLBAR_RIGHT if you want the scroll bar to be on the right */ + SCROLLBAR_RIGHT = -DSCROLLBAR_RIGHT + ++/* We use a xtermcfg.h */ ++USECONFIGH = -DHAVE_CONFIG_H ++ + /* Define UTF8support to compile-in support for UTF-8 */ + #define UTF8support ++#define UseUtempter + + /* + * Fixes to allow compile with X11R5 +@@ -121,3 +121,3 @@ + PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT) +- DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF) ++ DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF) $(USECONFIGH) + INCLUDES = -I. $(XRFINCLUDES) +--- /dev/null 2002-12-13 03:40:58.000000000 +0000 ++++ programs/xterm/xtermcfg.h 2002-12-15 14:18:04.000000000 +0000 +@@ -0,0 +1,150 @@ ++/* xtermcfg.h. Generated automatically by configure. */ ++/* ++ * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.41 2002/08/17 19:52:27 dickey Exp $ ++ */ ++ ++/************************************************************ ++ ++Copyright 1997-2001,2002 by Thomas E. Dickey ++ ++ All Rights Reserved ++ ++Permission to use, copy, modify, and distribute this software and its ++documentation for any purpose and without fee is hereby granted, ++provided that the above copyright notice appear in all copies and that ++both that copyright notice and this permission notice appear in ++supporting documentation, and that the name of the above listed ++copyright holder(s) not be used in advertising or publicity pertaining ++to distribution of the software without specific, written prior ++permission. ++ ++THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD ++TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE ++LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ ++********************************************************/ ++ ++#ifndef included_xtermcfg_h ++#define included_xtermcfg_h 1 ++ ++/* This is a template for */ ++ ++/* #undef ALLOWLOGFILEEXEC */ /* CF_ARG_ENABLE(enable-logfile-exec) */ ++/* #undef ALLOWLOGGING */ /* CF_ARG_ENABLE(enable-logging) */ ++#define CC_HAS_PROTOS 1 /* CF_ANSI_CC */ ++/* #undef DECL_ERRNO */ /* CF_ERRNO */ ++/* #undef DFT_COLORMODE */ /* AC_ARG_WITH(default-color-mode) */ ++#define DFT_DECID "100" /* AC_ARG_WITH(default-terminal-id) */ ++#define DFT_TERMTYPE "xterm" /* AC_ARG_WITH(default-term-type) */ ++#define HAVE_GETLOGIN 1 /* AC_CHECK_FUNCS(getlogin) */ ++#define HAVE_LANGINFO_CODESET 1 /* AM_LANGINFO_CODESET */ ++#define HAVE_LASTLOG_H 1 /* CF_LASTLOG */ ++/* #undef HAVE_LIB_NEXTAW */ /* CF_X_ATHENA(--with-neXtaw) */ ++#define HAVE_LIB_XAW 1 /* CF_X_ATHENA */ ++/* #undef HAVE_LIB_XAW3D */ /* CF_X_ATHENA(--with-Xaw3d) */ ++/* #undef HAVE_NCURSES_TERM_H */ /* AC_CHECK_HEADERS(ncurses/term.h) */ ++#define HAVE_PATHS_H 1 /* CF_LASTLOG */ ++#define HAVE_STDLIB_H 1 /* AC_CHECK_HEADERS(stdlib.h) */ ++#define HAVE_STRERROR 1 /* AC_CHECK_FUNCS(strerror) */ ++/* #undef HAVE_SYS_TIME_H */ /* AC_HEADER_TIME */ ++#define HAVE_SYS_WAIT_H 1 /* AC_HEADER_SYS_WAIT */ ++#define HAVE_TCGETATTR 1 /* AC_CHECK_FUNCS(tcgetattr) */ ++#define HAVE_TERMCAP_H 1 /* AC_CHECK_HEADERS(termcap.h) */ ++#define HAVE_TERMIOS_H 1 /* AC_CHECK_HEADERS(termios.h) */ ++/* #undef HAVE_TERMIO_C_ISPEED */ /* CF_TERMIO_C_ISPEED */ ++#define HAVE_UNISTD_H 1 /* AC_CHECK_HEADERS(unistd.h) */ ++#define HAVE_UTMP 1 /* CF_UTMP */ ++#define HAVE_UTMP_UT_HOST 1 /* CF_UTMP_UT_HOST */ ++#define HAVE_UTMP_UT_SESSION 1 /* CF_UTMP_UT_SESSION */ ++#define HAVE_UTMP_UT_XSTATUS 1 /* CF_UTMP_UT_XSTATUS */ ++#define HAVE_UTMP_UT_XTIME 1 /* CF_UTMP_UT_XTIME */ ++#define HAVE_WAITPID 1 /* AC_CHECK_FUNCS(waitpid) */ ++#define HAVE_X11_DECKEYSYM_H 1 /* AC_CHECK_HEADERS(X11/DECkeysym.h) */ ++#define HAVE_X11_SUNKEYSYM_H 1 /* AC_CHECK_HEADERS(X11/Sunkeysym.h) */ ++#define HAVE_X11_XPOLL_H 1 /* AC_CHECK_HEADERS(X11/Xpoll.h) */ ++/* #undef HAVE_XKBSTDBELL */ /* AC_CHECK_FUNCS(XkbStdBell) */ ++/* #undef NO_ACTIVE_ICON */ /* CF_ARG_DISABLE(active-icon) */ ++#define OPT_256_COLORS 1 /* CF_ARG_ENABLE(256-color) */ ++/* #undef OPT_88_COLORS */ /* CF_ARG_ENABLE(88-color) */ ++/* #undef OPT_AIX_COLORS */ /* CF_ARG_DISABLE(16-color) */ ++/* #undef OPT_BLINK_CURS */ /* CF_ARG_DISABLE(blink-cursor) */ ++/* #undef OPT_BOX_CHARS */ /* CF_ARG_DISABLE(boxchars) */ ++/* #undef OPT_COLOR_CLASS */ /* CF_ARG_DISABLE(color-class) */ ++/* #undef OPT_DEC_CHRSET */ /* CF_ARG_DISABLE(doublechars) */ ++#define OPT_DEC_LOCATOR 1 /* CF_ARG_ENABLE(dec-locator) */ ++/* #undef OPT_HIGHLIGHT_COLOR */ /* CF_ARG_DISABLE(highlighting) */ ++#define OPT_HP_FUNC_KEYS 1 /* CF_ARG_ENABLE(hp-fkeys) */ ++/* #undef OPT_I18N_SUPPORT */ /* CF_ARG_DISABLE(i18n) */ ++/* #undef OPT_INITIAL_ERASE */ /* CF_ARG_DISABLE(initial-erase) */ ++/* #undef OPT_INPUT_METHOD */ /* CF_ARG_DISABLE(input-method) */ ++/* #undef OPT_ISO_COLORS */ /* CF_ARG_DISABLE(ansi-color) */ ++#define OPT_LUIT_PROG 1 /* CF_ARG_ENABLE(luit) */ ++/* #undef OPT_MAXIMIZE */ /* CF_ARG_DISABLE(maximize) */ ++#define OPT_MINI_LUIT 1 /* CF_ARG_ENABLE(mini-luit) */ ++/* #undef OPT_NUM_LOCK */ /* CF_ARG_DISABLE(num-lock) */ ++/* #undef OPT_PC_COLORS */ /* CF_ARG_DISABLE(pc-color) */ ++/* #undef OPT_SAME_NAME */ ++#define OPT_SCO_FUNC_KEYS 1 /* CF_ARG_ENABLE(sco-fkeys) */ ++/* #undef OPT_TCAP_QUERY */ ++/* #undef OPT_TEK4014 */ /* CF_ARG_DISABLE(tek4014) */ ++/* #undef OPT_TOOLBAR */ /* CF_ARG_ENABLE(toolbar) */ ++/* #undef OPT_TRACE */ /* CF_ARG_ENABLE(trace) */ ++/* #undef OPT_VT52_MODE */ /* CF_ARG_DISABLE(vt52) */ ++#define OPT_WIDE_CHARS 1 /* CF_ARG_OPTION(wide-chars) */ ++/* #undef OPT_XMC_GLITCH */ /* CF_ARG_ENABLE(xmc-glitch) */ ++/* #undef OPT_ZICONBEEP */ /* CF_ARG_DISABLE(ziconbeep) */ ++/* #undef OWN_TERMINFO_DIR */ /* AC_ARG_WITH(own-terminfo) */ ++#define SCROLLBAR_RIGHT 1 /* CF_ARG_ENABLE(rightbar) */ ++/* #undef SVR4 */ /* CF_SVR4, imake */ ++/* #undef SYSV */ /* CF_SYSV, imake */ ++#define TIME_WITH_SYS_TIME 1 /* AC_HEADER_TIME */ ++#define TTY_GROUP_NAME "tty" /* CF_TTY_GROUP */ ++#define USE_LASTLOG 1 /* CF_LASTLOG */ ++/* #undef USE_MY_MEMMOVE */ /* CF_FUNC_MEMMOVE */ ++/* #undef USE_OK_BCOPY */ /* CF_FUNC_MEMMOVE */ ++#define USE_POSIX_WAIT 1 /* CF_POSIX_WAIT */ ++#define USE_SYSV_UTMP 1 /* CF_UTMP */ ++/* #undef USE_SYS_SELECT_H */ /* CF_TYPE_FD_SET */ ++/* #undef USE_TERMCAP */ /* CF_FUNC_TGETENT */ ++#define USE_TERMINFO 1 /* CF_FUNC_TGETENT */ ++#define USE_TTY_GROUP 1 /* CF_TTY_GROUP */ ++#define USE_UTEMPTER 1 /* CF_UTEMPTER */ ++/* #undef UTMPX_FOR_UTMP */ /* CF_UTMP */ ++#define XRENDERFONT 1 /* CF_X_FREETYPE */ ++/* #undef const */ /* AC_CONST */ ++/* #undef size_t */ /* AC_TYPE_SIZE_T */ ++/* #undef time_t */ /* AC_CHECK_TYPE(time_t, long) */ ++/* #undef ut_name */ /* CF_UTMP */ ++#define ut_xstatus ut_exit.e_exit /* CF_UTMP_UT_XSTATUS */ ++/* #undef ut_xtime */ /* CF_UTMP_UT_XTIME */ ++ ++/* #undef GCC_PRINTF */ ++/* #undef GCC_UNUSED */ ++ ++#ifdef USE_OK_BCOPY ++#define memmove(d,s,n) bcopy(s,d,n) ++#endif ++ ++#ifdef USE_MY_MEMMOVE ++#define memmove(d,s,n) my_memmove(d,s,n) ++extern char * my_memmove(char * s1, char * s2, size_t n); ++#endif ++ ++#ifndef HAVE_STRERROR ++#define strerror(n) my_strerror(n) ++extern char *my_strerror(int n); ++#endif ++ ++#ifndef HAVE_X11_XPOLL_H ++#define NO_XPOLL_H /* X11R6.1 & up use Xpoll.h for select() definitions */ ++#endif ++ ++#ifndef HAVE_XKBSTDBELL ++#define NO_XKBSTDBELL /* IRIX 6.2 incorrectly defines XKB in imake */ ++#endif ++ ++#endif /* included_xtermcfg_h */ +--- main.h.orig 2004-08-15 11:04:36.139302948 +0000 ++++ programs/xterm/main.h 2004-08-15 11:05:25.696950729 +0000 +@@ -73,15 +73,7 @@ + #define PROJECTROOT "/usr/X11R6" + #endif + +-/* +- * The configure script quotes PROJECTROOT's value. +- * imake does not quote PROJECTROOT's value. +- */ +-#ifdef HAVE_CONFIG_H +-#define DEFLOCALEFILTER2(x) x +-#else + #define DEFLOCALEFILTER2(x) #x +-#endif + + #define DEFLOCALEFILTER1(x) DEFLOCALEFILTER2(x) + #define DEFLOCALEFILTER DEFLOCALEFILTER1(PROJECTROOT) "/bin/luit" diff --git a/p_xterm-settings.diff b/p_xterm-settings.diff new file mode 100644 index 0000000..1e2c236 --- /dev/null +++ b/p_xterm-settings.diff @@ -0,0 +1,241 @@ +diff -u -N -r ../xterm-212.orig/UXTerm.ad ./UXTerm.ad +--- ../xterm-212.orig/UXTerm.ad 2006-02-13 02:14:58.000000000 +0100 ++++ ./UXTerm.ad 2006-04-15 21:39:45.509398735 +0200 +@@ -6,8 +6,14 @@ + ! to set resources for UTF-8 mode with corresponding fonts. + ! See the uxterm script for an example. + ++! You need to have efont-unicode.rpm installed in order to use the ++! efont-fixed fonts! ++ + #include "XTerm-color" + ++! always use iso10646-1 fonts and luit for non-UTF-8 locales: ++*locale: true ++ + *fontMenu.Label: Unicode Fonts + *VT100.utf8: 1 + +@@ -31,12 +37,29 @@ + ! Making the wide fonts associated with *VT100.font in this file allows uxterm + ! to skip that step. It will use the fonts that the XTerm file gives for the + ! *VT100.uft8Fonts.font pattern. +-*VT100.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 +-*VT100.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 +-*VT100.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 +-*VT100.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 +-*VT100.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 +-*VT100.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 ++ ++*VT100.fontMenu*fontdefault*Label: Default ++*VT100.font: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1 ++*VT100.wideFont: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1 ++ ++*fontMenu*font1.Label: efont 10 pixel ++*VT100.font1: -efont-fixed-medium-r-normal--10-100-75-75-c-50-iso10646-1 ++*VT100.wideFont1: -efont-fixed-medium-r-normal--10-100-75-75-c-100-iso10646-1 ++*fontMenu*font2.Label: efont 12 pixel ++*VT100.font2: -efont-fixed-medium-r-normal-*-12-120-75-75-c-60-iso10646-1 ++*VT100.wideFont2: -efont-fixed-medium-r-normal-*-12-120-75-75-c-120-iso10646-1 ++*fontMenu*font3.Label: efont 14 pixel ++*VT100.font3: -efont-fixed-medium-r-normal-*-14-140-75-75-c-70-iso10646-1 ++*VT100.wideFont3: -efont-fixed-medium-r-normal-*-14-140-75-75-c-140-iso10646-1 ++*fontMenu*font4.Label: efont 16 pixel ++*VT100.font4: -efont-fixed-medium-r-normal-*-16-160-75-75-c-80-iso10646-1 ++*VT100.wideFont4: -efont-fixed-medium-r-normal-*-16-160-75-75-c-160-iso10646-1 ++*fontMenu*font5.Label: misc 18 pixel ++*VT100.font5: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1 ++*VT100.wideFont5: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1 ++*fontMenu*font6.Label: efont 24 pixel ++*VT100.font6: -efont-fixed-medium-r-normal-*-24-240-75-75-c-120-iso10646-1 ++*VT100.wideFont6: -efont-fixed-medium-r-normal-*-24-240-75-75-c-240-iso10646-1 + + ! Here is an alternate set of fonts with better support for bold: + !*VT100.font2: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1 +diff -u -N -r ../xterm-212.orig/XTerm-col.ad ./XTerm-col.ad +--- ../xterm-212.orig/XTerm-col.ad 2005-09-19 01:48:12.000000000 +0200 ++++ ./XTerm-col.ad 2006-04-15 21:32:22.000000000 +0200 +@@ -46,15 +46,15 @@ + *VT100*color1: red3 + *VT100*color2: green3 + *VT100*color3: yellow3 +-*VT100*color4: blue2 ++*VT100*color4: blue3 + *VT100*color5: magenta3 + *VT100*color6: cyan3 + *VT100*color7: gray90 +-*VT100*color8: gray50 ++*VT100*color8: gray30 + *VT100*color9: red + *VT100*color10: green + *VT100*color11: yellow +-*VT100*color12: rgb:5c/5c/ff ++*VT100*color12: blue + *VT100*color13: magenta + *VT100*color14: cyan + *VT100*color15: white +diff -u -N -r ../xterm-212.orig/XTerm.ad ./XTerm.ad +--- ../xterm-212.orig/XTerm.ad 2006-04-10 02:34:36.000000000 +0200 ++++ ./XTerm.ad 2006-04-15 21:36:48.099315161 +0200 +@@ -66,21 +66,41 @@ + *vtMenu*vthide*Label: Hide VT Window + *vtMenu*altscreen*Label: Show Alternate Screen + ++! always use iso10646-1 fonts and luit for non-UTF-8 locales: ++*locale: checkfont ++*localeFilter: /usr/bin/luitx ++ + *fontMenu.Label: VT Fonts + *fontMenu*fontdefault*Label: Default +-*fontMenu*font1*Label: Unreadable +-*VT100.font1: nil2 ++*VT100.font: -misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1 ++*VT100.wideFont: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1 ++ ++*fontMenu*font1*Label: Unicode Best ++*VT100.font1: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1 ++*VT100.wideFont1: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1 ++!*VT100.font1: nil2 ++!*VT100.wideFont1: + *IconFont: nil2 + *fontMenu*font2*Label: Tiny +-*VT100.font2: 5x7 ++!*VT100.font2: 5x7 ++*VT100.font2: -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1 ++!*VT100.widefont2: + *fontMenu*font3*Label: Small +-*VT100.font3: 6x10 ++!*VT100.font3: 6x10 ++*VT100.font3: -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1 ++!*VT100.wideFont3: + *fontMenu*font4*Label: Medium +-*VT100.font4: 7x13 ++!*VT100.font4: 7x13 ++*VT100.font4: -misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1 ++*VT100.wideFont4: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1 + *fontMenu*font5*Label: Large +-*VT100.font5: 9x15 ++!*VT100.font5: 9x15 ++*VT100.font5: -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 ++!*VT100.wideFont5: + *fontMenu*font6*Label: Huge +-*VT100.font6: 10x20 ++!*VT100.font6: 10x20 ++*VT100.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 ++!*VT100.wideFont6: + *fontMenu*fontescape*Label: Escape Sequence + *fontMenu*fontsel*Label: Selection + !fontescape and fontsel overridden by application +@@ -91,12 +111,13 @@ + *fontMenu*utf8-mode*Label: UTF-8 + *fontMenu*utf8-title*Label: UTF-8 Titles + +-*VT100.utf8Fonts.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 +-*VT100.utf8Fonts.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 +-*VT100.utf8Fonts.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 +-*VT100.utf8Fonts.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 +-*VT100.utf8Fonts.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 +-*VT100.utf8Fonts.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 ++! upstream configuration, which simply has broken our xterm font configuration completely ++!*VT100.utf8Fonts.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 ++!*VT100.utf8Fonts.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 ++!*VT100.utf8Fonts.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 ++!*VT100.utf8Fonts.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 ++!*VT100.utf8Fonts.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 ++!*VT100.utf8Fonts.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 + + *tekMenu.Label: Tek Options + *tekMenu*tektextlarge*Label: Large Characters +@@ -186,3 +207,58 @@ + ! + ! Alternatively, + !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ ++ ++!! We want a 8bit clean xterm ++*eightBitInput: true ++*eightBitOutput: true ++ ++!! Default Settings ++*termName: xterm ++*pointerShape: top_left_arrow ++*scrollKey: true ++ ++!! Newer XTerms can guess the value of the BackarrowKey by ++!! reading the terminfo or the pty initial value. ++!! We use the terminfo value. ++*backarrowKeyIsErase: true ++*ptyInitialErase: true ++*deleteIsDEL: false ++ ++!! To be compatible with the original X Consortium XTerm. ++!! *oldXtermFKeys: true ++ ++!! Some symbol mappings of the keyboard for foreign Motif. Some of these ++!! mappings are virtual osfKeySym's. Extend this list if necessary, ++!! more information in VirtualBindings(3) and /usr/include/Xm/XmStrDefs.h. ++*defaultVirtualBindings: #override \ ++ Help : osfHelp\n\ ++ DRemove : osfCut\n\ ++ Prior : osfPageUp\n\ ++ Next : osfPageDown\n\ ++ Select : osfSelect\n\ ++ Insert : osfPaste\ ++ ++!! If Alt is not Meta use it for emacs line editing of e.g. bash, ++!! define Pause key, and ignore DRemove on foreign displays. ++*VT100.Translations: #override \ ++ AltShift_L,Alt: string(0x01B) insert() \n\ ++ AltShift_R,Alt: string(0x01B) insert() \n\ ++ Alt Ctrl : string(0x01B) insert() \n\ ++ Alt : string(0x01B) insert() \n\ ++ Pause: string("\033[P") \n\ ++ DRemove: ignore() ++ ++*background: LightYellow2 ++*multiScroll: on ++*jumpScroll: on ++*ScrollBar: on ++*Scrollbar*width: 16 ++*Scrollbar*height: 16 ++*Scrollbar*shadowWidth: 2 ++*Scrollbar*borderWidth: 3 ++*SaveLines: 2000 ++ ++!! Fix broken charClass, the doubleclick separators ++*charClass: 33:48,37:48,43:48,45-47:48,64:48,126:48,95:48 ++!! Bug #52655 ++*utf8Title: true +diff -u -N -r ../xterm-212.orig/xterm.man ./xterm.man +--- ../xterm-212.orig/xterm.man 2006-04-10 02:34:37.000000000 +0200 ++++ ./xterm.man 2006-04-15 21:32:22.000000000 +0200 +@@ -1107,7 +1107,8 @@ + Tie the VTxxx \fBbackarrowKey\fP and \fBptyInitialErase\fP resources + together by setting the DECBKM state according to whether the initial value of + stty erase is a backspace (8) or delete (127) character. +-The default is ``false'', which disables this feature. ++\" The default is ``false'', which disables this feature. ++The default is ``true'', which enables this feature. + .TP 8 + .B "hold (\fPclass\fB Hold)" + If true, +@@ -2132,8 +2133,8 @@ + ``XtDefaultBackground.'' + .TP 8 + .B "pointerShape (\fPclass\fB Cursor)" +-Specifies the name of the shape of the pointer. +-The default is ``xterm.'' ++\" Specifies the name of the shape of the pointer. The default is ``xterm.'' ++Specifies the name of the shape of the pointer. The default is ``top_left_arrow.'' + .TP 8 + .B "popOnBell (\fPclass\fB PopOnBell)" + Specifies whether the window would be raised when Control-G is +@@ -2230,7 +2231,8 @@ + .B "scrollBar (\fPclass\fB ScrollBar)" + Specifies whether or not the scrollbar should be displayed. + The default is +-``false.'' ++\" ``false.'' ++``true.'' + .TP 8 + .B "scrollBarBorder (\fPclass\fB ScrollBarBorder)" + Specifies the width of the scrollbar border. diff --git a/p_xterm-sigwinch.diff b/p_xterm-sigwinch.diff new file mode 100644 index 0000000..c701a28 --- /dev/null +++ b/p_xterm-sigwinch.diff @@ -0,0 +1,11 @@ +--- screen.c ++++ screen.c 2005-07-27 12:42:12.000000000 +0200 +@@ -1503,7 +1503,7 @@ + TRACE(("return %d from SET_TTYSIZE %dx%d\n", code, rows, cols)); + (void) code; + +-#if defined(SIGWINCH) && defined(USE_STRUCT_TTYSIZE) ++#if defined(SIGWINCH) && (defined(USE_STRUCT_TTYSIZE) || defined(linux)) + if (screen->pid > 1) { + int pgrp; + diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/terminal.png b/terminal.png new file mode 100644 index 0000000..ab43dbc --- /dev/null +++ b/terminal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0f7db222d01346de9ce98a16713b105314af6a532b175f1c74a14cebf87f22c +size 923 diff --git a/vttest.tar.gz b/vttest.tar.gz new file mode 100644 index 0000000..6e1d088 --- /dev/null +++ b/vttest.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fd08b0149d02c86b585c5b7f8350bbceebc538ff2f5d326b91e41b52bf56bec +size 111642 diff --git a/xterm.changes b/xterm.changes new file mode 100644 index 0000000..8cc6475 --- /dev/null +++ b/xterm.changes @@ -0,0 +1,428 @@ +------------------------------------------------------------------- +Fri Dec 1 06:21:09 CET 2006 - sndirsch@suse.de + +- updated to xterm-223 (2006/11/30) + * add --enable-rectangles configure option (request by Martin + Pirker). + * correct default value for --with-symlink configure option. + * fixes configure script macros that use $X_EXTRA_LIBS. + * modify configure script to provide support for pre-package config + versions of Xft (FreeType). + * add the Xaw scrollbar translations resource to the xterm manpage, + add an example showing how to change the mouse button assignments + (Debian #382225). + * amend a change from [227]patch #216, which omitted modifiers for + control, meta, etc., if they were mixed with any other modifiers. + The intent of the change was to avoid confusion with + XK_Mode_switch and XK_ISO_Level3_Shift; the check is now done + explicitly (report by Daniel Jacobowitz). + * interpret a negative value for modifyCursorKeys or + modifyFunctionKeys resources to disable the respective features + (prompted by Novell #220728). + * amend cell-width computation for FreeType from [228]patch #217, + which did not work for VT100 line-drawing characters (Debian + #399638, GenToo #147111). + * amend a change from [229]patch #216, which made alt-modifier on a + cursor-key send a modifier parameter (Novell #220728). + * correct an off-by-one that made DECCRA not work (report/patch by + Martin Pirker). + * revert an optimization in SGR_Foreground() and SGR_Background from + [230]patch #209 (Debian #347722, analysis by Pierre Lombard). + * fix for boldMode (Debian #347790, patch by Tim Pope). + * amend fix for -iconic in [231]patch #208, which broke the + positioning part of -geom with toolbar configuration. + * fix to prevent indexing error in regular expressions (patch by + Dennis Schneider). + * fixes to make the internalBorder area not change color due to + reverseVideo and/or related exposure events. The latter was a very + old bug exposed in [232]patch #196 (report by Neil Hoggarth, also + Debian #397624). +- obsoletes bug220728.diff + +------------------------------------------------------------------- +Tue Nov 28 06:02:04 CET 2006 - sndirsch@suse.de + +- bug220728.diff: + * Essentially the problem reported is that xterm #216 does a more + complete job of applying modifier parameters to cursor-, + function- and other keys. Some users would like to disable the + feature. Patch to allow modifyCursorKeys to be disabled. + Currently the resource accepts values 0 to 3. This adds a -1 to + disable the feature. Most users won't want to do this. + (Bug #220728) + +------------------------------------------------------------------- +Wed Oct 18 11:35:46 CEST 2006 - sndirsch@suse.de + +- updated to xterm-222 + * minor optimization for recoloring cursor via dynamic colors. + * fix a bug caused by restructuring of tek4014 widget + (report by Paul Schenkeveld) + +------------------------------------------------------------------- +Mon Oct 9 18:28:29 CEST 2006 - sndirsch@suse.de + +- updated to xterm-221 + * fix for regular expressions: the code which converted the column + offset within a line did not check properly for the end of a line, + and if allowed to match the whole line, would select the beginning + of the following line. If the following line were empty, in turn + it would select from the next, etc. (report by Sean + Reifschneider). + * minor optimization of color allocation to avoid repainting the + screen if the corresponding color had not been allocated. + * fixes for vttests/256colors.pl (report by Egmont Koblinger). + * add terminfo building block entries for modifiers of the 6-key + editing keypad. + * fix for initialization of tek4014 which broke on QNX 6.1 + +------------------------------------------------------------------- +Mon Sep 11 17:18:14 CEST 2006 - sndirsch@suse.de + +- fixed luit/luitx path (Bug #204861) + +------------------------------------------------------------------- +Mon Sep 11 10:26:14 CEST 2006 - sndirsch@suse.de + +- updated to xterm-220 + * make "xterm -t -iconic" work as expected, i.e., start in + tek4014 mode, but iconified. + +------------------------------------------------------------------- +Tue Sep 5 18:38:36 CEST 2006 - sndirsch@suse.de + +- updated to xterm-219 + * some internal restructuring to separate data for vt100 and tek4014 + widgets. + * fix a few cases where form-events would be seen by the vt100 + widget when built with the toolbar configuration. + +------------------------------------------------------------------- +Tue Aug 29 11:19:48 CEST 2006 - sndirsch@suse.de + +- updated to xterm-218 + * change behavior when encountering an illegal character in a + title string. Rather than reject the string, translate + illegal characters into "?" and use the string (requested by + Thomas Wolff). + * improve checks for nonprinting characters in title strings + (report by Samuel Thibault). + * correct typo in menu labels, changing print-redirect to + print-redir, making it follow the manpage and match the + usage for the actions table (report by Samuel Thibault). + * correct a typo that prevents building with some older systems + such as Solaris 2.6 (report by Julian Bridle). + +------------------------------------------------------------------- +Tue Aug 22 05:43:29 CEST 2006 - sndirsch@suse.de + +- updated to xterm-217 + * minor improvements to FreeType font layout and drawing. + * add a check in the ptyInitialErase logic to ensure that + the termcap was read (Redhat Bugzilla #201246). + * limit changes for reverse-video from patch #216 to cases + where the reverse-video command-line option is used (report + by Zdenek Sekera). + * correct bitmap-derived pointsizes for TrueType fonts; they + should be proportional to the square root of the area of + the bitmap fonts. + * add resources to specify pointsize of TrueType fonts (request + by Reuben Thomas). + * improve install of terminfo by filtering out harmless + messages related to extended capabilities. At the same time, + use ncurses tic to compile the extended capabilities if + possible (report by Zdenek Sekera). + * update "xterm+pcfkeys" terminfo entry to correspond to patch + #216. + +------------------------------------------------------------------- +Wed Aug 16 18:02:44 CEST 2006 - aj@suse.de + +- Remove unneeded BuildRequire on xorg-x11. + +------------------------------------------------------------------- +Wed Aug 9 12:09:29 CEST 2006 - sndirsch@suse.de + +- fixed /usr/share/fonts directory conflict with filesystem + +------------------------------------------------------------------- +Fri Aug 4 16:01:27 CEST 2006 - sndirsch@suse.de + +- updated to xterm-216 + * improve handling of ConfigureNotify events by checking if there are + further events in the queue which obsolete the current one (adapted + from rxvt 2.7.5). Only the normal normal (non-toolbar) + configuration is addressed in this patch. + * several changes to terminfo: + + incorporate some minor changes from ncurses to help keep these + synchronized: + + 2005-02-26 + modify sgr/sgr0 in xterm-new to improve tgetent's + derived "me". + + 2006-02-18 + remove ncv flag from xterm-16color + + 2006-06-24 + improve xterm-256color by combining the 16-color + setaf/setab strings with SGR 48, and cancelling the + setf/setb strings. + + + use extended function-key definitions for xterm-sun, xterm-sco + entries. + + add terminfo building-blocks corresponding to the + modifyFunctionKeys and modifyCursorKeys resources. + * ifdef'd Sun function-key feature to make it optional, like HP and + SCO. + * extend table for termcap-query feature through F63, and updated + tcapquery.pl to match. + * modify logic for function-key input processing to allow function + key numbers which are constructed by control- and shift-modifiers + to extend beyond X's hardcoded limit of 35. + * add control sequence to set or reset the eightBitInput resource. + * change default resource modifyFunctionKeys to 2 to avoid sending + SS3 with parameters (report by Kalle Olavi Niemitalo). + * add control sequences for setting and resetting the values of the + modifyCursorKeys, modifyFunctionKeys and modifyOtherKeys resources. + * add modifyFunctionKeys resource like modifyCursorKeys. Setting this + to zero allows one to use the control- and shift-modifiers to + construct function key strings, for terminals using many function + keys, e.g., for xterm-sun or xterm-sco. + * modify screen responses and function-key logic to reduce the number + of writes made, to make it less likely that an application would + read only part of a function-key in a read operation (suggested by + John E Urbanczyk). + * add combiningChars resource, which allows the user to specify the + maximum number of combining characters that xterm will store for + each cell in wide-character mode (prompted by request by Markus + Kuhn to increase the limit from 2). + * improve logic in metaSendsEscape in case the Alt- and Meta-keys are + mapped to different modifiers. That allows one to use the Alt-key + for shifting in the eightBitInput and use a Meta-key modifier to + prefix the result with an . + * improve modifyCursorKeys logic to prevent it from modifying codes + where eightBitInput or metaSendsEscape are set (request by Dan + Nicolaescu). + * improve modifyCursorKeys logic to prevent it from changing the user + input when other modifiers such as AltGr are used (report by Thomas + Wolff). + * extend modifyCursorKeys to include the numeric keypad when in + application mode. + * improve -reverse (-rv) option (patch by Jason Vas Dias, Redhat + #189161). + * workaround for color resources on Fedora-5 which made the toolbar + colors inconsistent. + * corrected calls used for --disable-setuid option, add debugging + traces to help diagnose this area. + * modify configure script to ensure that USE_UTMP_SETGID is defined + only if the check for POSIX saved-ids succeeds, or corresponds to + one of the BSD systems known to have a workable setegid function. + * extend configure check for POSIX saved-ids to include BSD systems + * modify CF_SYSV configure macro to work with gcc on HPUX 10.20, + whose broken relies on including . + * change order of setuid/setgid ifdef checks in Imakefile to make it + simpler to produce a setgid install, allowing the latter to + override the former (prompted by an XFree86 commit). + * adapt a fix for setgid support from subsequent XFree86 changes + (patch by Emanuele Giaquinta). + * further improve setgid support (patches by Emanuele Giaquinta). + +------------------------------------------------------------------- +Fri Jul 28 14:45:41 CEST 2006 - sndirsch@suse.de + +- use "-fno-strict-aliasing" + +------------------------------------------------------------------- +Mon Jul 24 15:39:40 CEST 2006 - sndirsch@suse.de + +- fixed build for X.Org 7 + +------------------------------------------------------------------- +Tue Jun 20 06:28:00 CEST 2006 - sndirsch@suse.de + +- updated to xterm-215 + * various fixes + +------------------------------------------------------------------- +Mon Jun 19 02:47:50 CEST 2006 - sndirsch@suse.de + +- updated to xterm-214 + * various fixes + +------------------------------------------------------------------- +Mon May 1 11:15:50 CEST 2006 - sndirsch@suse.de + +- updated to xterm-213 + * obsoletes utf8-title-resource.patch + +------------------------------------------------------------------- +Sat Apr 15 21:17:35 CEST 2006 - sndirsch@suse.de + +- updated to xterm-212 + * obsoletes p_xterm_dotext-loop.diff +- using new utf8Title resource (Bug #52655) + +------------------------------------------------------------------ +Mon Feb 13 15:39:34 CET 2006 - werner@suse.de + +- Avouid possible endless loop fix in dotext() at wrapping wide + characters + +------------------------------------------------------------------- +Wed Jan 25 21:43:29 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Jan 4 10:33:00 CET 2006 - sndirsch@suse.de + +- updated to xterm-208 + +------------------------------------------------------------------- +Tue Nov 15 10:34:55 CET 2005 - sndirsch@suse.de + +- updated to xterm-207 +- adjusted patches + +------------------------------------------------------------------- +Thu Oct 06 12:04:59 CEST 2005 - mfabian@suse.de + +- Bugzilla #49305: add 20x20{ja,ko} fonts generated from + 18x18{ja,ko} with the script "bdf18to20" from the mined package. + This is a workaround to make the popular 10x20 font work with + CJK until xterm is improved to become able to pad fonts + on the fly. + +------------------------------------------------------------------- +Mon Sep 19 10:58:24 CEST 2005 - sndirsch@suse.de + +- updated to xterm-205 + [...] + * modify computation of rows/columns on resize to avoid extending + beyond the given limits, e.g., if resizing in response to a + "maximize" in Gnome or KDE which do not use the window manager + hints for this case (Debian #289123, Novell #61153). + * fixes for Novell #113277: + - specify weight for wide font which may be derived from normal + fontname. + - cache the derived wide- and widebolt-fontnames. +- obsoletes bugzilla-99564.patch + +------------------------------------------------------------------- +Sat Aug 27 16:05:05 CEST 2005 - sndirsch@suse.de + +- added vttest; useful for testing terminals + +------------------------------------------------------------------- +Fri Aug 26 18:28:37 CEST 2005 - sndirsch@suse.de + +- back to xterm-203 + bugzilla-99564.patch (Bug #113277) + +------------------------------------------------------------------- +Sun Aug 7 19:51:44 CEST 2005 - sndirsch@suse.de + +- updated to xterm-204 + [...] + * correct variable used to store temporary result from lookup of + bold font, when initializing the wide-bold-font data and no + immediate match is found by asking for a bold variant of the + wide-font. The result was to use overstriking rather than the + actual bold font (Debian #318162, patch by Eugene Konev). + --> obsoletes mfabian's patch mentioned below + +------------------------------------------------------------------- +Mon Aug 01 18:06:08 CEST 2005 - mfabian@suse.de + +- Bugzilla #99564: fix the problem that bold fonts were not + used unless the resource boldMode was set to "false". + +------------------------------------------------------------------- +Wed Jul 27 12:47:28 CEST 2005 - werner@suse.de + +- Re-enable SIGWINCH for linux even if struct winsize is used, due + to the fact that sometime a sleeping process in the process group + do not get the appropiate information by the ioctl TIOCSWINSZ. + +------------------------------------------------------------------- +Wed Jul 13 15:24:10 CEST 2005 - sndirsch@suse.de + +- updated to xterm-203 + +------------------------------------------------------------------- +Fri May 13 04:54:01 CEST 2005 - sndirsch@suse.de + +- use norootforbuild + +------------------------------------------------------------------- +Thu May 12 17:07:20 CEST 2005 - meissner@suse.de + +- use RPM_OPT_FLAGS + +------------------------------------------------------------------- +Tue May 3 11:48:56 CEST 2005 - sndirsch@suse.de + +- updated to xterm-202 + +------------------------------------------------------------------- +Fri Apr 22 08:03:11 CEST 2005 - sndirsch@suse.de + +- updated to xterm-201 +- adjusted p_xterm-settings.diff + +------------------------------------------------------------------- +Thu Mar 24 16:36:21 CET 2005 - sndirsch@suse.de + +- added missing xterm/resize manual pages (Bug #74467) + +------------------------------------------------------------------- +Sun Feb 6 23:57:08 CET 2005 - sndirsch@suse.de + +- updated to xterm-200 + +------------------------------------------------------------------- +Fri Jan 28 00:49:26 CET 2005 - sndirsch@suse.de + +- updated to xterm-199 + +------------------------------------------------------------------- +Fri Jan 14 05:24:56 CET 2005 - sndirsch@suse.de + +- updated to xterm-198 + +------------------------------------------------------------------- +Thu Dec 2 21:17:03 CET 2004 - sndirsch@suse.de + +- p_xterm-config.diff: + * HAVE_LANGINFO_CODESET needs to be set in xtermcfg.h + +------------------------------------------------------------------- +Wed Dec 1 05:18:42 CET 2004 - sndirsch@suse.de + +- updated to xterm-197: + * obsoletes p_xterm_iutf8.diff, p_xterm_noluit.diff + * adjusted p_xterm-config.diff: OPT_LUIT_PROG/OPT_MINI_LUIT needs + to be set in xtermcfg.h + * updated TODO + +------------------------------------------------------------------- +Tue Nov 16 09:50:29 CET 2004 - sndirsch@suse.de + +- added missing xterm icon file (terminal.png, converted from + xterm_32x32.xpm included by icewm) + +------------------------------------------------------------------- +Tue Oct 26 18:59:03 CEST 2004 - sndirsch@suse.de + +- added Backarrow2Backspace, Backarrow2Delete, README.SuSE + +------------------------------------------------------------------- +Sun Oct 24 10:51:53 CEST 2004 - sndirsch@suse.de + +- added TODO + +------------------------------------------------------------------- +Sat Oct 23 19:28:47 CEST 2004 - sndirsch@suse.de + +- created package + diff --git a/xterm.spec b/xterm.spec new file mode 100644 index 0000000..d2f9456 --- /dev/null +++ b/xterm.spec @@ -0,0 +1,537 @@ +# +# spec file for package xterm (Version 223) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: xterm +BuildRequires: freetype2-devel update-desktop-files utempter xorg-x11-devel +URL: http://invisible-island.net/xterm/ +License: X11/MIT +Group: System/X11/Utilities +Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm +Autoreqprov: on +Version: 223 +Release: 1 +Summary: The basic X terminal program +Source: %name.tar.gz +Source1: luitx +Source2: TODO +Source3: Backarrow2Delete +Source4: Backarrow2BackSpace +Source5: README.SuSE +Source6: terminal.png +Source7: vttest.tar.gz +Source8: 20x20ja.bdf.bz2 +Source9: 20x20ko.bdf.bz2 +Patch: p_xterm-config.diff +Patch1: p_xterm-settings.diff +Patch2: p_xterm-sigwinch.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +This package contains the basic X.Org terminal program. + + + +Authors: +-------- + Thomas E Dickey + Adam Sulmicki + Alan Hourihane + Alexander Pohoyda + Alexander V Lukyanov + Andrew Sumner + Andrew Tipton + Anton Kovalenko + Ben Yoshino + Bernhard Rosenkraenzer + Bill Nottingham + Bob Maynard + Bradd W. Szonye + Bram Moolenaar + Bruno Haible + Christian Biere + Christian Weisgerber + Chuck Blake + D Roland Walker + David Dawes + David Madore + David Martinez Moreno + David Mathog + David Yeo + Dennis Schneider + Derek Foreman + Dr Werner Fink + Eddy De Greef + Egbert Eich + Emanuele Giaquinta + Eugene Konev + Fabrice Bellard + Frank Giessler + Frank Guangxin Liu + Frank Liu + Gael Roualland + George Peter Staplin + Greg Klanderman + Greg Smith + H Merijn Brand + Harold Hunt + Holger Veit + Ilya Zakharevich + Jason Vas Dias + Jeff Uphoff + Jens Schweikhardt + Jeremy Buhler + Jeroen Ruigrok + Jess Thrysoee + Joe Allen + Juergen Keil + Juliusz Chroboczek + Jungshik Shin + Kean Johnston + Keith Packard + Ken Martin + Kevin Buhr + Kiyokazu Suto + Larry Riedel + Lee Olsen + Marc La France + Mark Waggoner + Markus Kuhn + Matthias Scheler + Matthieu Herrb + Michael Rohleder + Michael Schroeder + Mike Fabian + Mike Hopkirk + Min Sik Kim + Nam SungHyun + Nelson Beebe + Nicolas George + Paul Gilmartin + Paul Giordano + Paul Szabo + Paul Vojta + Paul Williams + Pavel Roskin + Peter Berg Larsen + Peter Chubb + Phil Sidler + Ray Neuman + Richard Griswold + Robert Brady + Robert Earl + Robin Cutshaw + Ross Paterson + Sam Stephenson + Scott Sewall + Semen A Ustimenko + Sergei Laskavy + Steve Wall + Stuart Lissaman + Suhaib Siddiqi + Sven Verdoolaege + Taneli Huuskonen + Tim Adye + Todd Larason + Todd Miller + Tomasz Cholewo + Tomohiro Kubota + Tor Lillqvist + Torrey T. Lyons + Yong Li + Zarick Lau + +%prep +%setup -n xterm-%version -b7 +%patch -p2 -b .xterm-config +%patch1 -p0 -b .xterm-settings +%patch2 -p0 -b .xterm-sigwinch +cp $RPM_SOURCE_DIR/*bdf.bz2 . +bunzip2 *.bdf.bz2 + +%build +xmkmf -a +make CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing" +pushd ../vttest-20050107 + export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + ./configure --prefix=/usr --mandir=%{_mandir} + make +popd +for i in *.bdf +do + /usr/bin/bdftopcf $i | gzip -9 > `basename $i .bdf`.pcf.gz +done + +%install +make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/usr/bin +make install.man DESTDIR=$RPM_BUILD_ROOT MANDIR=%_mandir/man1 +pushd ../vttest-20050107 + make install DESTDIR=$RPM_BUILD_ROOT +popd +install -m 755 $RPM_SOURCE_DIR/luitx $RPM_BUILD_ROOT/usr/bin +install -m 755 $RPM_SOURCE_DIR/Backarrow2Delete $RPM_BUILD_ROOT/usr/bin +install -m 755 $RPM_SOURCE_DIR/Backarrow2BackSpace $RPM_BUILD_ROOT/usr/bin +install -m 644 $RPM_SOURCE_DIR/README.SuSE . +mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps +install -m 644 $RPM_SOURCE_DIR/terminal.png \ + $RPM_BUILD_ROOT/usr/share/pixmaps +if [ -d /usr/X11R6/lib/X11/fonts/misc ]; then + mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc + install -m 644 *.pcf.gz $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc +else + mkdir -p $RPM_BUILD_ROOT/usr/share/fonts/misc/ + install -m 644 *.pcf.gz $RPM_BUILD_ROOT/usr/share/fonts/misc/ +fi +%suse_update_desktop_file -i xterm TerminalEmulator +if [ -d $RPM_BUILD_ROOT/usr/lib/X11/etc ]; then + cat > files.xterm << EOF +%dir /usr/lib/X11/etc +%dir /usr/share/fonts/misc/ +/usr/lib/X11/etc/xterm.termcap +/usr/lib/X11/etc/xterm.terminfo +/usr/share/X11/app-defaults/XTerm +/usr/share/X11/app-defaults/UXTerm +/usr/share/X11/app-defaults/XTerm-color +/usr/share/fonts/misc/20x20ja.pcf.gz +/usr/share/fonts/misc/20x20ko.pcf.gz +EOF +else + cat > files.xterm << EOF +%dir /usr/X11R6/lib/X11/etc +/usr/X11R6/lib/X11/app-defaults/UXTerm +/usr/X11R6/lib/X11/app-defaults/XTerm +/usr/X11R6/lib/X11/app-defaults/XTerm-color +/usr/X11R6/lib/X11/etc/xterm.termcap +/usr/X11R6/lib/X11/etc/xterm.terminfo +/usr/X11R6/lib/X11/fonts/misc/20x20ja.pcf.gz +/usr/X11R6/lib/X11/fonts/misc/20x20ko.pcf.gz +EOF +fi + +%post +%run_suseconfig_fonts + +%postun +%run_suseconfig_fonts + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f files.xterm +%defattr(-,root,root) +%doc README README.i18n README.SuSE +/usr/bin/xterm +/usr/bin/vttest +/usr/bin/luitx +%attr(755,root,root) /usr/bin/xterm +/usr/bin/resize +/usr/bin/uxterm +/usr/bin/Backarrow2Delete +/usr/bin/Backarrow2BackSpace +/usr/share/man/man1/xterm.1x.gz +/usr/share/man/man1/resize.1x.gz +%{_mandir}/man1/vttest.1.gz +/usr/share/applications/xterm.desktop +/usr/share/pixmaps/terminal.png + +%changelog -n xterm +* Fri Dec 01 2006 - sndirsch@suse.de +- updated to xterm-223 (2006/11/30) + * add --enable-rectangles configure option (request by Martin + Pirker). + * correct default value for --with-symlink configure option. + * fixes configure script macros that use $X_EXTRA_LIBS. + * modify configure script to provide support for pre-package config + versions of Xft (FreeType). + * add the Xaw scrollbar translations resource to the xterm manpage, + add an example showing how to change the mouse button assignments + (Debian #382225). + * amend a change from [227]patch #216, which omitted modifiers for + control, meta, etc., if they were mixed with any other modifiers. + The intent of the change was to avoid confusion with + XK_Mode_switch and XK_ISO_Level3_Shift; the check is now done + explicitly (report by Daniel Jacobowitz). + * interpret a negative value for modifyCursorKeys or + modifyFunctionKeys resources to disable the respective features + (prompted by Novell #220728). + * amend cell-width computation for FreeType from [228]patch #217, + which did not work for VT100 line-drawing characters (Debian + [#399638], GenToo #147111). + * amend a change from [229]patch #216, which made alt-modifier on a + cursor-key send a modifier parameter (Novell #220728). + * correct an off-by-one that made DECCRA not work (report/patch by + Martin Pirker). + * revert an optimization in SGR_Foreground() and SGR_Background from + [230]patch #209 (Debian #347722, analysis by Pierre Lombard). + * fix for boldMode (Debian #347790, patch by Tim Pope). + * amend fix for -iconic in [231]patch #208, which broke the + positioning part of -geom with toolbar configuration. + * fix to prevent indexing error in regular expressions (patch by + Dennis Schneider). + * fixes to make the internalBorder area not change color due to + reverseVideo and/or related exposure events. The latter was a very + old bug exposed in [232]patch #196 (report by Neil Hoggarth, also + Debian #397624). +- obsoletes bug220728.diff +* Tue Nov 28 2006 - sndirsch@suse.de +- bug220728.diff: + * Essentially the problem reported is that xterm #216 does a more + complete job of applying modifier parameters to cursor-, + function- and other keys. Some users would like to disable the + feature. Patch to allow modifyCursorKeys to be disabled. + Currently the resource accepts values 0 to 3. This adds a -1 to + disable the feature. Most users won't want to do this. + (Bug #220728) +* Wed Oct 18 2006 - sndirsch@suse.de +- updated to xterm-222 + * minor optimization for recoloring cursor via dynamic colors. + * fix a bug caused by restructuring of tek4014 widget + (report by Paul Schenkeveld) +* Mon Oct 09 2006 - sndirsch@suse.de +- updated to xterm-221 + * fix for regular expressions: the code which converted the column + offset within a line did not check properly for the end of a line, + and if allowed to match the whole line, would select the beginning + of the following line. If the following line were empty, in turn + it would select from the next, etc. (report by Sean + Reifschneider). + * minor optimization of color allocation to avoid repainting the + screen if the corresponding color had not been allocated. + * fixes for vttests/256colors.pl (report by Egmont Koblinger). + * add terminfo building block entries for modifiers of the 6-key + editing keypad. + * fix for initialization of tek4014 which broke on QNX 6.1 +* Mon Sep 11 2006 - sndirsch@suse.de +- fixed luit/luitx path (Bug #204861) +* Mon Sep 11 2006 - sndirsch@suse.de +- updated to xterm-220 + * make "xterm -t -iconic" work as expected, i.e., start in + tek4014 mode, but iconified. +* Tue Sep 05 2006 - sndirsch@suse.de +- updated to xterm-219 + * some internal restructuring to separate data for vt100 and tek4014 + widgets. + * fix a few cases where form-events would be seen by the vt100 + widget when built with the toolbar configuration. +* Tue Aug 29 2006 - sndirsch@suse.de +- updated to xterm-218 + * change behavior when encountering an illegal character in a + title string. Rather than reject the string, translate + illegal characters into "?" and use the string (requested by + Thomas Wolff). + * improve checks for nonprinting characters in title strings + (report by Samuel Thibault). + * correct typo in menu labels, changing print-redirect to + print-redir, making it follow the manpage and match the + usage for the actions table (report by Samuel Thibault). + * correct a typo that prevents building with some older systems + such as Solaris 2.6 (report by Julian Bridle). +* Tue Aug 22 2006 - sndirsch@suse.de +- updated to xterm-217 + * minor improvements to FreeType font layout and drawing. + * add a check in the ptyInitialErase logic to ensure that + the termcap was read (Redhat Bugzilla #201246). + * limit changes for reverse-video from patch #216 to cases + where the reverse-video command-line option is used (report + by Zdenek Sekera). + * correct bitmap-derived pointsizes for TrueType fonts; they + should be proportional to the square root of the area of + the bitmap fonts. + * add resources to specify pointsize of TrueType fonts (request + by Reuben Thomas). + * improve install of terminfo by filtering out harmless + messages related to extended capabilities. At the same time, + use ncurses tic to compile the extended capabilities if + possible (report by Zdenek Sekera). + * update "xterm+pcfkeys" terminfo entry to correspond to patch + [#216]. +* Wed Aug 16 2006 - aj@suse.de +- Remove unneeded BuildRequire on xorg-x11. +* Wed Aug 09 2006 - sndirsch@suse.de +- fixed /usr/share/fonts directory conflict with filesystem +* Fri Aug 04 2006 - sndirsch@suse.de +- updated to xterm-216 + * improve handling of ConfigureNotify events by checking if there are + further events in the queue which obsolete the current one (adapted + from rxvt 2.7.5). Only the normal normal (non-toolbar) + configuration is addressed in this patch. + * several changes to terminfo: + + incorporate some minor changes from ncurses to help keep these + synchronized: + 2005-02-26 + modify sgr/sgr0 in xterm-new to improve tgetent's + derived "me". + 2006-02-18 + remove ncv flag from xterm-16color + 2006-06-24 + improve xterm-256color by combining the 16-color + setaf/setab strings with SGR 48, and cancelling the + setf/setb strings. + + use extended function-key definitions for xterm-sun, xterm-sco + entries. + + add terminfo building-blocks corresponding to the + modifyFunctionKeys and modifyCursorKeys resources. + * ifdef'd Sun function-key feature to make it optional, like HP and + SCO. + * extend table for termcap-query feature through F63, and updated + tcapquery.pl to match. + * modify logic for function-key input processing to allow function + key numbers which are constructed by control- and shift-modifiers + to extend beyond X's hardcoded limit of 35. + * add control sequence to set or reset the eightBitInput resource. + * change default resource modifyFunctionKeys to 2 to avoid sending + SS3 with parameters (report by Kalle Olavi Niemitalo). + * add control sequences for setting and resetting the values of the + modifyCursorKeys, modifyFunctionKeys and modifyOtherKeys resources. + * add modifyFunctionKeys resource like modifyCursorKeys. Setting this + to zero allows one to use the control- and shift-modifiers to + construct function key strings, for terminals using many function + keys, e.g., for xterm-sun or xterm-sco. + * modify screen responses and function-key logic to reduce the number + of writes made, to make it less likely that an application would + read only part of a function-key in a read operation (suggested by + John E Urbanczyk). + * add combiningChars resource, which allows the user to specify the + maximum number of combining characters that xterm will store for + each cell in wide-character mode (prompted by request by Markus + Kuhn to increase the limit from 2). + * improve logic in metaSendsEscape in case the Alt- and Meta-keys are + mapped to different modifiers. That allows one to use the Alt-key + for shifting in the eightBitInput and use a Meta-key modifier to + prefix the result with an . + * improve modifyCursorKeys logic to prevent it from modifying codes + where eightBitInput or metaSendsEscape are set (request by Dan + Nicolaescu). + * improve modifyCursorKeys logic to prevent it from changing the user + input when other modifiers such as AltGr are used (report by Thomas + Wolff). + * extend modifyCursorKeys to include the numeric keypad when in + application mode. + * improve -reverse (-rv) option (patch by Jason Vas Dias, Redhat + [#189161]). + * workaround for color resources on Fedora-5 which made the toolbar + colors inconsistent. + * corrected calls used for --disable-setuid option, add debugging + traces to help diagnose this area. + * modify configure script to ensure that USE_UTMP_SETGID is defined + only if the check for POSIX saved-ids succeeds, or corresponds to + one of the BSD systems known to have a workable setegid function. + * extend configure check for POSIX saved-ids to include BSD systems + * modify CF_SYSV configure macro to work with gcc on HPUX 10.20, + whose broken relies on including . + * change order of setuid/setgid ifdef checks in Imakefile to make it + simpler to produce a setgid install, allowing the latter to + override the former (prompted by an XFree86 commit). + * adapt a fix for setgid support from subsequent XFree86 changes + (patch by Emanuele Giaquinta). + * further improve setgid support (patches by Emanuele Giaquinta). +* Fri Jul 28 2006 - sndirsch@suse.de +- use "-fno-strict-aliasing" +* Mon Jul 24 2006 - sndirsch@suse.de +- fixed build for X.Org 7 +* Tue Jun 20 2006 - sndirsch@suse.de +- updated to xterm-215 + * various fixes +* Mon Jun 19 2006 - sndirsch@suse.de +- updated to xterm-214 + * various fixes +* Mon May 01 2006 - sndirsch@suse.de +- updated to xterm-213 + * obsoletes utf8-title-resource.patch +* Sat Apr 15 2006 - sndirsch@suse.de +- updated to xterm-212 + * obsoletes p_xterm_dotext-loop.diff +- using new utf8Title resource (Bug #52655) +* Mon Feb 13 2006 - werner@suse.de +- Avouid possible endless loop fix in dotext() at wrapping wide + characters +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Wed Jan 04 2006 - sndirsch@suse.de +- updated to xterm-208 +* Tue Nov 15 2005 - sndirsch@suse.de +- updated to xterm-207 +- adjusted patches +* Thu Oct 06 2005 - mfabian@suse.de +- Bugzilla #49305: add 20x20{ja,ko} fonts generated from + 18x18{ja,ko} with the script "bdf18to20" from the mined package. + This is a workaround to make the popular 10x20 font work with + CJK until xterm is improved to become able to pad fonts + on the fly. +* Mon Sep 19 2005 - sndirsch@suse.de +- updated to xterm-205 + [...] + * modify computation of rows/columns on resize to avoid extending + beyond the given limits, e.g., if resizing in response to a + "maximize" in Gnome or KDE which do not use the window manager + hints for this case (Debian #289123, Novell #61153). + * fixes for Novell #113277: + - specify weight for wide font which may be derived from normal + fontname. + - cache the derived wide- and widebolt-fontnames. +- obsoletes bugzilla-99564.patch +* Sat Aug 27 2005 - sndirsch@suse.de +- added vttest; useful for testing terminals +* Fri Aug 26 2005 - sndirsch@suse.de +- back to xterm-203 + bugzilla-99564.patch (Bug #113277) +* Sun Aug 07 2005 - sndirsch@suse.de +- updated to xterm-204 + [...] + * correct variable used to store temporary result from lookup of + bold font, when initializing the wide-bold-font data and no + immediate match is found by asking for a bold variant of the + wide-font. The result was to use overstriking rather than the + actual bold font (Debian #318162, patch by Eugene Konev). + --> obsoletes mfabian's patch mentioned below +* Mon Aug 01 2005 - mfabian@suse.de +- Bugzilla #99564: fix the problem that bold fonts were not + used unless the resource boldMode was set to "false". +* Wed Jul 27 2005 - werner@suse.de +- Re-enable SIGWINCH for linux even if struct winsize is used, due + to the fact that sometime a sleeping process in the process group + do not get the appropiate information by the ioctl TIOCSWINSZ. +* Wed Jul 13 2005 - sndirsch@suse.de +- updated to xterm-203 +* Fri May 13 2005 - sndirsch@suse.de +- use norootforbuild +* Thu May 12 2005 - meissner@suse.de +- use RPM_OPT_FLAGS +* Tue May 03 2005 - sndirsch@suse.de +- updated to xterm-202 +* Fri Apr 22 2005 - sndirsch@suse.de +- updated to xterm-201 +- adjusted p_xterm-settings.diff +* Thu Mar 24 2005 - sndirsch@suse.de +- added missing xterm/resize manual pages (Bug #74467) +* Sun Feb 06 2005 - sndirsch@suse.de +- updated to xterm-200 +* Fri Jan 28 2005 - sndirsch@suse.de +- updated to xterm-199 +* Fri Jan 14 2005 - sndirsch@suse.de +- updated to xterm-198 +* Thu Dec 02 2004 - sndirsch@suse.de +- p_xterm-config.diff: + * HAVE_LANGINFO_CODESET needs to be set in xtermcfg.h +* Wed Dec 01 2004 - sndirsch@suse.de +- updated to xterm-197: + * obsoletes p_xterm_iutf8.diff, p_xterm_noluit.diff + * adjusted p_xterm-config.diff: OPT_LUIT_PROG/OPT_MINI_LUIT needs + to be set in xtermcfg.h + * updated TODO +* Tue Nov 16 2004 - sndirsch@suse.de +- added missing xterm icon file (terminal.png, converted from + xterm_32x32.xpm included by icewm) +* Tue Oct 26 2004 - sndirsch@suse.de +- added Backarrow2Backspace, Backarrow2Delete, README.SuSE +* Sun Oct 24 2004 - sndirsch@suse.de +- added TODO +* Sat Oct 23 2004 - sndirsch@suse.de +- created package diff --git a/xterm.tar.gz b/xterm.tar.gz new file mode 100644 index 0000000..d65139c --- /dev/null +++ b/xterm.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e55a4746c229c46c046a0098aa9f88fc9527164542f5718971818586e8b61016 +size 804647