Serious bug in pango-1.2.5 Thai module

[Theppitak Karoonboonyanan <thep linux thai net>]

I've just compiled pango 1.2.5 today, and have found that the Thai
XFT module is completely nonfunctional. It's a side effect of the
HAVE_X preprocessing which makes the size of struct _ThaiFontInfo not
equal in various object files. As a result, the assignments of pointers
to functions just shift.

So, my workaround is to move the problematic member to the end of
struct. But maybe, there is a more elegant method.

-Thep.
-- 
Theppitak Karoonboonyanan
http://linux.thai.net/thep/


diff -Nuar pango-1.2.5/modules/thai/thai-shaper.h pango-1.2.5-thai/modules/thai/thai-shaper.h
--- pango-1.2.5/modules/thai/thai-shaper.h	2003-09-03 23:24:57.000000000 +0700
+++ pango-1.2.5-thai/modules/thai/thai-shaper.h	2003-09-03 23:25:45.000000000 +0700
@@ -30,9 +30,6 @@
 {
   PangoFont       *font;
   ThaiFontSet      font_set;
-#ifdef HAVE_X
-  PangoXSubfont    subfont; /* For X backend */
-#endif
 
   PangoGlyph
   (*make_glyph) (ThaiFontInfo *font_info, unsigned int c);
@@ -42,6 +39,10 @@
 	
   gboolean
   (*has_glyph) (ThaiFontInfo *font_info, PangoGlyph glyph);
+
+#ifdef HAVE_X
+  PangoXSubfont    subfont; /* For X backend */
+#endif
 };
 
 /*