packages: texlive/texlive-stdio.patch (NEW), texlive/texlive-getline.patch ...

uzsolt uzsolt at pld-linux.org
Sat Jul 4 11:31:48 CEST 2009


Author: uzsolt                       Date: Sat Jul  4 09:31:48 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- initial

---- Files affected:
packages/texlive:
   texlive-stdio.patch (NONE -> 1.1)  (NEW), texlive-getline.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/texlive/texlive-stdio.patch
diff -u /dev/null packages/texlive/texlive-stdio.patch:1.1
--- /dev/null	Sat Jul  4 11:31:48 2009
+++ packages/texlive/texlive-stdio.patch	Sat Jul  4 11:31:43 2009
@@ -0,0 +1,10 @@
+--- texlive-20080816-source.orig/libs/teckit/source/Compiler.h	2009-07-04 10:12:18.509825692 +0200
++++ texlive-20080816-source/libs/teckit/source/Compiler.h	2009-07-04 11:21:01.692867633 +0200
+@@ -56,6 +56,7 @@
+ #include <string>
+ #include <vector>
+ #include <map>
++#include <stdio.h>
+ 
+ using namespace std;
+ 

================================================================
Index: packages/texlive/texlive-getline.patch
diff -u /dev/null packages/texlive/texlive-getline.patch:1.1
--- /dev/null	Sat Jul  4 11:31:48 2009
+++ packages/texlive/texlive-getline.patch	Sat Jul  4 11:31:43 2009
@@ -0,0 +1,133 @@
+--- texlive-20080816-source.orig/texk/afm2pl/afm2pl.c	2009-07-04 10:12:19.883158871 +0200
++++ texlive-20080816-source/texk/afm2pl/afm2pl.c	2009-07-04 10:58:24.613569483 +0200
+@@ -345,7 +345,7 @@
+ 
+ /* read a line from infile into buffer and obuffer */
+ int
+-  getline
++  tl_getline
+ P1H (void)
+ {
+   register char *p;
+@@ -781,7 +781,7 @@
+     afmencoding->vec[i] = ".notdef";
+   afmencoding->name = "Unspecified";
+ 
+-  while (getline ()) {
++  while (tl_getline ()) {
+     switch (interest (paramstring ())) {
+     case FontName:
+       fontname = paramnewstring ();
+@@ -963,7 +963,7 @@
+ 
+   while (1) {
+     while (param == 0 || *param == 0) {
+-      if (getline () == 0)
++      if (tl_getline () == 0)
+         error ("! premature end in encoding file");
+     }
+     if (param[0] == '%') {
+@@ -1540,7 +1540,7 @@
+     encfilename =
+       openin (encfilename, kpse_enc_format, ".enc");
+     for (lig_it = 0; lig_it < 2; lig_it++) {
+-      while (getline ()) {
++      while (tl_getline ()) {
+         /* search for (ligkern) comment in line */
+         for (p = buffer; *p; p++)
+           if (*p == '%') {
+@@ -1576,7 +1576,7 @@
+     for (i = 0; i < ligfilenames->n; i++) {
+       ligfilename = openin (ligfilenames->names[i],
+                             kpse_lig_format, ".lig");
+-      while (getline ())
++      while (tl_getline ())
+         checkligkern (buffer, 0);       /* 2nd param 0: lig file */
+       fclose (infile);
+     }
+@@ -1607,7 +1607,7 @@
+   for (i = 0; i < Ligfilenames->n; i++) {
+     ligfilename = openin (Ligfilenames->names[i],
+                           kpse_lig_format, ".lig");
+-    while (getline ())
++    while (tl_getline ())
+       checkligkern (buffer, 0);       /* 2nd param 0: lig file */
+     fclose (infile);
+   }
+--- texlive-20080816-source.orig/texk/dvipsk/afm2tfm.c	2009-07-04 10:12:20.843158881 +0200
++++ texlive-20080816-source/texk/dvipsk/afm2tfm.c	2009-07-04 11:00:22.889536405 +0200
+@@ -260,7 +260,7 @@
+ }
+ 
+ int
+-getline P1H(void) {
++tl_getline P1H(void) {
+    register char *p ;
+    register int c ;
+ 
+@@ -615,7 +615,7 @@
+    ai = newchar() ;
+    ai->adobenum = -1 ;
+    ai->adobename = "||" ; /* boundary character name */
+-   while (getline()) {
++   while (tl_getline()) {
+       switch(interest(paramstring())) {
+ case FontName:
+          fontname = paramnewstring() ;
+@@ -1891,7 +1891,7 @@
+ 
+    while (1) {
+       while (param == 0 || *param == 0) {
+-         if (getline() == 0)
++         if (tl_getline() == 0)
+             error("! premature end in encoding file") ;
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+@@ -1982,7 +1982,7 @@
+       p = gettoken() ;
+       if (strcmp(p, "]"))
+          error("! token 258 in encoding must be make-array (])") ;
+-      while (getline()) {
++      while (tl_getline()) {
+          for (p=buffer; *p; p++)
+             if (*p == '%') {
+                if (ignoreligkern == 0)
+--- texlive-20080816-source.orig/texk/web2c/cpascal.h	2009-07-04 10:12:24.699825510 +0200
++++ texlive-20080816-source/texk/web2c/cpascal.h	2009-07-04 11:02:06.002863123 +0200
+@@ -14,6 +14,7 @@
+ 
+ /* We must include this first, to resolve many C issues.  */
+ #include "config.h"
++#define getline tl_getline
+ 
+ /* We only use getopt in the applications, not in web2c itself.  */
+ #include <kpathsea/getopt.h>
+--- texlive-20080816-source.orig/texk/web2c/mpware/mpto.c	2009-07-04 10:12:23.563158028 +0200
++++ texlive-20080816-source/texk/web2c/mpware/mpto.c	2009-07-04 11:03:43.946185385 +0200
+@@ -97,7 +97,7 @@
+ }
+ 
+ char *
+-getline(void)
++tl_getline(void)
+ {				/* returns NULL on EOF or error, otherwise buf */
+     int c;
+     unsigned loc = 0;
+@@ -302,7 +302,7 @@
+     char *res = NULL;
+     do {
+ 	if (*aa == 0)
+-	  if ((aa = getline()) == NULL)
++	  if ((aa = tl_getline()) == NULL)
+ 	    err("btex section does not end");
+ 
+ 	if (getbta(aa) && *tt == 'e') {
+@@ -483,7 +483,7 @@
+ 	postverb = troff_postverb;
+     }
+     printf("%s", predoc);
+-    while (getline() != NULL)
++    while (tl_getline() != NULL)
+ 	do_line();
+     printf("%s", postdoc);
+     exit(0);
================================================================


More information about the pld-cvs-commit mailing list