Fwd: changeset: Allow more relaxed font test

[Michael D. Godfrey]

I sent in this minor update on 2 October.
It would be helpful if it could be applied.  I am quite
sure that the simpler test is correct, and no one has
an explanation for the additional

res != FcResultNoMatch

test.  Without this change Fedora systems fail for
all text processing the backend fltk.

Michael
-------- Original Message --------

Subject:	changeset: Allow more relaxed font test
Date:	Fri, 02 Oct 2009 14:48:51 -0700
From:	Michael D. Godfrey godfrey@...
To:	octave maintainers mailing list maintainers@...

Fedora Linux systems seem to fail the current
font test when suitable fonts are available.  This
change results in fonts being found.  The reason
for the additional test, which this change comments out,
seems to be unclear.  I have left the test in the source
in case someone wants to explore  better ways of handling
the font matching.

Michael Godfrey

# HG changeset patch
# User godfrey@...
# Date 1254519691 25200
# Node ID b3a69b606eaea7735fbae35aa8be0faf51cd4b05
# Parent  5e433877634fe256469ee05c7db0d8956f20eb4b
Allow more font matches

diff -r 5e433877634f -r b3a69b606eae ChangeLog
--- a/ChangeLog Fri Oct 02 11:15:02 2009 +0200
+++ b/ChangeLog Fri Oct 02 14:41:31 2009 -0700
@@ -1,3 +1,8 @@
[phone] Michael Godfrey <godfrey@...>
+
+         * txt-eng-ft.cc:  Change font match test to allow more
+         matches.  Mainly affects Fedora Linux systems.
+
 2009-09-23  Jaroslav Hajek  <highegg@...>
 
  * NEWS: Update.
diff -r 5e433877634f -r b3a69b606eae src/txt-eng-ft.cc
--- a/src/txt-eng-ft.cc Fri Oct 02 11:15:02 2009 +0200
+++ b/src/txt-eng-ft.cc Fri Oct 02 14:41:31 2009 -0700
@@ -141,7 +141,7 @@
       FcDefaultSubstitute (pat);
       match = FcFontMatch (0, pat, &res);
       
-      if (match && res != FcResultNoMatch)
+      if (match) // && res != FcResultNoMatch)
  {
   unsigned char *tmp;