Re: CJK-LyX-1.3.0

[Angus Leeming]

Kohtaro Hitomi wrote:

> Thank you for making CJK-LyX 1.3.0. Howenver, I could not compile the
> patched xforms with the following message.
> 
> xpopup.c: In function draw_title':
> xpopup.c:1485: parse error before static'
> xpopup.c:1493: fset' undeclared (first use in this function)
> xpopup.c:1493: (Each undeclared identifier is reported only once
> xpopup.c:1493: for each function it appears in.)
> xpopup.c:1497: missing_charset' undeclared (first use in this function)
> xpopup.c:1497: num_missing' undeclared (first use in this function)
> xpopup.c:1497: dd' undeclared (first use in this function)
> make[1]: *** [xpopup.o] Error 1
> make[1]: Leaving directory /home/kohtaro/rpm/BUILD/xforms-1.0-release/lib'
> make: *** [all] Error 2
> Bad exit status from /var/tmp/rpm-tmp.17746 (%build)
>       
> Do you have any idea to solve it.

Patch attached. Apply as:

$ cd ${xforms-src}/lib
$ patch -p0 < xpopup.diff

Regards,
Angus

--- xpopup.c.orig	2003-02-27 08:42:51.000000000 +0000
+++ xpopup.c	2003-02-27 08:44:39.000000000 +0000
@@ -1473,20 +1473,23 @@
 static void
 draw_title(Display * d, Drawable w, int x, int y, char *s, int n)
 {
+#if 1
+    static XFontSet fset = 0;
+    static int junk;
+    char **missing_charset;
+    int num_missing;
+    static char *dd;
+#endif
 
     if (!s || !*s)
 	return;
+
 #if 0
     fl_drw_text(FL_ALIGN_CENTER, x - 2, y - 5,
 		XTextWidth(pup_fs, s, strlen(s)),
 		0, FL_SLATEBLUE, tfsize,
 		tfstyle + FL_EMBOSSED_STYLE, s);
 #else
-    static XFontSet fset = 0;
-    static int junk;
-    char **missing_charset;
-    int num_missing;
-    static char *dd;
 if(use_fontset()) {    
     fl_set_font(tfstyle, tfsize);
     fl_textcolor(puptcolor);