OBS User unknown
2007-02-25 22:42:14 +00:00
committed by Git OBS Bridge
parent 2b6d4bbfa8
commit 00ebd39ba5
3 changed files with 36 additions and 1 deletions

24
fix-fd_option.diff Normal file
View File

@@ -0,0 +1,24 @@
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,

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 21 12:13:16 CET 2007 - sndirsch@suse.de
- fix-fd_option.diff:
* finally fixes double-width support (Bug #246573)
-------------------------------------------------------------------
Sat Feb 17 13:13:12 CET 2007 - sndirsch@suse.de

View File

@@ -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: 3
Release: 4
Summary: The basic X terminal program
Source: %name.tar.gz
Source1: luitx
@@ -30,6 +30,7 @@ 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -150,6 +151,7 @@ Authors:
%prep
%setup -n xterm-%version -b7
%patch -p1
%patch1 -p0 -b .xterm-settings
%patch2 -p0 -b .xterm-sigwinch
cp $RPM_SOURCE_DIR/*bdf.bz2 .
@@ -256,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/pixmaps/terminal.png
%changelog
* Wed Feb 21 2007 - sndirsch@suse.de
- fix-fd_option.diff:
* finally fixes double-width support (Bug #246573)
* Sat Feb 17 2007 - sndirsch@suse.de
- enabled double-width support; switched to configure (Bug #246573)
* Mon Feb 12 2007 - sndirsch@suse.de