Fix breakage on current.

1 files changed, 111 insertions, 3 deletions

diff --git a/chinese/kcfonts/files/patch-ac b/chinese/kcfonts/files/patch-ac
index 22f4b21e9773..e40293408dc3 100644
--- a/chinese/kcfonts/files/patch-ac
+++ b/chinese/kcfonts/files/patch-ac
@@ -32,7 +32,7 @@
  }
 --- kc15f.c.orig	Wed Jan 19 02:14:40 2000
 +++ kc15f.c	Wed Jan 19 03:05:11 2000
-@@ -12,22 +12,29 @@
+@@ -12,26 +12,33 @@
  char head[]=
  "STARTFONT 2.1\n"
  "COMMENT 16x15 Font\n"
@@ -73,9 +73,63 @@
  "ENDPROPERTIES\n"
  "CHARS 13867\n";
  
+-FILE *fp,*fr1, *fr2, *fw=stdout;
++FILE *fp,*fr1, *fr2;
+ 
+ int count, ofs;
+ 
+@@ -42,21 +49,21 @@
+ 	int v,i;
+ 
+ 	if ((v=fread(bf,1,sizeof(bf),fp)) != sizeof(bf)) return; 
+-	fprintf(fw,"STARTCHAR %d\n", count);
++	fprintf(stdout,"STARTCHAR %d\n", count);
+ 	tt[0]=ofs>>8;
+ 	tt[1]=ofs&255;
+ 	ser_b5(tt,uu);
+-	fprintf(fw,"ENCODING %d\n", (u_short)uu[0]<<8 | uu[1]);
+-	fprintf(fw,"SWIDTH 640 0\n");
+-	fprintf(fw,"DWIDTH 16 0\n");
+-	fprintf(fw,"BBX 16 15 0 -1\n");
+-	fprintf(fw,"BITMAP\n");
++	fprintf(stdout,"ENCODING %d\n", (u_short)uu[0]<<8 | uu[1]);
++	fprintf(stdout,"SWIDTH 640 0\n");
++	fprintf(stdout,"DWIDTH 16 0\n");
++	fprintf(stdout,"BBX 16 15 0 -1\n");
++	fprintf(stdout,"BITMAP\n");
+ 	
+ 	for(i=0;i<15;i++) {
+ 		v=((u_int)bf[i][0]<<8) | bf[i][1];
+-		fprintf(fw,"%04x\n", v);
++		fprintf(stdout,"%04x\n", v);
+ 	}
+-	fprintf(fw,"ENDCHAR\n");
++	fprintf(stdout,"ENDCHAR\n");
+ }
+ 
+ main()
+@@ -65,7 +72,7 @@
+ 	if ((fp=fopen("spcfont.15","r"))==NULL) {
+ 		fprintf(stderr,"kc15 Error01:Can't open spcfont.15\n"); exit(2); 
+ 	}
+-	fputs(head,fw);
++	fputs(head,stdout);
+ 
+ 	ofs=0x8400;
+ 	while (!feof(fp)) {
+@@ -102,8 +109,7 @@
+ 	fclose(fr1);
+ 	fclose(fr2);
+ 
+-	fprintf(fw,"ENDFONT\n");
++	fprintf(stdout,"ENDFONT\n");
+ 
+ 	fclose(fp);
+-	fclose(fw);
+ }
 --- kc24f.c.orig	Wed Jan 19 02:14:44 2000
 +++ kc24f.c	Wed Jan 19 02:48:46 2000
-@@ -11,22 +11,29 @@
+@@ -11,26 +11,33 @@
  char head[]=
  "STARTFONT 2.1\n"
  "COMMENT 24x24 Font\n"
@@ -112,7 +166,61 @@
 +"CHARSET_ENCODING \"0\"\n"
  "ENDPROPERTIES\n"
  "CHARS 13867\n";
-
+ 
+-FILE *fp,*fr1, *fr2, *fw=stdout;
++FILE *fp,*fr1, *fr2;
+ 
+ int count, ofs;
+ 
+@@ -42,21 +49,21 @@
+ 
+ 
+ if ((v=fread(bf,1,72,fp)) != 72) return; 
+-fprintf(fw,"STARTCHAR %d\n", count);
++fprintf(stdout,"STARTCHAR %d\n", count);
+ tt[0]=ofs>>8;
+ tt[1]=ofs&255;
+ ser_b5(tt,uu);
+-fprintf(fw,"ENCODING %d\n", (u_short)uu[0]<<8 | uu[1]);
+-fprintf(fw,"SWIDTH 960 0\n");
+-fprintf(fw,"DWIDTH 24 0\n");
+-fprintf(fw,"BBX 24 24 0 -2\n");
+-fprintf(fw,"BITMAP\n");
++fprintf(stdout,"ENCODING %d\n", (u_short)uu[0]<<8 | uu[1]);
++fprintf(stdout,"SWIDTH 960 0\n");
++fprintf(stdout,"DWIDTH 24 0\n");
++fprintf(stdout,"BBX 24 24 0 -2\n");
++fprintf(stdout,"BITMAP\n");
+ zc=0;
+ for(i=0;i<24;i++) {
+ 	v=(((u_int)bf[i][0]<<16) | ((u_int)bf[i][1]<<8)) | bf[i][2];
+-	fprintf(fw,"%06x\n", v);
++	fprintf(stdout,"%06x\n", v);
+ }
+-fprintf(fw,"ENDCHAR\n");
++fprintf(stdout,"ENDCHAR\n");
+ }
+ 
+ main()
+@@ -65,7 +72,7 @@
+ if ((fp=fopen("spcfont.24","r"))==NULL) {
+   fprintf(stderr,"kc24 Error 1:Can't open spcfont.24\n"); exit(2); 
+ }
+-fputs(head,fw);
++fputs(head,stdout);
+ 
+ ofs=0x8400;
+ while (!feof(fp)) {
+@@ -101,8 +108,7 @@
+ fclose(fr1);
+ fclose(fr2);
+ 
+-fprintf(fw,"ENDFONT\n");
++fprintf(stdout,"ENDFONT\n");
+ 
+ fclose(fp);
+-fclose(fw);
+ }
 --- kc8x15.c.orig	Sun Dec 17 01:19:08 1995
 +++ kc8x15.c	Sun Apr 30 10:45:07 2000
 @@ -10,12 +10,12 @@