Accepting request 357879 from X11:terminals

- Patch #322 - 2016/01/02
  * fix regression due to incorrect fix for compiler warning when
    allocating storage for /etc/shells (reports by Ashish Shukla,
    Debian #809646).
- Patch #321 - 2015/12/31
  * add resource keepClipboard, escape sequence and action
    keep-clipboard.
  * add optional feature to capture text copied to clipboard at
    the time of copying rather than at the time the clipboard
    contents are requested for pasting (patch by Milan Mehner).
  * improve a special case where the -e option was used to pass a
    single-quoted command via luit, by wrapping it in a “sh -c”
    (report by Keith Hedger).
  * minor fix for type-cleanliness when allocating storage for
    /etc/shells (Tobias Stoeckmann).
  * fix a typo in manual page (Dan Church).
  * fix minor file-descriptor leak; after calling openpty, the
    slave's file descriptor is not needed (report by Juha
    Nurmela).
  * editorial change to ctlseqs.ms (report by David Gomboc).
  * minor updates for autoconf macros.
  * update config.guess, config.sub
- vttest 20140305
  * save/restore color enable-flag for menu 11.6 in a couple of
    places so that the ISO-6429 tests do not reset it
    unexpectedly.
  * amend the REP test to not reset colors if it happens to be
    run via the menu entry for BCE-related tests.
- vttest 20140116
  * cosmetic changes (suggested by Itay Chamiel):

OBS-URL: https://build.opensuse.org/request/show/357879
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=101
This commit is contained in:
Dominique Leuenberger 2016-02-09 15:48:54 +00:00 committed by Git OBS Bridge
commit 526090b344
14 changed files with 111 additions and 1276 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c03e8e917ab5b06f934c45923dd00a5943c6b36f0a32c38392f8f864d6b39e4
size 183236

View File

@ -1,8 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iEYEABECAAYFAk+rpHQACgkQcCNT4Pfkjtt2KgCeLkIwuDbYoTO2r0UauEXboky5
J2UAoNfjMijbUJkSRHPtskPFQe6V6aeN
=5dbV
-----END PGP SIGNATURE-----

3
vttest-20140305.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0168aa34061d4470a68b0dd0781a2a9e2bbfb1493e540c99f615b867a11cbf83
size 191096

View File

@ -2,7 +2,7 @@
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iEYEABECAAYFAlXgJ7AACgkQcCNT4PfkjttziACcCOTpoRfcT0KH+OkRjxUMopJ2
4FgAoMYoh3nfy72sQbMm34QZ7WeMsdiX
=veBo
iEYEABECAAYFAlMXzngACgkQcCNT4PfkjtsjRwCgwcGPm3a1Yal7TWz7A9HNP/co
3MYAniUiDBh4nZHMFaIHWT6NRW9BFaTC
=VFaU
-----END PGP SIGNATURE-----

File diff suppressed because it is too large Load Diff

View File

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

3
xterm-322.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9adb41b53f76a3fccaa65d47a87d336094a523985d1d6a6b8cc468375ed109d6
size 1227531

8
xterm-322.tgz.asc Normal file
View File

@ -0,0 +1,8 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iEYEABECAAYFAlaH5UUACgkQcCNT4PfkjtsJZwCgyAibyoxr1v0AlzBgdOEwFEA/
LLsAoJhEC2Lg3Fy8kzIetMfi+kMqx/LP
=l5ij
-----END PGP SIGNATURE-----

View File

@ -21,7 +21,7 @@ Signed-off-by: Egbert Eich <eich@suse.de>
diff --git a/misc.c b/misc.c
--- a/misc.c
+++ b/misc.c
@@ -2216,16 +2216,18 @@ ReportAnsiColorRequest(XtermWidget xw, i
@@ -2227,16 +2227,18 @@ ReportAnsiColorRequest(XtermWidget xw, i
}
static void

View File

@ -22,14 +22,14 @@ diff --git a/aclocal.m4 b/aclocal.m4
fi
for cf_termlib in '' $cf_TERMLIB ; do
LIBS="$cf_save_LIBS"
test -n "$cf_termlib" && CF_ADD_LIB($cf_termlib)
test -n "$cf_termlib" && { CF_ADD_LIB($cf_termlib) }
AC_TRY_RUN([
/* terminfo implementations ignore the buffer argument, making it useless for
* the xterm application, which uses this information to make a new TERMCAP
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5559,20 +5559,20 @@ echo "$as_me:5558: checking for $cf_test
@@ -5562,20 +5562,20 @@ echo "$as_me:5561: 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
@ -48,7 +48,7 @@ diff --git a/configure b/configure
fi
for cf_termlib in '' $cf_TERMLIB ; do
LIBS="$cf_save_LIBS"
test -n "$cf_termlib" &&
test -n "$cf_termlib" && {
cf_add_libs="-l$cf_termlib"
# Filter out duplicates - this happens with badly-designed ".pc" files...
for cf_add_1lib in $LIBS

View File

@ -28,7 +28,7 @@ diff --git a/XTerm.ad b/XTerm.ad
diff --git a/xterm.man b/xterm.man
--- a/xterm.man
+++ b/xterm.man
@@ -1894,17 +1894,17 @@ The default is \*(``false\*(''.
@@ -1896,17 +1896,17 @@ The default is \*(``false\*(''.
.TP
.B "allowColorOps (\fPclass\fB AllowColorOps)"
Specifies whether control sequences that set/query the dynamic colors should be allowed.

View File

@ -284,7 +284,7 @@ diff --git a/XTerm.ad b/XTerm.ad
diff --git a/xterm.man b/xterm.man
--- a/xterm.man
+++ b/xterm.man
@@ -4267,19 +4267,23 @@ This option specifies the font to be use
@@ -4275,19 +4275,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,3 +1,88 @@
-------------------------------------------------------------------
Mon Jan 25 10:58:33 UTC 2016 - pcerny@suse.com
- Patch #322 - 2016/01/02
* fix regression due to incorrect fix for compiler warning when
allocating storage for /etc/shells (reports by Ashish Shukla,
Debian #809646).
- Patch #321 - 2015/12/31
* add resource keepClipboard, escape sequence and action
keep-clipboard.
* add optional feature to capture text copied to clipboard at
the time of copying rather than at the time the clipboard
contents are requested for pasting (patch by Milan Mehner).
* improve a special case where the -e option was used to pass a
single-quoted command via luit, by wrapping it in a “sh -c”
(report by Keith Hedger).
* minor fix for type-cleanliness when allocating storage for
/etc/shells (Tobias Stoeckmann).
* fix a typo in manual page (Dan Church).
* fix minor file-descriptor leak; after calling openpty, the
slave's file descriptor is not needed (report by Juha
Nurmela).
* editorial change to ctlseqs.ms (report by David Gomboc).
* minor updates for autoconf macros.
* update config.guess, config.sub
- vttest 20140305
* save/restore color enable-flag for menu 11.6 in a couple of
places so that the ISO-6429 tests do not reset it
unexpectedly.
* amend the REP test to not reset colors if it happens to be
run via the menu entry for BCE-related tests.
- vttest 20140116
* cosmetic changes (suggested by Itay Chamiel):
+ clear screen just before resetting SCS in menu #3 character
sets, in case a VT100 emulator does not simply ignore VT220
G2/G3 selections when it does not implement them.
+ add check for maximum operating level before deciding
whether to send a DECSCL to set it to VT100-level.
+ adjust starting point of items for menu #9 "Test of known
bugs" to avoid overwriting part of the description of the
test.
* add configure check for -Wlogical-op to gcc-warnings
* update config.guess, config.sub
- vttest 20130915
* when NRCS is active, suppress ISO Latin-1 from menu to avoid
confusion with British NRCS.
* do not highlight ISO Latin-1 for NRCS, since it is a
96-character set, not applicable to NRCS.
* correct position of ruler for SD and REP screens, which
obscured the result.
* expand menu 11.6.6 to demonstrate bce with top-level menus 1
and 2 in addition to the existing menu 8.
* correct description for DA response 24; it denotes VT320.
* correct highlighting for French NRC mapping; "`" is not
mapped.
* add port-files from FreeBSD for test-builds.
* add highlighting information for VT320 Portuguese NRC
mapping.
* add highlighting information for VT220 DEC Supplemental NRC
mapping.
* updated configure-macros to add msys changes from ncurses
20130907.
* update config.guess, config.sub
- vttest 20130818
* modify character-sets screens to optionally highlight the
characters which do not correspond to ISO-8859-1. This makes
the National Replacement Characters easier to see.
* modify DSR cursor-position report to check if the terminal
accounts for origin-mode.
* support --datarootdir option in makefile.in, to match
configure script updates.
* updated configure macros:
+ change from byacc for autoheader
+ improved checks for gcc attributes
+ improved checks for gcc version
+ miscellaneous fixes in CF_XOPEN_SOURCE
* update config.guess, config.sub
- vttest 20120603
* change cursor-position before IL/DL in "Test of VT102-style
features with BCE (Insert/Delete Char/Line)" to demonstrate
whether the terminal sets the cursor to the first column as a
side-effect, as noted in VT220 reference manual.
- remove vttest-config_update_aarch64.patch since the current
vttest sports newer config version
-------------------------------------------------------------------
Wed Sep 2 13:50:49 UTC 2015 - pcerny@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package xterm
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,10 +16,10 @@
#
%define vttest_version 20120506
%define vttest_version 20140305
%define splitbin 0%{?suse_version} >= 1300
Name: xterm
Version: 320
Version: 322
Release: 0
Summary: The basic X terminal program
License: MIT
@ -48,7 +48,6 @@ Patch6: xterm-enable_libtinfo.patch
Patch7: xterm-allow_iso-utf_fonts_in_menu.patch
Patch8: xterm-decomposed_bitmaps.patch
Patch9: xterm-desktop-item-in-gnome-utilities-appfolder.patch
Patch101: vttest-config_update_aarch64.patch
BuildRequires: freetype2-devel
BuildRequires: ncurses-devel
BuildRequires: update-desktop-files
@ -115,7 +114,6 @@ This package contains the basic X.Org terminal program.
cp -t . %{SOURCE8} %{SOURCE9}
bunzip2 %{basename:%{SOURCE8}} %{basename:%{SOURCE9}}
cd ../vttest-%{vttest_version}
%patch101 -p1
%build
# suse 10.x uses older X11 directory structure