Accepting request 183794 from X11:terminals

- Patch #296 - 2013/07/10
  * improve experimental sixel feature (patch by Ross Combs).
  * modify delimiter in configure macro used to add a library
    after a given library to avoid confusion with -Wl
    pass-through options to linker (NetBSD #48031).
  * fix quoting in expression used to trim extra libraries from
    patch #295 changes (report by Thomas Klausner).
- Patch #295 - 2013/07/06
  * adjust order of libraries to work around incomplete symbol
    resolution when using --as-needed option (ArchLinux #36047).
  * minor fix for plink.sh, for IRIX64.
- Patch #294 - 2013/07/05
  * add note in ctlseqs.ms for CPR response pointing out a
    potential point of confusion with the string sent by a
    modified F1 key (suggested by Bram Moolenaar).
  * improve plink.sh by checking if the linker supports the
    --as-needed option (suggested by David Philippi).
  * improve clearing for private mode 1049 when switching to the
    alternate screen (Debian #711758).
  * amend fix from patch #292 by removing now-unneeded chunk
    which introduced problem in selection (Debian #714527).
  * add definition to optionally override compiled-in class for
    xterm from makefile, needed for test-packages.
  * add configure option --enable-sixel-graphics
  * add experimental support for sixel graphics (patch by Ross
    Combs). (forwarded request 183779 from pcerny)

OBS-URL: https://build.opensuse.org/request/show/183794
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=75
This commit is contained in:
Stephan Kulow 2013-07-21 06:13:53 +00:00 committed by Git OBS Bridge
commit 0b50357531
9 changed files with 49 additions and 18 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:64e9c41137eac4277d0cfe04312b12dc5d11224f49fc999ff7f6b9597bf55b7b
size 1093567

3
xterm-296.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:619a6f397b73c19accc72f52e97fabe1dad38030963bfe086091892f07859906
size 1112847

View File

@ -2,7 +2,7 @@
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iEYEABECAAYFAlGj9JkACgkQcCNT4PfkjtsO2gCg17jv2J3vxXRAIsL4iyeB52vn
hywAoMAv8PvBHnkO+vCuq2KeUXMx96ZO
=suhg
iEYEABECAAYFAlHd9CAACgkQcCNT4PfkjtsbSQCgpW498GADyy0y9Rg/asti2PCp
mwsAniXVjNRG20B6hF1H3lsi3WlRsv73
=snwJ
-----END PGP SIGNATURE-----

View File

@ -29,7 +29,7 @@ diff --git a/aclocal.m4 b/aclocal.m4
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5579,20 +5579,20 @@ echo "$as_me:5578: checking for $cf_test
@@ -5581,20 +5581,20 @@ echo "$as_me:5580: checking for $cf_test
echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6
if test "${cf_cv_lib_tgetent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6

View File

@ -3,7 +3,7 @@
diff --git a/XTerm.ad b/XTerm.ad
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -258,16 +258,21 @@
@@ -262,16 +262,21 @@
!*faceSize: 8
! Here is a pattern that is useful for double-clicking on a URL:

View File

@ -116,14 +116,14 @@ diff --git a/XTerm-col.ad b/XTerm-col.ad
diff --git a/XTerm.ad b/XTerm.ad
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -96,31 +96,56 @@
*vtMenu*softreset*Label: Do Soft Reset
*vtMenu*hardreset*Label: Do Full Reset
@@ -98,31 +98,56 @@
*vtMenu*clearsavedlines*Label: Reset and Clear Saved Lines
*vtMenu*tekshow*Label: Show Tek Window
*vtMenu*tekmode*Label: Switch to Tek Mode
*vtMenu*vthide*Label: Hide VT Window
*vtMenu*altscreen*Label: Show Alternate Screen
*vtMenu*sixelScrolling*Label: Sixel Scrolling
*vtMenu*privateColorRegisters*Label: Private Color Registers
+! always use iso10646-1 fonts and luit for non-UTF-8 locales:
+*locale: checkfont
@ -171,7 +171,7 @@ diff --git a/XTerm.ad b/XTerm.ad
-*VT100.font6: 10x20
+!*VT100.font6: 10x20
+*VT100.font6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-100-iso10646-1
+*VT100.wideFont6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-200-iso10646-1
+*VT100.wideFont6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-200-iso10646-1
*fontMenu*fontescape*Label: Escape Sequence
*fontMenu*fontsel*Label: Selection
!fontescape and fontsel overridden by application
@ -180,7 +180,7 @@ diff --git a/XTerm.ad b/XTerm.ad
*fontMenu*font-doublesize*Label: Doublesized Characters
*fontMenu*font-loadable*Label: VT220 Soft Fonts
*fontMenu*font-packed*Label: Packed Font
@@ -130,22 +155,23 @@
@@ -132,22 +157,23 @@
*fontMenu*utf8-title*Label: UTF-8 Titles
*fontMenu*allow-color-ops*Label: Allow Color Ops
@ -210,7 +210,7 @@ diff --git a/XTerm.ad b/XTerm.ad
*tekMenu*tektextsmall*Label: Small Characters
*tekMenu*tekpage*Label: PAGE
*tekMenu*tekreset*Label: RESET
@@ -232,16 +258,72 @@
@@ -234,16 +260,72 @@
!*faceSize: 8
! Here is a pattern that is useful for double-clicking on a URL:
@ -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
@@ -4004,19 +4004,23 @@ This option specifies the font to be use
@@ -4027,19 +4027,23 @@ This option specifies the font to be use
in the \*(``OverTheSpot\*('' input method.
.IP
In \*(``OverTheSpot\*('' preedit type, the preedit (preconversion)

View File

@ -1,7 +1,7 @@
diff --git a/screen.c b/screen.c
--- a/screen.c
+++ b/screen.c
@@ -2183,17 +2183,17 @@ ScreenResize(XtermWidget xw,
@@ -2211,17 +2211,17 @@ ScreenResize(XtermWidget xw,
#ifdef USE_STRUCT_WINSIZE
ts.ws_xpixel = (ttySize_t) width;
ts.ws_ypixel = (ttySize_t) height;

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Fri Jul 12 08:46:01 UTC 2013 - pcerny@suse.com
- Patch #296 - 2013/07/10
* improve experimental sixel feature (patch by Ross Combs).
* modify delimiter in configure macro used to add a library
after a given library to avoid confusion with -Wl
pass-through options to linker (NetBSD #48031).
* fix quoting in expression used to trim extra libraries from
patch #295 changes (report by Thomas Klausner).
- Patch #295 - 2013/07/06
* adjust order of libraries to work around incomplete symbol
resolution when using --as-needed option (ArchLinux #36047).
* minor fix for plink.sh, for IRIX64.
- Patch #294 - 2013/07/05
* add note in ctlseqs.ms for CPR response pointing out a
potential point of confusion with the string sent by a
modified F1 key (suggested by Bram Moolenaar).
* improve plink.sh by checking if the linker supports the
--as-needed option (suggested by David Philippi).
* improve clearing for private mode 1049 when switching to the
alternate screen (Debian #711758).
* amend fix from patch #292 by removing now-unneeded chunk
which introduced problem in selection (Debian #714527).
* add definition to optionally override compiled-in class for
xterm from makefile, needed for test-packages.
* add configure option --enable-sixel-graphics
* add experimental support for sixel graphics (patch by Ross
Combs).
-------------------------------------------------------------------
Tue May 28 13:01:27 UTC 2013 - pcerny@suse.com

View File

@ -52,7 +52,7 @@ Provides: xorg-x11:/usr/X11R6/bin/xterm
%if 0%{?suse_version} > 1210
Requires: luit
%endif
Version: 293
Version: 296
Release: 0
Summary: The basic X terminal program
License: MIT
@ -104,7 +104,6 @@ This package contains the basic X.Org terminal program.
cp -t . %{S:8} %{S:9}
bunzip2 %{basename:%{S:8}} %{basename:%{S:9}}
cd ../vttest-%{vttest_version}
pwd
%patch101 -p1
%build