From 1d460603982049cf7b618d9e66c2bf9a5cabcf7425c4e0269868de808f95ff95 Mon Sep 17 00:00:00 2001 From: Petr Cerny Date: Mon, 14 Mar 2016 11:25:23 +0000 Subject: [PATCH] Accepting request 372759 from home:pcerny:factory - Patch #324 - 2016/03/10 * updated configure macro CF_LD_RPATH_OPT from ncurses changes. * provide alternate fix for Juha Nurmela's report by turning on POSIX signals if _POSIX_C_SOURCE is at least one. This is done to improve the behavior if a direct child process receives a STOP signal. * revert change to CF_POSIX_C_SOURCE from patch #323 (reports by Ashish Shukla, Christian Weisgerber). - Patch #323 - 2016/03/07 * updated appdata and desktop files to add keywords (report by Richard Hughes). * modify configure macro CF_POSIX_C_SOURCE to accommodate some systems, e.g., FreeBSD, which have separated their implementation specific preprocessor symbols from the POSIX ones, requiring both to be defined (report by Juha Nurmela). * change the directory to the current working dir of the child process in exec-formatted and exec-selectable actions (patch by Alexander Pohoyda). * correct typo in xterm.man (patch by Larry Hynes). * correct typo in ctlseqs.ms (report by Shriramana Sharma). * add feature to support XHTML and SVG screen dumps (patch by Jens Schweikhardt). * correct response to DECRQSS when terminal id is less than 400 (patch by Iwamoto Kouichi). OBS-URL: https://build.opensuse.org/request/show/372759 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=138 --- xterm-322.tgz | 3 -- xterm-324.tgz | 3 ++ xterm-322.tgz.asc => xterm-324.tgz.asc | 6 ++-- xterm-decomposed_bitmaps.patch | 2 +- ...op-item-in-gnome-utilities-appfolder.patch | 3 +- xterm-desktop_file_icon.patch | 3 +- xterm-enable_libtinfo.patch | 2 +- xterm-forbid_window_and_font_ops.patch | 2 +- xterm-settings.patch | 6 ++-- xterm.changes | 28 +++++++++++++++++++ xterm.spec | 2 +- 11 files changed, 45 insertions(+), 15 deletions(-) delete mode 100644 xterm-322.tgz create mode 100644 xterm-324.tgz rename xterm-322.tgz.asc => xterm-324.tgz.asc (61%) diff --git a/xterm-322.tgz b/xterm-322.tgz deleted file mode 100644 index 7f78f8f..0000000 --- a/xterm-322.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9adb41b53f76a3fccaa65d47a87d336094a523985d1d6a6b8cc468375ed109d6 -size 1227531 diff --git a/xterm-324.tgz b/xterm-324.tgz new file mode 100644 index 0000000..a46902b --- /dev/null +++ b/xterm-324.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70ecbec8d27789248e8ae2dc2cf159a2e189c152a6559a2b3df7f4838da36092 +size 1235312 diff --git a/xterm-322.tgz.asc b/xterm-324.tgz.asc similarity index 61% rename from xterm-322.tgz.asc rename to xterm-324.tgz.asc index 062be33..47346fd 100644 --- a/xterm-322.tgz.asc +++ b/xterm-324.tgz.asc @@ -2,7 +2,7 @@ Version: GnuPG v1.4.12 (GNU/Linux) Comment: See http://invisible-island.net/public/public.html for info -iEYEABECAAYFAlaH5UUACgkQcCNT4PfkjtsJZwCgyAibyoxr1v0AlzBgdOEwFEA/ -LLsAoJhEC2Lg3Fy8kzIetMfi+kMqx/LP -=l5ij +iEYEABECAAYFAlbiJ3EACgkQcCNT4PfkjtsEDgCeLfgBsVZ9iqLQMJFpR9XcA2jG +JTEAoMlCIifKHIRmJaI00yebiGFQjuZa +=q4ft -----END PGP SIGNATURE----- diff --git a/xterm-decomposed_bitmaps.patch b/xterm-decomposed_bitmaps.patch index 7d7d28c..4f84ec1 100644 --- a/xterm-decomposed_bitmaps.patch +++ b/xterm-decomposed_bitmaps.patch @@ -21,7 +21,7 @@ Signed-off-by: Egbert Eich diff --git a/misc.c b/misc.c --- a/misc.c +++ b/misc.c -@@ -2227,16 +2227,18 @@ ReportAnsiColorRequest(XtermWidget xw, i +@@ -2237,16 +2237,18 @@ ReportAnsiColorRequest(XtermWidget xw, i } static void diff --git a/xterm-desktop-item-in-gnome-utilities-appfolder.patch b/xterm-desktop-item-in-gnome-utilities-appfolder.patch index afced08..a299f09 100644 --- a/xterm-desktop-item-in-gnome-utilities-appfolder.patch +++ b/xterm-desktop-item-in-gnome-utilities-appfolder.patch @@ -4,7 +4,7 @@ shell application overview. diff --git a/xterm.desktop b/xterm.desktop --- a/xterm.desktop +++ b/xterm.desktop -@@ -34,9 +34,9 @@ +@@ -34,10 +34,10 @@ Name=XTerm #GenericName=Terminal Comment=standard terminal emulator for the X window system @@ -15,3 +15,4 @@ diff --git a/xterm.desktop b/xterm.desktop Icon=terminal -Categories=System;TerminalEmulator; +Categories=System;TerminalEmulator;X-GNOME-Utilities; + Keywords=shell;prompt;command;commandline;cmd; diff --git a/xterm-desktop_file_icon.patch b/xterm-desktop_file_icon.patch index 2cc6740..c767241 100644 --- a/xterm-desktop_file_icon.patch +++ b/xterm-desktop_file_icon.patch @@ -3,7 +3,7 @@ diff --git a/xterm.desktop b/xterm.desktop --- a/xterm.desktop +++ b/xterm.desktop -@@ -33,10 +33,10 @@ +@@ -33,11 +33,11 @@ [Desktop Entry] Name=XTerm #GenericName=Terminal @@ -15,3 +15,4 @@ diff --git a/xterm.desktop b/xterm.desktop -Icon=xterm-color_48x48 +Icon=terminal Categories=System;TerminalEmulator; + Keywords=shell;prompt;command;commandline;cmd; diff --git a/xterm-enable_libtinfo.patch b/xterm-enable_libtinfo.patch index 7b5cebc..c8313e2 100644 --- a/xterm-enable_libtinfo.patch +++ b/xterm-enable_libtinfo.patch @@ -29,7 +29,7 @@ diff --git a/aclocal.m4 b/aclocal.m4 diff --git a/configure b/configure --- a/configure +++ b/configure -@@ -5562,20 +5562,20 @@ echo "$as_me:5561: checking for $cf_test +@@ -5444,20 +5444,20 @@ echo "$as_me:5443: 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 diff --git a/xterm-forbid_window_and_font_ops.patch b/xterm-forbid_window_and_font_ops.patch index d863c0b..ef3c321 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 -@@ -260,16 +260,21 @@ +@@ -262,16 +262,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 9ae4265..cfecf38 100644 --- a/xterm-settings.patch +++ b/xterm-settings.patch @@ -116,7 +116,7 @@ diff --git a/XTerm-col.ad b/XTerm-col.ad diff --git a/XTerm.ad b/XTerm.ad --- a/XTerm.ad +++ b/XTerm.ad -@@ -98,31 +98,56 @@ +@@ -100,31 +100,56 @@ *vtMenu*clearsavedlines*Label: Reset and Clear Saved Lines *vtMenu*tekshow*Label: Show Tek Window *vtMenu*tekmode*Label: Switch to Tek Mode @@ -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 -@@ -132,22 +157,23 @@ +@@ -134,22 +159,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 -@@ -234,16 +260,70 @@ +@@ -236,16 +262,70 @@ !*faceSize: 8 ! Here is a pattern that is useful for double-clicking on a URL: diff --git a/xterm.changes b/xterm.changes index 0b90ecd..f726c38 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Mar 14 11:18:47 UTC 2016 - pcerny@suse.com + +- Patch #324 - 2016/03/10 + * updated configure macro CF_LD_RPATH_OPT from ncurses changes. + * provide alternate fix for Juha Nurmela's report by turning on + POSIX signals if _POSIX_C_SOURCE is at least one. This is + done to improve the behavior if a direct child process + receives a STOP signal. + * revert change to CF_POSIX_C_SOURCE from patch #323 + (reports by Ashish Shukla, Christian Weisgerber). +- Patch #323 - 2016/03/07 + * updated appdata and desktop files to add keywords (report by + Richard Hughes). + * modify configure macro CF_POSIX_C_SOURCE to accommodate some + systems, e.g., FreeBSD, which have separated their + implementation specific preprocessor symbols from the POSIX + ones, requiring both to be defined (report by Juha Nurmela). + * change the directory to the current working dir of the child + process in exec-formatted and exec-selectable actions (patch + by Alexander Pohoyda). + * correct typo in xterm.man (patch by Larry Hynes). + * correct typo in ctlseqs.ms (report by Shriramana Sharma). + * add feature to support XHTML and SVG screen dumps (patch by + Jens Schweikhardt). + * correct response to DECRQSS when terminal id is less than 400 + (patch by Iwamoto Kouichi). + ------------------------------------------------------------------- Mon Jan 25 10:58:33 UTC 2016 - pcerny@suse.com diff --git a/xterm.spec b/xterm.spec index ffa08c6..cc5e0cf 100644 --- a/xterm.spec +++ b/xterm.spec @@ -19,7 +19,7 @@ %define vttest_version 20140305 %define splitbin 0%{?suse_version} >= 1300 Name: xterm -Version: 322 +Version: 324 Release: 0 Summary: The basic X terminal program License: MIT