>Number:         12674
>Category:       pkg
>Synopsis:       GKrellM (font) bug with XFree 4.0.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 15 16:12:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Anthony Mallet
>Release:        NetBSD 1.5.1_ALPHA
>Organization:
>Environment:
System: NetBSD ficus 1.5.1_ALPHA NetBSD 1.5.1_ALPHA (FICUS) #6: Wed Apr 4 20:41:58 CEST 2001 troot@ficus:/amd/crocus/local1/netbsd-1.5/sys/arch/i386/compile/FICUS i386


>Description:
XFree86 4.0.3 seems to provide a new kind of font encoding (iso10646-1) ?
at least for basic fonts.
I don't know if this is a side effect of my installation or if someone
else noticed that new stuff

Anyway, this mess up (at least for me!) current version of GKrellM which
uses "*-*" for the last two fields of the font specification.
The following patch hardcodes "iso8859-*" for the two last fields.

CVS Changelog :
Hardcodes "iso8859-*" for the last two fields of the font specifications
in order to avoid "iso10646-*" encodings.


>How-To-Repeat:
Run GKrellM under XFree86 4.0.3 and look at the font glyphs.

>Fix:
diff -ur --exclude=CVS --new-file /home/metall/gkrellm/files/md5 ./files/md5
--- /home/metall/gkrellm/files/md5	Thu Mar 22 15:33:19 2001
+++ ./files/md5	Mon Apr 16 00:54:48 2001
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2001/03/22 14:33:19 wiz Exp $
+$NetBSD:$
 
 SHA1 (gkrellm-1.0.7.tar.gz) = 467d99fc88c6ffa9e380df06effe5755ed048c07
diff -ur --exclude=CVS --new-file /home/metall/gkrellm/files/patch-sum ./files/patch-sum
--- /home/metall/gkrellm/files/patch-sum	Tue Mar 13 18:53:29 2001
+++ ./files/patch-sum	Mon Apr 16 00:43:13 2001
@@ -2,3 +2,4 @@
 
 SHA1 (patch-aa) = 6ca1d28c018804159702038673080111b60f00cb
 SHA1 (patch-ab) = f18ea3c7c456d4c5638a3bf122e7ef0dbb217a93
+SHA1 (patch-ac) = 63741fef0d1a970b9acf9ef0cc4295529d5550ab
diff -ur --exclude=CVS --new-file /home/metall/gkrellm/patches/patch-ac ./patches/patch-ac
--- /home/metall/gkrellm/patches/patch-ac	Thu Jan  1 01:00:00 1970
+++ ./patches/patch-ac	Mon Apr 16 00:38:36 2001
@@ -0,0 +1,89 @@
+--- src/main.c~	Mon Jan 29 01:39:42 2001
++++ src/main.c	Mon Apr 16 00:32:26 2001
+@@ -114,20 +114,20 @@
+ 
+ static gchar	*fail_large_font[2] =
+ {
+-"-b&h-lucida-bold-r-normal-*-*-120-*-*-*-*-*-*",
+-"-adobe-courier-medium-r-*-*-*-120-*-*-*-*-*-*"
++"-b&h-lucida-bold-r-normal-*-*-120-*-*-*-*-iso8859-*",
++"-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*"
+ };
+ 
+ static gchar	*fail_normal_font[2] =
+ {
+-"-b&h-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*",
+-"-adobe-courier-medium-r-*-*-*-100-*-*-*-*-*-*"
++"-b&h-lucida-medium-r-normal-*-*-100-*-*-*-*-iso8859-*",
++"-adobe-courier-medium-r-*-*-*-100-*-*-*-*-iso8859-*"
+ };
+ 
+ static gchar	*fail_small_font[2] =
+ {
+-"-adobe-helvetica-medium-r-normal-*-*-80-*-*-*-*-*-*",
+-"-adobe-courier-medium-r-*-*-*-80-*-*-*-*-*-*"
++"-adobe-helvetica-medium-r-normal-*-*-80-*-*-*-*-iso8859-*",
++"-adobe-courier-medium-r-*-*-*-80-*-*-*-*-iso8859-*"
+ };
+ 
+ 
+--- src/config.c~	Thu Jan 25 00:09:35 2001
++++ src/config.c	Mon Apr 16 00:34:58 2001
+@@ -1087,16 +1087,16 @@
+ 
+ static gchar	*font_override_1[] =
+ 	{
+-	"-b&h-lucida-bold-r-normal-*-*-140-*-*-*-*-*-*",		/* large  */
+-	"-b&h-lucida-medium-r-normal-*-*-120-*-*-*-*-*-*",		/* normal */
+-	"-adobe-helvetica-medium-r-*-*-*-100-*-*-*-*-*-*"		/* small  */
++	"-b&h-lucida-bold-r-normal-*-*-140-*-*-*-*-iso8859-*",		/* large  */
++	"-b&h-lucida-medium-r-normal-*-*-120-*-*-*-*-iso8859-*",		/* normal */
++	"-adobe-helvetica-medium-r-*-*-*-100-*-*-*-*-iso8859-*"		/* small  */
+ 	};
+ 
+ static gchar	*font_override_2[] =
+ 	{
+-	"-b&h-lucida-bold-r-normal-*-*-160-*-*-*-*-*-*",		/* large  */
+-	"-b&h-lucida-medium-r-normal-*-*-140-*-*-*-*-*-*",		/* normal */
+-	"-adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*"		/* small  */
++	"-b&h-lucida-bold-r-normal-*-*-160-*-*-*-*-iso8859-*",		/* large  */
++	"-b&h-lucida-medium-r-normal-*-*-140-*-*-*-*-iso8859-*",		/* normal */
++	"-adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-*"		/* small  */
+ 	};
+ 
+   /* Handle borders set in gkrellmrc which are not set by a style line.
+@@ -1432,9 +1432,9 @@
+ 
+ static gchar	*default_fonts[] =
+ 	{
+-	"-b&h-lucida-bold-r-normal-*-*-120-*-*-*-*-*-*",		/* large  */
+-	"-b&h-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*",		/* normal */
+-	"-adobe-helvetica-medium-r-normal-*-*-80-*-*-*-*-*-*"	/* small  */
++	"-b&h-lucida-bold-r-normal-*-*-120-*-*-*-*-iso8859-*",		/* large  */
++	"-b&h-lucida-medium-r-normal-*-*-100-*-*-*-*-iso8859-*",		/* normal */
++	"-adobe-helvetica-medium-r-normal-*-*-80-*-*-*-*-iso8859-*"	/* small  */
+ 	};
+ 
+ static void
+--- src/gui.c~	Tue Jan 30 02:46:48 2001
++++ src/gui.c	Mon Apr 16 00:33:53 2001
+@@ -477,13 +477,13 @@
+ 
+ static gchar	*text_fonts[2][3] =
+ {
+-{"-adobe-helvetica-medium-r-normal-*-*-100-*-*-*-*-*,-*-*-medium-r-*-*-10-*-*-*-*-*-*-*",
+-"-adobe-helvetica-bold-r-normal-*-*-100-*-*-*-*-*-*,-*-*-bold-r-*-*-10-*-*-*-*-*-*-*,-*-*-medium-r-*-*-10-*-*-*-*-*-*-*",
+-"-adobe-helvetica-bold-o-normal-*-*-100-*-*-*-*-*,-*-*-bold-o-*-*-10-*-*-*-*-*-*-*,-*-*-medium-r-*-*-10-*-*-*-*-*-*-*"},
++{"-adobe-helvetica-medium-r-normal-*-*-100-*-*-*-iso8859-*,-*-*-medium-r-*-*-10-*-*-*-*-*-iso8859-*",
++"-adobe-helvetica-bold-r-normal-*-*-100-*-*-*-*-iso8859-*,-*-*-bold-r-*-*-10-*-*-*-*-*-iso8859-*,-*-*-medium-r-*-*-10-*-*-*-*-*-iso8859-*",
++"-adobe-helvetica-bold-o-normal-*-*-100-*-*-*-iso8859-*,-*-*-bold-o-*-*-10-*-*-*-*-*-iso8859-*,-*-*-medium-r-*-*-10-*-*-*-*-*-iso8859-*"},
+ 
+-{"-adobe-helvetica-medium-r-normal-*-*-120-*-*-*-*-*,-*-*-medium-r-*-*-12-*-*-*-*-*-*-*",
+-"-adobe-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*,-*-*-bold-r-*-*-12-*-*-*-*-*-*-*,-*-*-medium-r-*-*-12-*-*-*-*-*-*-*",
+-"-adobe-helvetica-bold-o-normal-*-*-120-*-*-*-*-*,-*-*-bold-o-*-*-12-*-*-*-*-*-*-*,-*-*-medium-r-*-*-12-*-*-*-*-*-*-*"}
++{"-adobe-helvetica-medium-r-normal-*-*-120-*-*-*-iso8859-*,-*-*-medium-r-*-*-12-*-*-*-*-*-iso8859-*",
++"-adobe-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-*,-*-*-bold-r-*-*-12-*-*-*-*-*-iso8859-*,-*-*-medium-r-*-*-12-*-*-*-*-*-iso8859-*",
++"-adobe-helvetica-bold-o-normal-*-*-120-*-*-*-iso8859-*,-*-*-bold-o-*-*-12-*-*-*-*-*-iso8859-*,-*-*-medium-r-*-*-12-*-*-*-*-*-iso8859-*"}
+ };
+ 
+ static void

>Release-Note:
>Audit-Trail:
>Unformatted: