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

bug-246573-tentative-patch.diff

@@ -18,7 +18,7 @@
 -			        "\xec\x9c\xa1\xec\xb9\xa0\xed\x8c\x94" \
 -			        "\xea\xb5\xac\xec\x98\x81"
 -
--#define HALF_WIDTH_CHAR1  0x0031	/* 'l' */
+-#define HALF_WIDTH_CHAR1  0x0031	/* '1' */
 -#define HALF_WIDTH_CHAR2  0x0057	/* 'W' */
  #define FULL_WIDTH_CHAR1  0x4E00	/* CJK Ideograph 'number one' */
  #define FULL_WIDTH_CHAR2  0xAC00	/* Korean script syllable 'Ka' */

fix-fd_option.diff

@@ -1,24 +0,0 @@
-diff -ru xterm-224.orig/fontutils.c xterm-224/fontutils.c
---- xterm-224.orig/fontutils.c	2007-02-04 21:31:31.000000000 +0100
-+++ xterm-224/fontutils.c	2007-02-20 12:24:05.000000000 +0100
-@@ -1520,7 +1520,7 @@
- 
- 	    if ((pat = XftNameParse(xw->misc.face_name)) != 0) {
- 		XftPatternBuild(pat,
--				XFT_FAMILY, XftTypeString, "mono",
-+				XFT_FAMILY, XftTypeString, "monospace",
- 				XFT_SIZE, XftTypeDouble, face_size,
- 				XFT_SPACING, XftTypeInteger, XFT_MONO,
- 				(void *) 0);
-@@ -1575,9 +1575,9 @@
- 		       face_name,
- 		       char_width));
- 
--		if ((pat = XftNameParse(xw->misc.face_name)) != 0) {
-+		if ((pat = XftNameParse(face_name)) != 0) {
- 		    XftPatternBuild(pat,
--				    XFT_FAMILY, XftTypeString, face_name,
-+				    XFT_FAMILY, XftTypeString, "monospace",
- 				    XFT_SIZE, XftTypeDouble, face_size,
- 				    XFT_SPACING, XftTypeInteger, XFT_MONO,
- 				    XFT_CHAR_WIDTH, XftTypeInteger, char_width,

xterm.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar 22 17:35:02 CET 2007 - mfabian@suse.de
+
+- add ftp://invisible-island.net/temp/xterm-224i.patch
+  (obsoletes fix-fd_option.diff and fixes the redraw problems
+  for double width characters mentioned in bug #246573).
+- adapt patch a little bit to make it build with --with-utempter.
+
 -------------------------------------------------------------------
 Mon Feb 26 16:04:31 CET 2007 - sndirsch@suse.de
 

xterm.spec

@@ -18,7 +18,7 @@ Group:          System/X11/Utilities
 Provides:       xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
 Autoreqprov:    on
 Version:        224
-Release:        5
+Release:        8
 Summary:        The basic X terminal program
 Source:         %name.tar.gz
 Source1:        luitx
@@ -30,10 +30,10 @@ Source6:        terminal.png
 Source7:        vttest.tar.gz
 Source8:        20x20ja.bdf.bz2
 Source9:        20x20ko.bdf.bz2
-Patch:          fix-fd_option.diff
 Patch1:         p_xterm-settings.diff  
 Patch2:         p_xterm-sigwinch.diff
 Patch3:         bug-246573-tentative-patch.diff
+Patch4:         ftp://invisible-island.net/temp/xterm-224i.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -152,9 +152,9 @@ Authors:
 
 %prep
 %setup -n xterm-%version -b7
-%patch -p1
 %patch1 -p0 -b .xterm-settings
 %patch2 -p0 -b .xterm-sigwinch
+%patch4 -p1
 %patch3 -p1
 cp $RPM_SOURCE_DIR/*bdf.bz2 .
 bunzip2 *.bdf.bz2
@@ -260,6 +260,11 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/pixmaps/terminal.png
 
 %changelog
+* Thu Mar 22 2007 - mfabian@suse.de
+- add ftp://invisible-island.net/temp/xterm-224i.patch
+  (obsoletes fix-fd_option.diff and fixes the redraw problems
+  for double width characters mentioned in bug #246573).
+- adapt patch a little bit to make it build with --with-utempter.
 * Mon Feb 26 2007 - sndirsch@suse.de
 - bug-246573-tentative-patch.diff:
   * simplify algorithm for verifying that a font contains double