From b0b66e6803d7cbc54108766a44a74787d3790817d8e83ab8cda7a39ce3c62f1f Mon Sep 17 00:00:00 2001 From: Petr Cerny Date: Fri, 27 Sep 2013 13:48:16 +0000 Subject: [PATCH] Accepting request 201124 from home:pcerny:factory - Patch #297 - 2013/09/10 OBS-URL: https://build.opensuse.org/request/show/201124 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=82 --- xterm-296.tgz | 3 -- xterm-297.tgz | 3 ++ xterm-296.tgz.asc => xterm-297.tgz.asc | 6 +-- xterm-double_width_fonts.patch | 2 +- xterm-forbid_window_and_font_ops.patch | 2 +- xterm-settings.patch | 2 +- xterm.changes | 59 ++++++++++++++++++++++++++ xterm.spec | 18 ++++---- 8 files changed, 77 insertions(+), 18 deletions(-) delete mode 100644 xterm-296.tgz create mode 100644 xterm-297.tgz rename xterm-296.tgz.asc => xterm-297.tgz.asc (61%) diff --git a/xterm-296.tgz b/xterm-296.tgz deleted file mode 100644 index 6f27ced..0000000 --- a/xterm-296.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:619a6f397b73c19accc72f52e97fabe1dad38030963bfe086091892f07859906 -size 1112847 diff --git a/xterm-297.tgz b/xterm-297.tgz new file mode 100644 index 0000000..c957cbf --- /dev/null +++ b/xterm-297.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2dc32a9a8401a2d3d2ae99844ba9cd9f81f0bc930870ebef783a9bcf165d179 +size 1119462 diff --git a/xterm-296.tgz.asc b/xterm-297.tgz.asc similarity index 61% rename from xterm-296.tgz.asc rename to xterm-297.tgz.asc index 9872a87..88c1825 100644 --- a/xterm-296.tgz.asc +++ b/xterm-297.tgz.asc @@ -2,7 +2,7 @@ Version: GnuPG v1.4.10 (GNU/Linux) Comment: See http://invisible-island.net/public/public.html for info -iEYEABECAAYFAlHd9CAACgkQcCNT4PfkjtsbSQCgpW498GADyy0y9Rg/asti2PCp -mwsAniXVjNRG20B6hF1H3lsi3WlRsv73 -=snwJ +iEYEABECAAYFAlIvwGoACgkQcCNT4PfkjtshiQCgnX38BE9EbEKW5xyqfIq+pDRa +nBkAnA6GxuL7m9Lr1u550pWCAefypMv/ +=IH8N -----END PGP SIGNATURE----- diff --git a/xterm-double_width_fonts.patch b/xterm-double_width_fonts.patch index 114b12e..1c41dea 100644 --- a/xterm-double_width_fonts.patch +++ b/xterm-double_width_fonts.patch @@ -30,7 +30,7 @@ diff --git a/fontutils.c b/fontutils.c #define FULL_WIDTH_CHAR2 0xAC00 /* Korean script syllable 'Ka' */ static Bool - is_double_width_font_xft(Display * dpy, XftFont * font) + is_double_width_font_xft(Display *dpy, XftFont * font) { - XGlyphInfo gi1, gi2; - FcChar32 c1 = HALF_WIDTH_CHAR1, c2 = HALF_WIDTH_CHAR2; diff --git a/xterm-forbid_window_and_font_ops.patch b/xterm-forbid_window_and_font_ops.patch index 4c85424..1f5764c 100644 --- a/xterm-forbid_window_and_font_ops.patch +++ b/xterm-forbid_window_and_font_ops.patch @@ -3,7 +3,7 @@ diff --git a/XTerm.ad b/XTerm.ad --- a/XTerm.ad +++ b/XTerm.ad -@@ -262,16 +262,21 @@ +@@ -260,16 +260,21 @@ !*faceSize: 8 ! Here is a pattern that is useful for double-clicking on a URL: diff --git a/xterm-settings.patch b/xterm-settings.patch index 8d77ecd..63a6b98 100644 --- a/xterm-settings.patch +++ b/xterm-settings.patch @@ -286,7 +286,7 @@ diff --git a/XTerm.ad b/XTerm.ad diff --git a/xterm.man b/xterm.man --- a/xterm.man +++ b/xterm.man -@@ -4027,19 +4027,23 @@ This option specifies the font to be use +@@ -4032,19 +4032,23 @@ This option specifies the font to be use in the \*(``OverTheSpot\*('' input method. .IP In \*(``OverTheSpot\*('' preedit type, the preedit (preconversion) diff --git a/xterm.changes b/xterm.changes index 3b6789a..b9dd016 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Fri Sep 20 08:57:18 UTC 2013 - pcerny@suse.com + +- Patch #297 - 2013/09/10 + * modify check for missing cells in bitmap font to work around + terminus 10646 encoding, which is mostly missing, add + assumeAllChars resource to provide the older behavior. + * modify macros used to check for missing cells in bitmap fonts + to pick up a long-overlooked improvement made to xfd in + XFree86. + * improve workaround for groff versus ASCII-equivalents; patch + #185 had overlooked Xft configuration (reported by anonymous + user on Arch Linux forum). + * review/extend DECNRCM support (prompted by report by Hayaki + Saito asking about the two "A" codes). + + make pasting of DECNRCM data work by translating the pasted + data into the selected encoding. + + limit mode changes to VT220 and up. + + ignore SCS for National Replacement Characters if DECNRCM + is not set. + + add tables and logic to decode SCS controls ending with "%" + and one additional character. This expects the parsing of + SCS to VT320. + + also added parsing for SCS of DEC Supplemental and DEC + Technical, which are for VT2xx and VT3xx respectively. + + implement VT220 Multinational character set "GR" aka "DEC + Supplemental Graphic". + + DEC Technical character set based on vt100.net description. + + implement Portuguese NRC. + + provide for temporarily switching to/from NRC mode from + UTF-8 mode when DECNRCM is set or reset. + * minor fix to assert's found while testing examples from + ttdoda's slrm-test1.txt. + * modify DECLRMM to not update the cursor position (report by + Iwamoto Kouichi forwarded by Hayaki Saito). + * modify cursor-position report to take origin-mode into account + (report by Hayaki Saito, see also iTerm2 pull request 129). + * correct off-by-one comparison in when handling carriage-return + at left margin (patch by Iwamoto Kouichi, forwarded by Hayaki + Saito). + * improve handling of faceName resource when a "size=" property + is embedded in it, by using that size to replace the default + faceSize resource. This lets xterm honor the other faceSize + resources (report by Jens Schweikhardt). + * improve OSC 52 selection-data by setting its timestamp to + correspond to the most-recent event received by xterm, to + ensure that calls to XtOwnSelect succeed even if the selection + is manipulated solely through the keyboard (prompted by patch + by Richard Tollerton). + * change configure-script defaults for "luit" and "wide-chars" + options to match the values used in the imake configuration, + to lessen user surprise if they are accustomed to building + xterm using imake(report by Andries E Brouwer). + * improve the imake-related configuration's check if xterm is + started in a locale that uses UTF-8 encoding. Before, this + checked the locale settings only for "UTF-8", now it checks + ignoring case for "UTF-8" and "UTF-8" (report by Andries E + Brouwer). + ------------------------------------------------------------------- Fri Jul 12 08:46:01 UTC 2013 - pcerny@suse.com diff --git a/xterm.spec b/xterm.spec index db154e8..88f1f76 100644 --- a/xterm.spec +++ b/xterm.spec @@ -52,7 +52,7 @@ Provides: xorg-x11:/usr/X11R6/bin/xterm %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 296 +Version: 297 Release: 0 Summary: The basic X terminal program License: MIT @@ -64,7 +64,7 @@ Source3: Backarrow2Delete Source4: Backarrow2BackSpace Source5: README.SuSE Source6: terminal.png -Source11: %{name}.keyring +Source11: xterm.keyring Source8: 20x20ja.bdf.bz2 Source9: 20x20ko.bdf.bz2 # Snoop for the escape sequence assignment of the keypad @@ -72,13 +72,13 @@ Source20: snooper.tar.bz2 %define vttest_version 20120506 Source100: ftp://invisible-island.net/vttest/vttest-%{vttest_version}.tgz Source101: ftp://invisible-island.net/vttest/vttest-%{vttest_version}.tgz.asc -Patch1: %{name}-settings.patch -Patch2: %{name}-sigwinch.patch -Patch3: %{name}-double_width_fonts.patch -Patch4: %{name}-desktop_file_icon.patch -Patch5: %{name}-forbid_window_and_font_ops.patch -Patch6: %{name}-enable_libtinfo.patch -Patch7: %{name}-allow_iso-utf_fonts_in_menu.patch +Patch1: xterm-settings.patch +Patch2: xterm-sigwinch.patch +Patch3: xterm-double_width_fonts.patch +Patch4: xterm-desktop_file_icon.patch +Patch5: xterm-forbid_window_and_font_ops.patch +Patch6: xterm-enable_libtinfo.patch +Patch7: xterm-allow_iso-utf_fonts_in_menu.patch Patch101: vttest-config_update_aarch64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1220