OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

71 lines
2.2 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../tetex/getline.patch
  5. # Copyright (C) 2010 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Avoid conflicts with getline function from glibc
  17. --- ./texk/dvipsk/afm2tfm.c.orig 2010-07-26 16:10:16.828270364 +0200
  18. +++ ./texk/dvipsk/afm2tfm.c 2010-07-26 16:11:03.413007135 +0200
  19. @@ -257,7 +257,7 @@
  20. }
  21. int
  22. -getline P1H(void) {
  23. +afm2tfm_getline P1H(void) {
  24. register char *p ;
  25. register int c ;
  26. @@ -606,7 +606,7 @@
  27. ai = newchar() ;
  28. ai->adobenum = -1 ;
  29. ai->adobename = "||" ; /* boundary character name */
  30. - while (getline()) {
  31. + while (afm2tfm_getline()) {
  32. switch(interest(paramstring())) {
  33. case FontName:
  34. fontname = paramnewstring() ;
  35. @@ -1882,7 +1882,7 @@
  36. while (1) {
  37. while (param == 0 || *param == 0) {
  38. - if (getline() == 0)
  39. + if (afm2tfm_getline() == 0)
  40. error("! premature end in encoding file") ;
  41. for (p=buffer; *p; p++)
  42. if (*p == '%') {
  43. @@ -1973,7 +1973,7 @@
  44. p = gettoken() ;
  45. if (strcmp(p, "]"))
  46. error("! token 258 in encoding must be make-array (])") ;
  47. - while (getline()) {
  48. + while (afm2tfm_getline()) {
  49. for (p=buffer; *p; p++)
  50. if (*p == '%') {
  51. if (ignoreligkern == 0)
  52. --- ./texk/web2c/cpascal.h.orig 2010-07-26 16:17:28.940755570 +0200
  53. +++ ./texk/web2c/cpascal.h 2010-07-26 16:18:30.988518578 +0200
  54. @@ -241,6 +241,12 @@
  55. #define getname vms_getname
  56. #endif
  57. +
  58. +#ifdef getline
  59. +#undef getline
  60. +#endif
  61. +#define getline web2c_getline
  62. +
  63. /* Declarations for the routines we provide ourselves in lib/. */
  64. extern string basenamechangesuffix P3H(const_string,const_string,const_string);