pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/fonts/kcfonts stdout is not a valid global initializer...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ecd9496cf2e9
branches:  trunk
changeset: 505018:ecd9496cf2e9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Dec 28 19:50:45 2005 +0000

description:
stdout is not a valid global initializer, move the init to run time.

diffstat:

 fonts/kcfonts/distinfo         |   6 +++---
 fonts/kcfonts/patches/patch-af |  20 +++++++++++++++++---
 fonts/kcfonts/patches/patch-ag |  19 ++++++++++++++++---
 3 files changed, 36 insertions(+), 9 deletions(-)

diffs (85 lines):

diff -r 67e3f2b5d66b -r ecd9496cf2e9 fonts/kcfonts/distinfo
--- a/fonts/kcfonts/distinfo    Wed Dec 28 19:38:36 2005 +0000
+++ b/fonts/kcfonts/distinfo    Wed Dec 28 19:50:45 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 19:18:28 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/12/28 19:50:45 joerg Exp $
 
 SHA1 (kcfonts-1.05.tar.gz) = b05d2aae45a7624cc9484e1bac0c0670200a0784
 RMD160 (kcfonts-1.05.tar.gz) = 81beed36904d4a4a012da99d000ec6ddae6e3d37
@@ -7,8 +7,8 @@
 SHA1 (patch-ab) = 8e395c8f5a6c157db54a9b805fede7136250b11c
 SHA1 (patch-ad) = 366ba0c305433845417fc5699eb188230f235d34
 SHA1 (patch-ae) = 03d0a5c4b541177df800bcea2f80858cadefd98a
-SHA1 (patch-af) = 6ff25797bc88b53506e21fa5233a9432d53ea576
-SHA1 (patch-ag) = 156611e05fdcbb0e9eaa3b263625df7e1e5348ad
+SHA1 (patch-af) = ba4e61b7d6edd9a2f9c63a0d0b207231599e99c7
+SHA1 (patch-ag) = 36f6af4a528426c208db5cceba2b7d93abcd9a83
 SHA1 (patch-ai) = e9d2e1f0f116f7927d1c3d4d19832fbbbc552c33
 SHA1 (patch-aj) = 98d743fb8054f4a9cb21a06ef82f30062527a56b
 SHA1 (patch-ak) = 6b4bb31aecf50040eb6e097954ca20d1aa598cba
diff -r 67e3f2b5d66b -r ecd9496cf2e9 fonts/kcfonts/patches/patch-af
--- a/fonts/kcfonts/patches/patch-af    Wed Dec 28 19:38:36 2005 +0000
+++ b/fonts/kcfonts/patches/patch-af    Wed Dec 28 19:50:45 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/07/18 16:19:07 wiz Exp $
+$NetBSD: patch-af,v 1.2 2005/12/28 19:50:45 joerg Exp $
 
---- kc15f.c.orig       Sat Dec 16 18:19:23 1995
+--- kc15f.c.orig       1995-12-16 17:19:23.000000000 +0000
 +++ kc15f.c
-@@ -12,22 +12,29 @@
+@@ -12,26 +12,33 @@
  char head[]=
  "STARTFONT 2.1\n"
  "COMMENT 16x15 Font\n"
@@ -43,3 +43,17 @@
  "ENDPROPERTIES\n"
  "CHARS 13867\n";
  
+-FILE *fp,*fr1, *fr2, *fw=stdout;
++FILE *fp,*fr1, *fr2, *fw;
+ 
+ int count, ofs;
+ 
+@@ -61,7 +68,7 @@ void out(FILE *fp)
+ 
+ main()
+ {
+-
++      fw = stdout;
+       if ((fp=fopen("spcfont.15","r"))==NULL) {
+               fprintf(stderr,"kc15 Error01:Can't open spcfont.15\n"); exit(2); 
+       }
diff -r 67e3f2b5d66b -r ecd9496cf2e9 fonts/kcfonts/patches/patch-ag
--- a/fonts/kcfonts/patches/patch-ag    Wed Dec 28 19:38:36 2005 +0000
+++ b/fonts/kcfonts/patches/patch-ag    Wed Dec 28 19:50:45 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/07/18 16:19:08 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2005/12/28 19:50:45 joerg Exp $
 
---- kc24f.c.orig       Sat Dec 16 18:19:42 1995
+--- kc24f.c.orig       1995-12-16 17:19:42.000000000 +0000
 +++ kc24f.c
-@@ -11,22 +11,29 @@
+@@ -11,26 +11,33 @@
  char head[]=
  "STARTFONT 2.1\n"
  "COMMENT 24x24 Font\n"
@@ -40,3 +40,16 @@
  "ENDPROPERTIES\n"
  "CHARS 13867\n";
  
+-FILE *fp,*fr1, *fr2, *fw=stdout;
++FILE *fp,*fr1, *fr2, *fw;
+ 
+ int count, ofs;
+ 
+@@ -61,6 +68,7 @@ fprintf(fw,"ENDCHAR\n");
+ 
+ main()
+ {
++  fw = stdout;
+ 
+ if ((fp=fopen("spcfont.24","r"))==NULL) {
+   fprintf(stderr,"kc24 Error 1:Can't open spcfont.24\n"); exit(2); 



Home | Main Index | Thread Index | Old Index