diff --git a/p_xterm-settings.diff b/p_xterm-settings.diff index d05a67a..794af25 100644 --- a/p_xterm-settings.diff +++ b/p_xterm-settings.diff @@ -228,15 +228,6 @@ Index: xterm-264/xterm.man =================================================================== --- xterm-264.orig/xterm.man +++ xterm-264/xterm.man -@@ -1227,7 +1227,7 @@ Application specific resources (e.g., "\ - Tie the VTxxx \fBbackarrowKey\fP and \fBptyInitialErase\fP resources - together by setting the DECBKM state according to whether the initial value of - \fIstty\fP erase is a backspace (8) or delete (127) character. --The default is \*(``false\*('', which disables this feature. -+The default is \*(``true\*('', which disables this feature. - .TP 8 - .B "fullscreen (\fPclass\fB Fullscreen)" - Specifies whether or not \fIxterm\fP should ask the window manager to @@ -3546,9 +3546,13 @@ It is the XIM server's responsibility to The XIM client must inform the XIM server of the cursor position. For best results, the preedit string must be displayed with a proper font. diff --git a/xterm-279.tgz b/xterm-279.tgz deleted file mode 100644 index 13fbb5f..0000000 --- a/xterm-279.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:350e112f522c90ba0e6c4659001fe46725c2636a9148ed5f0dc495f813cf6278 -size 1009821 diff --git a/xterm-281.tgz b/xterm-281.tgz new file mode 100644 index 0000000..cb0c974 --- /dev/null +++ b/xterm-281.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a777c81736aaca329ef54ef9d0bf5811405986b2afab18417443977f949732fb +size 1044281 diff --git a/xterm-279.tgz.asc b/xterm-281.tgz.asc similarity index 61% rename from xterm-279.tgz.asc rename to xterm-281.tgz.asc index c670de0..6040190 100644 --- a/xterm-279.tgz.asc +++ b/xterm-281.tgz.asc @@ -2,7 +2,7 @@ Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://invisible-island.net/public/public.html for info -iEUEABECAAYFAk+ryqUACgkQcCNT4Pfkjttk0ACfWHjpkA+ktjFSLBpvxKRqMDCl -PvcAmKVO3ozURKnCQicGbbKUNMVEiOk= -=zvQM +iEYEABECAAYFAk/plEcACgkQcCNT4Pfkjts1ZQCeMfBwd+hLPfLW2oNn3NfNijvJ +kLsAn1UBVSEwMLTGKZTZiF2NOC5rEVeW +=+yg2 -----END PGP SIGNATURE----- diff --git a/xterm.changes b/xterm.changes index 79f6cc5..dd90d77 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,70 @@ +------------------------------------------------------------------- +Tue Jul 17 15:13:06 UTC 2012 - pcerny@suse.com + +- Patch #281 - 2012/06/26 + * remove "$(srcdir)/" from install-icon rule to fix builds when + --srcdir configuration option is used. + * fix for configure script's search for icon file when it is + not found in the current directory, e.g., when building out + of tree (patch by Thierry Reding). + * undo the XK_Home / XK_End change from patch #280 which broke + the non-VT220 keyboard for those keys (report by H Merijn + Brand). +- Patch #280 - 2012/06/24 + * add configure check to work around warning from + desktop-file-install for "Encoding", noting that it emits + deprecation warnings without providing its version + information. + * add configure option --with-icon-theme to tell xterm whether + to install into an icon theme, defaulting to "hicolor" + (Redhat #755206, #799614 and #804279). + * change --with-icondir to look for "icons" directory rather + than "pixmaps" by default. Add new option --with-pixmapdir to + allow these two uses to be installed concurrently. + * modify configure options --with-app-defaults and + --with-icondir to accept "auto" as value to look for existing + directory from well-known locations. + * add missing codes for secondary DA response which tell the + type of terminal as in the primary DA response. + * update primary DA response for VT420 to include user windows + and horizontal scrolling. + * add modifyKeyboard resource to support keypad-modifier + changes per request by Thomas Wolff. + * add XK_Home / XK_End to editing-keypad checks + * add back-tab key kB to termcap entries to match the terminfo. + * update terminfo to match corresponding entries in ncurses, + e.g., add XT and adjust sgr string for xterm-bold entry. + * add configure options to predefine the most commonly + customized resources for terminal-settings, use those to + substitute into the manpage the corresponding compiled-in + values: altSendsEscape, backarrowKey, backarrowKeyIsErase, + deleteIsDEL, metaSendsEscape (Redhat #819588). + * change default emulation level to VT420 (discussion with + Ailin Nemui). + * improve logic for DECSCL; patch 279 partly enforced + limitation of this to higher-level emulations. This patch + finishes that change. + * improve check for base of combining characters, preventing + combination when cursor movement has intervened. Mosh's + webpage gives two different examples of this, with other + causes ascribed to the behavior. + * modify IL/DL to set cursor to first column on row for better + VT102/VT220 compatibility (prompted by code review of mosh). + * separate state-table entries for DECSC/DECRC from the + ANSI.SYS save/restore cursor, since the latter conflicts with + DECSLRM when DECLRMM is enabled since patch #279 + (report/analysis by Ailin Nemui). + * fixes to avoid using SIGCHLD handler of main program in + printer's subprocess (report by Joe Julian). + * correct restore-parameter for mouse-modes from patch #279 + changes. + * add null-pointer checks to input-method caching added in + patch #277 to fix a problem in the exposure code, when + deselecting a window (report by Kriston Rehberg). + * unset DESKTOP_STARTUP_ID environment variable to lessen + confusion on the part of GTK applications which use the + variable without checking it (report by John Little). + ------------------------------------------------------------------- Tue Jun 26 08:58:16 UTC 2012 - sndirsch@suse.com diff --git a/xterm.spec b/xterm.spec index ab9958a..3847e5a 100644 --- a/xterm.spec +++ b/xterm.spec @@ -44,7 +44,7 @@ Provides: xorg-x11:/usr/X11R6/bin/xterm %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 279 +Version: 281 Release: 0 Summary: The basic X terminal program License: MIT @@ -114,6 +114,7 @@ bunzip2 *.bdf.bz2 --x-includes=/usr/X11R6/include \ --x-libraries=/usr/X11R6/%{_lib} \ %endif + --enable-backarrow-is-erase \ make %{?_smp_mflags}