i686-w64-mingw32/gettext/0001-fix-msginit.patch

0001 --- a/gettext-tools/src/msginit.c       Thu Jul 07 15:29:24 2016
0002 +++ b/gettext-tools/src/msginit.c       Thu Jul 07 15:33:16 2016
0003 @@ -872,59 +872,10 @@
0004              }
0005          }
0006        /* It contains no version, just a package name.  */
0007        return old_field;
0008      }
0009 -
0010 -  gettextlibdir = getenv ("GETTEXTLIBDIR");
0011 -  if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
0012 -    gettextlibdir = relocate (LIBDIR "/gettext");
0013 -
0014 -  prog = xconcatenated_filename (gettextlibdir, "project-id", NULL);
0015 -
0016 -  /* Call the project-id shell script.  */
0017 -  argv[0] = "/bin/sh";
0018 -  argv[1] = prog;
0019 -  argv[2] = NULL;
0020 -  child = create_pipe_in (prog, "/bin/sh", argv, DEV_NULL, false, true, false,
0021 -                          fd);
0022 -  if (child == -1)
0023 -    goto failed;
0024 -
0025 -  /* Retrieve its result.  */
0026 -  fp = fdopen (fd[0], "r");
0027 -  if (fp == NULL)
0028 -    {
0029 -      error (0, errno, _("fdopen() failed"));
0030 -      goto failed;
0031 -    }
0032 -
0033 -  line = NULL; linesize = 0;
0034 -  linelen = getline (&line, &linesize, fp);
0035 -  if (linelen == (size_t)(-1))
0036 -    {
0037 -      error (0, 0, _("%s subprocess I/O error"), prog);
0038 -      fclose (fp);
0039 -      goto failed;
0040 -    }
0041 -  if (linelen > 0 && line[linelen - 1] == '\n')
0042 -    line[linelen - 1] = '\0';
0043 -
0044 -  fclose (fp);
0045 -
0046 -  /* Remove zombie process from process list, and retrieve exit status.  */
0047 -  exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL);
0048 -  if (exitstatus != 0)
0049 -    {
0050 -      error (0, 0, _("%s subprocess failed with exit code %d"),
0051 -             prog, exitstatus);
0052 -      goto failed;
0053 -    }
0054 -
0055 -  return line;
0056 -
0057 -failed:
0058    return "PACKAGE";
0059  }
0060
0061
0062  /* Construct the value for the Project-Id-Version field.  */
0063 @@ -946,60 +897,10 @@
0064    /* Return the old value if present, assuming it was already filled in by
0065       xgettext.  */
0066    old_field = get_field (header, "Project-Id-Version");
0067    if (old_field != NULL && strcmp (old_field, "PACKAGE VERSION") != 0)
0068      return old_field;
0069 -
0070 -  gettextlibdir = getenv ("GETTEXTLIBDIR");
0071 -  if (gettextlibdir == NULL || gettextlibdir[0] == '\0')
0072 -    gettextlibdir = relocate (LIBDIR "/gettext");
0073 -
0074 -  prog = xconcatenated_filename (gettextlibdir, "project-id", NULL);
0075 -
0076 -  /* Call the project-id shell script.  */
0077 -  argv[0] = "/bin/sh";
0078 -  argv[1] = prog;
0079 -  argv[2] = "yes";
0080 -  argv[3] = NULL;
0081 -  child = create_pipe_in (prog, "/bin/sh", argv, DEV_NULL, false, true, false,
0082 -                          fd);
0083 -  if (child == -1)
0084 -    goto failed;
0085 -
0086 -  /* Retrieve its result.  */
0087 -  fp = fdopen (fd[0], "r");
0088 -  if (fp == NULL)
0089 -    {
0090 -      error (0, errno, _("fdopen() failed"));
0091 -      goto failed;
0092 -    }
0093 -
0094 -  line = NULL; linesize = 0;
0095 -  linelen = getline (&line, &linesize, fp);
0096 -  if (linelen == (size_t)(-1))
0097 -    {
0098 -      error (0, 0, _("%s subprocess I/O error"), prog);
0099 -      fclose (fp);
0100 -      goto failed;
0101 -    }
0102 -  if (linelen > 0 && line[linelen - 1] == '\n')
0103 -    line[linelen - 1] = '\0';
0104 -
0105 -  fclose (fp);
0106 -
0107 -  /* Remove zombie process from process list, and retrieve exit status.  */
0108 -  exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL);
0109 -  if (exitstatus != 0)
0110 -    {
0111 -      error (0, 0, _("%s subprocess failed with exit code %d"),
0112 -             prog, exitstatus);
0113 -      goto failed;
0114 -    }
0115 -
0116 -  return line;
0117 -
0118 -failed:
0119    return "PACKAGE VERSION";
0120  }
0121
0122
0123  /* Construct the value for the PO-Revision-Date field.  */
0124 @@ -1100,66 +1001,10 @@
0125
0126  /* Return the user's email address.  */
0127  static const char *
0128  get_user_email ()
0129  {
0130 -  const char *prog = relocate (LIBDIR "/gettext/user-email");
0131 -  char *argv[4];
0132 -  pid_t child;
0133 -  int fd[1];
0134 -  FILE *fp;
0135 -  char *line;
0136 -  size_t linesize;
0137 -  size_t linelen;
0138 -  int exitstatus;
0139 -
0140 -  /* Ask the user for his email address.  */
0141 -  argv[0] = "/bin/sh";
0142 -  argv[1] = (char *) prog;
0143 -  argv[2] = (char *) _("\
0144 -The new message catalog should contain your email address, so that users can\n\
0145 -give you feedback about the translations, and so that maintainers can contact\n\
0146 -you in case of unexpected technical problems.\n");
0147 -  argv[3] = NULL;
0148 -  child = create_pipe_in (prog, "/bin/sh", argv, DEV_NULL, false, true, false,
0149 -                          fd);
0150 -  if (child == -1)
0151 -    goto failed;
0152 -
0153 -  /* Retrieve his answer.  */
0154 -  fp = fdopen (fd[0], "r");
0155 -  if (fp == NULL)
0156 -    {
0157 -      error (0, errno, _("fdopen() failed"));
0158 -      goto failed;
0159 -    }
0160 -
0161 -  line = NULL; linesize = 0;
0162 -  linelen = getline (&line, &linesize, fp);
0163 -  if (linelen == (size_t)(-1))
0164 -    {
0165 -      error (0, 0, _("%s subprocess I/O error"), prog);
0166 -      fclose (fp);
0167 -      goto failed;
0168 -    }
0169 -  if (linelen > 0 && line[linelen - 1] == '\n')
0170 -    line[linelen - 1] = '\0';
0171 -
0172 -  fclose (fp);
0173 -
0174 -  /* Remove zombie process from process list, and retrieve exit status.  */
0175 -  exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL);
0176 -  if (exitstatus != 0)
0177 -    {
0178 -      error (0, 0, _("%s subprocess failed with exit code %d"),
0179 -             prog, exitstatus);
0180 -      goto failed;
0181 -    }
0182 -
0183 -  return line;
0184 -
0185 -failed:
0186    return "EMAIL@ADDRESS";
0187  }
0188
0189
0190  /* Construct the value for the Last-Translator field.  */
0191 @@ -1199,62 +1044,10 @@
0192
0193  /* Return the language team's mailing list address or homepage URL.  */
0194  static const char *
0195  language_team_address ()
0196  {
0197 -  const char *prog = relocate (PROJECTSDIR "/team-address");
0198 -  char *argv[7];
0199 -  pid_t child;
0200 -  int fd[1];
0201 -  FILE *fp;
0202 -  char *line;
0203 -  size_t linesize;
0204 -  size_t linelen;
0205 -  int exitstatus;
0206 -
0207 -  /* Call the team-address shell script.  */
0208 -  argv[0] = "/bin/sh";
0209 -  argv[1] = (char *) prog;
0210 -  argv[2] = (char *) relocate (PROJECTSDIR);
0211 -  argv[3] = (char *) relocate (LIBDIR "/gettext");
0212 -  argv[4] = (char *) catalogname;
0213 -  argv[5] = (char *) language;
0214 -  argv[6] = NULL;
0215 -  child = create_pipe_in (prog, "/bin/sh", argv, DEV_NULL, false, true, false,
0216 -                          fd);
0217 -  if (child == -1)
0218 -    goto failed;
0219 -
0220 -  /* Retrieve its result.  */
0221 -  fp = fdopen (fd[0], "r");
0222 -  if (fp == NULL)
0223 -    {
0224 -      error (0, errno, _("fdopen() failed"));
0225 -      goto failed;
0226 -    }
0227 -
0228 -  line = NULL; linesize = 0;
0229 -  linelen = getline (&line, &linesize, fp);
0230 -  if (linelen == (size_t)(-1))
0231 -    line = "";
0232 -  else if (linelen > 0 && line[linelen - 1] == '\n')
0233 -    line[linelen - 1] = '\0';
0234 -
0235 -  fclose (fp);
0236 -
0237 -  /* Remove zombie process from process list, and retrieve exit status.  */
0238 -  exitstatus = wait_subprocess (child, prog, false, false, true, false, NULL);
0239 -  if (exitstatus != 0)
0240 -    {
0241 -      error (0, 0, _("%s subprocess failed with exit code %d"),
0242 -             prog, exitstatus);
0243 -      goto failed;
0244 -    }
0245 -
0246 -  return line;
0247 -
0248 -failed:
0249    return "";
0250  }
0251
0252
0253  /* Construct the value for the Language-Team field.  */