From c4b3e375f03ced6ead632f117da9dffcc921213e12bb13e8c1d99a6236dc6758 Mon Sep 17 00:00:00 2001 From: Petr Cerny Date: Wed, 16 Jul 2014 15:35:06 +0000 Subject: [PATCH] Accepting request 241234 from home:pcerny:factory - Patch #309 - 2014/07/13 * modify configure script to work around debris left by XQuartz upgrades. * modify test-package scripts to enable ReGIS graphics. * improvements/additions to ReGIS graphics, e.g., drawing text (Ross Comb). * add --with-Xaw3dxft, to link with Xaw 3d xft library (Stephen P Wall). * amend reset for cursor-shape to take into account cursorUnderline resource (report by Christian Weisgerber). * update config.guess, config.sub OBS-URL: https://build.opensuse.org/request/show/241234 OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=103 --- xterm-308.tgz | 3 --- xterm-309.tgz | 3 +++ xterm-308.tgz.asc => xterm-309.tgz.asc | 6 +++--- xterm-double_width_fonts.patch | 2 +- xterm-enable_libtinfo.patch | 12 ++++++------ xterm-sigwinch.patch | 2 +- xterm.changes | 15 +++++++++++++++ xterm.spec | 2 +- 8 files changed, 30 insertions(+), 15 deletions(-) delete mode 100644 xterm-308.tgz create mode 100644 xterm-309.tgz rename xterm-308.tgz.asc => xterm-309.tgz.asc (61%) diff --git a/xterm-308.tgz b/xterm-308.tgz deleted file mode 100644 index c3d9238..0000000 --- a/xterm-308.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5bf7377a5bf35e34b7e3a4ab6c848fbc89e8901dd98f8b237662a72bdbfe372 -size 1165428 diff --git a/xterm-309.tgz b/xterm-309.tgz new file mode 100644 index 0000000..85ee9d6 --- /dev/null +++ b/xterm-309.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56b161c96307b491489e8065e7d3d34932b9967cc2b500e84e1955a42968b16f +size 1184187 diff --git a/xterm-308.tgz.asc b/xterm-309.tgz.asc similarity index 61% rename from xterm-308.tgz.asc rename to xterm-309.tgz.asc index f34ffc9..87dfd6b 100644 --- a/xterm-308.tgz.asc +++ b/xterm-309.tgz.asc @@ -2,7 +2,7 @@ Version: GnuPG v1.4.10 (GNU/Linux) Comment: See http://invisible-island.net/public/public.html for info -iEYEABECAAYFAlOjetMACgkQcCNT4PfkjtvDfwCeJFlDBUbFv+lRM7C/QgiOlqzF -W1AAoKX0FPu8baIjh9lQ5eYPGkkRblmC -=bXT3 +iEYEABECAAYFAlPDAPsACgkQcCNT4PfkjtslRACeI58SKIhtQQwZM8HTX7QudEos +QNcAoI5N4fGRbxZS2tpQeHGrvd7tYKb7 +=bIPB -----END PGP SIGNATURE----- diff --git a/xterm-double_width_fonts.patch b/xterm-double_width_fonts.patch index 956aaf0..5699a8c 100644 --- a/xterm-double_width_fonts.patch +++ b/xterm-double_width_fonts.patch @@ -1,7 +1,7 @@ diff --git a/fontutils.c b/fontutils.c --- a/fontutils.c +++ b/fontutils.c -@@ -672,77 +672,29 @@ is_double_width_font(XFontStruct *fs) +@@ -702,77 +702,29 @@ is_double_width_font(XFontStruct *fs) { return ((2 * fs->min_bounds.width) == fs->max_bounds.width); } diff --git a/xterm-enable_libtinfo.patch b/xterm-enable_libtinfo.patch index 5e6e70b..5387c71 100644 --- a/xterm-enable_libtinfo.patch +++ b/xterm-enable_libtinfo.patch @@ -3,7 +3,7 @@ diff --git a/aclocal.m4 b/aclocal.m4 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -743,20 +743,20 @@ if test "$cf_full_tgetent" = yes ; then +@@ -761,20 +761,20 @@ if test "$cf_full_tgetent" = yes ; then else cf_test_message="tgetent" fi @@ -29,7 +29,7 @@ diff --git a/aclocal.m4 b/aclocal.m4 diff --git a/configure b/configure --- a/configure +++ b/configure -@@ -5586,20 +5586,20 @@ echo "$as_me:5585: checking for $cf_test +@@ -5587,20 +5587,20 @@ echo "$as_me:5586: 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" && LIBS="-l$cf_termlib $LIBS" - if test "$cross_compiling" = yes; then - echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5 - else + 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 diff --git a/xterm-sigwinch.patch b/xterm-sigwinch.patch index 9206816..57b99df 100644 --- a/xterm-sigwinch.patch +++ b/xterm-sigwinch.patch @@ -1,7 +1,7 @@ diff --git a/screen.c b/screen.c --- a/screen.c +++ b/screen.c -@@ -2246,17 +2246,17 @@ ScreenResize(XtermWidget xw, +@@ -2249,17 +2249,17 @@ ScreenResize(XtermWidget xw, #ifdef USE_STRUCT_WINSIZE ts.ws_xpixel = (ttySize_t) width; ts.ws_ypixel = (ttySize_t) height; diff --git a/xterm.changes b/xterm.changes index 558bcea..278ca8f 100644 --- a/xterm.changes +++ b/xterm.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Jul 15 13:02:26 UTC 2014 - pcerny@suse.com + +- Patch #309 - 2014/07/13 + * modify configure script to work around debris left by XQuartz + upgrades. + * modify test-package scripts to enable ReGIS graphics. + * improvements/additions to ReGIS graphics, e.g., drawing text + (Ross Comb). + * add --with-Xaw3dxft, to link with Xaw 3d xft library + (Stephen P Wall). + * amend reset for cursor-shape to take into account + cursorUnderline resource (report by Christian Weisgerber). + * update config.guess, config.sub + ------------------------------------------------------------------- Mon Jun 23 08:25:46 UTC 2014 - pcerny@suse.com diff --git a/xterm.spec b/xterm.spec index c43fd3d..849ddbe 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: 308 +Version: 309 Release: 0 Summary: The basic X terminal program License: MIT