Accepting request 236996 from home:pcerny:factory

ppc64le fix - bnc#881131

OBS-URL: https://build.opensuse.org/request/show/236996
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=97

xterm-decomposed_bitmaps.patch

@@ -0,0 +1,42 @@
+From: Egbert Eich <eich@suse.de>
+Date: Tue Jun 3 18:17:07 2014 +0200
+Subject: [PATCH]Fix number of colormap entries for DirectColor and TrueColor visuals
+Patch-mainline: to be upstreamed
+Git-commit: 071525466531009223f1c21a40aa2e081d5ef99a
+Git-repo:
+References: bnc#
+Signed-off-by: Egbert Eich <eich@suse.com>
+
+DirectColor and TrueColor have a decomposed colormap,
+therefore the colormap_size field in the XVisualInfo
+structure is meant per sub-field (take a look at the output
+of xdpyinfo).
+With 3 sub-fields there are colormap_size^3 entires.
+
+Signed-off-by: Egbert Eich <eich@suse.de>
+---
+ xterm-299/misc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/misc.c b/misc.c
+--- a/misc.c
++++ b/misc.c
+@@ -2218,16 +2218,18 @@ ReportAnsiColorRequest(XtermWidget xw, i
+ }
+ 
+ static void
+ getColormapInfo(XtermWidget xw, unsigned *typep, unsigned *sizep)
+ {
+     if (getVisualInfo(xw)) {
+ 	*typep = (unsigned) xw->visInfo->class;
+ 	*sizep = (unsigned) xw->visInfo->colormap_size;
++	if (*typep > 3)
++		*sizep = (*sizep)*(*sizep)*(*sizep);
+     } else {
+ 	*typep = 0;
+ 	*sizep = 0;
+     }
+ }
+ 
+ #define MAX_COLORTABLE 4096
+ 

xterm-double_width_fonts.patch

@@ -1,7 +1,7 @@
 diff --git a/fontutils.c b/fontutils.c
 --- a/fontutils.c
 +++ b/fontutils.c
-@@ -641,77 +641,29 @@ is_double_width_font(XFontStruct *fs)
+@@ -672,77 +672,29 @@ is_double_width_font(XFontStruct *fs)
  {
      return ((2 * fs->min_bounds.width) == fs->max_bounds.width);
  }

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
-@@ -5585,20 +5585,20 @@ echo "$as_me:5584: checking for $cf_test
+@@ -5586,20 +5586,20 @@ echo "$as_me:5585: 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

xterm-sigwinch.patch

@@ -1,7 +1,7 @@
 diff --git a/screen.c b/screen.c
 --- a/screen.c
 +++ b/screen.c
-@@ -2207,17 +2207,17 @@ ScreenResize(XtermWidget xw,
+@@ -2246,17 +2246,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,9 @@
+-------------------------------------------------------------------
+Tue Jun 10 14:45:33 UTC 2014 - pcerny@suse.com
+
+- Fix Xerror failures on ppc64le (bnc#881131)
+  [-decomposed_bitmaps.patch]
+
 -------------------------------------------------------------------
 Wed Jun  4 15:36:21 UTC 2014 - pcerny@suse.com
 

xterm.spec

@@ -79,6 +79,7 @@ Patch4:         xterm-desktop_file_icon.patch
 Patch5:         xterm-forbid_window_and_font_ops.patch
 Patch6:         xterm-enable_libtinfo.patch
 Patch7:         xterm-allow_iso-utf_fonts_in_menu.patch
+Patch8:         xterm-decomposed_bitmaps.patch
 Patch101:       vttest-config_update_aarch64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} > 1220
@@ -101,6 +102,7 @@ This package contains the basic X.Org terminal program.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 cp -t . %{S:8} %{S:9}
 bunzip2 %{basename:%{S:8}} %{basename:%{S:9}}
 cd ../vttest-%{vttest_version}