Accepting request 241235 from X11:terminals

- 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 (forwarded request 241234 from pcerny)

OBS-URL: https://build.opensuse.org/request/show/241235
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=86

xterm-308.tgz

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

xterm-309.tgz

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

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-----

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);
  }

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

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;

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
 

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