external/libgpg-error/libgpg-error_gawk5.patch

   1 --- src/Makefile.am
   2 +++ src/Makefile.am~
   3 @@ -266,7 +266,7 @@
   4
   5  errnos-sym.h: Makefile mkstrtable.awk errnos.in
   6         $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
   7 -               -v prefix=GPG_ERR_ -v namespace=errnos_ \
   8 +               -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
   9                 $(srcdir)/errnos.in >$@
  10
  11
  12 --- src/mkerrcodes.awk
  13 +++ src/mkerrcodes.awk~
  14 @@ -81,7 +81,7 @@
  15  }
  16
  17  !header {
  18 -  sub (/\#.+/, "");
  19 +  sub (/#.+/, "");
  20    sub (/[      ]+$/, ""); # Strip trailing space and tab characters.
  21
  22    if (/^$/)
  23 --- src/mkerrcodes1.awk
  24 +++ src/mkerrcodes1.awk~
  25 @@ -81,7 +81,7 @@
  26  }
  27
  28  !header {
  29 -  sub (/\#.+/, "");
  30 +  sub (/#.+/, "");
  31    sub (/[      ]+$/, ""); # Strip trailing space and tab characters.
  32
  33    if (/^$/)
  34 --- src/mkerrcodes2.awk
  35 +++ src/mkerrcodes2.awk~
  36 @@ -91,7 +91,7 @@
  37  }
  38
  39  !header {
  40 -  sub (/\#.+/, "");
  41 +  sub (/#.+/, "");
  42    sub (/[      ]+$/, ""); # Strip trailing space and tab characters.
  43
  44    if (/^$/)
  45 --- src/mkerrnos.awk
  46 +++ src/mkerrnos.awk~
  47 @@ -83,7 +83,7 @@
  48  }
  49
  50  !header {
  51 -  sub (/\#.+/, "");
  52 +  sub (/#.+/, "");
  53    sub (/[      ]+$/, ""); # Strip trailing space and tab characters.
  54
  55    if (/^$/)
  56 --- src/mkstrtable.awk
  57 +++ src/mkstrtable.awk~
  58 @@ -77,7 +77,7 @@
  59  #
  60  # The variable prefix can be used to prepend a string to each message.
  61  #
  62 -# The variable namespace can be used to prepend a string to each
  63 +# The variable pkg_namespace can be used to prepend a string to each
  64  # variable and macro name.
  65
  66  BEGIN {
  67 @@ -102,7 +102,7 @@
  68        print "/* The purpose of this complex string table is to produce";
  69        print "   optimal code with a minimum of relocations.  */";
  70        print "";
  71 -      print "static const char " namespace "msgstr[] = ";
  72 +      print "static const char " pkg_namespace "msgstr[] = ";
  73        header = 0;
  74      }
  75    else
  76 @@ -110,7 +110,7 @@
  77  }
  78
  79  !header {
  80 -  sub (/\#.+/, "");
  81 +  sub (/#.+/, "");
  82    sub (/[      ]+$/, ""); # Strip trailing space and tab characters.
  83
  84    if (/^$/)
  85 @@ -150,7 +150,7 @@
  86    else
  87      print "  gettext_noop (\"" last_msgstr "\");";
  88    print "";
  89 -  print "static const int " namespace "msgidx[] =";
  90 +  print "static const int " pkg_namespace "msgidx[] =";
  91    print "  {";
  92    for (i = 0; i < coded_msgs; i++)
  93      print "    " pos[i] ",";
  94 @@ -158,7 +158,7 @@
  95    print "  };";
  96    print "";
  97    print "static GPG_ERR_INLINE int";
  98 -  print namespace "msgidxof (int code)";
  99 +  print pkg_namespace "msgidxof (int code)";
 100    print "{";
 101    print "  return (0 ? 0";
 102
 103 --- src/Makefile.in
 104 +++ src/Makefile.in~
 105 @@ -1321,7 +1321,7 @@
 106
 107  errnos-sym.h: Makefile mkstrtable.awk errnos.in
 108         $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
 109 -               -v prefix=GPG_ERR_ -v namespace=errnos_ \
 110 +               -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
 111                 $(srcdir)/errnos.in >$@
 112
 113  mkheader: mkheader.c Makefile
 114