Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
Files
c1d7dd3a2ec0dfdabc1fafa7e75e854eb2ca2beb
MSYS2-packages/gettext/0.19.8.1-localename.patch
atom.long ecba2c54b9 gettext: Update to 0.19.8.1
2017-05-30 22:25:20 +08:00

175 lines
6.8 KiB
Diff
Raw Blame History

diff --git a/gettext-0.19.8.1.orig/gettext-runtime/gnulib-lib/localename.c b/gettext-0.19.8.1/gettext-runtime/gnulib-lib/localename.c
index e67bd01..4d3665f 100644
--- a/gettext-0.19.8.1.orig/gettext-runtime/gnulib-lib/localename.c
+++ b/gettext-0.19.8.1/gettext-runtime/gnulib-lib/localename.c
@@ -66,7 +66,7 @@ extern char * getlocalename_l(int, locale_t);
# endif
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# include <winnls.h>
@@ -1418,7 +1418,7 @@ gl_locale_name_canonicalize (char *name)
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
/* Canonicalize a Windows native locale name to a Unix locale name.
NAME is a sufficiently large buffer.
@@ -2836,11 +2836,6 @@ gl_locale_name_environ (int category, const char *categoryname)
Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0)
#endif
-#if defined __CYGWIN__
- /* Cygwin.
- Ignore dummy LANG value set by ~/.profile. */
- if (strcmp (retval, "C.UTF-8") != 0)
-#endif
return retval;
}
@@ -2878,7 +2873,7 @@ gl_locale_name_default (void)
"C.UTF-8" locale, which operates in the same way as the "C" locale.
*/
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
/* The system does not have a way of setting the locale, other than the
POSIX specified environment variables. We use C as default locale. */
@@ -2933,7 +2928,7 @@ gl_locale_name_default (void)
# endif
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+# if defined WINDOWS_NATIVE /* Native Windows */
{
LCID lcid;
diff --git a/gettext-0.19.8.1.orig/gettext-runtime/intl/localename.c b/gettext-0.19.8.1/gettext-runtime/intl/localename.c
index 81ab213..fa29d38 100644
--- a/gettext-0.19.8.1.orig/gettext-runtime/intl/localename.c
+++ b/gettext-0.19.8.1/gettext-runtime/intl/localename.c
@@ -66,7 +66,7 @@ extern char * getlocalename_l(int, locale_t);
# endif
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# include <winnls.h>
@@ -1418,7 +1418,7 @@ gl_locale_name_canonicalize (char *name)
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
/* Canonicalize a Windows native locale name to a Unix locale name.
NAME is a sufficiently large buffer.
@@ -2781,7 +2781,7 @@ gl_locale_name_thread (int category, const char *categoryname)
However it does not specify the exact format. Neither do SUSV2 and
ISO C 99. So we can use this feature only on selected systems (e.g.
those using GNU C Library). */
-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
+#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined(__CYGWIN__)
# define HAVE_LOCALE_NULL
#endif
@@ -2836,11 +2836,6 @@ gl_locale_name_environ (int category, const char *categoryname)
Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0)
#endif
-#if defined __CYGWIN__
- /* Cygwin.
- Ignore dummy LANG value set by ~/.profile. */
- if (strcmp (retval, "C.UTF-8") != 0)
-#endif
return retval;
}
@@ -2878,7 +2873,7 @@ gl_locale_name_default (void)
"C.UTF-8" locale, which operates in the same way as the "C" locale.
*/
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
/* The system does not have a way of setting the locale, other than the
POSIX specified environment variables. We use C as default locale. */
@@ -2933,7 +2928,7 @@ gl_locale_name_default (void)
# endif
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+# if defined WINDOWS_NATIVE /* Native Windows */
{
LCID lcid;
diff --git a/gettext-0.19.8.1.orig/gettext-tools/gnulib-lib/localename.c b/gettext-0.19.8.1/gettext-tools/gnulib-lib/localename.c
index e67bd01..226ce6e 100644
--- a/gettext-0.19.8.1.orig/gettext-tools/gnulib-lib/localename.c
+++ b/gettext-0.19.8.1/gettext-tools/gnulib-lib/localename.c
@@ -66,7 +66,7 @@ extern char * getlocalename_l(int, locale_t);
# endif
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# include <winnls.h>
@@ -1418,7 +1418,7 @@ gl_locale_name_canonicalize (char *name)
#endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */
/* Canonicalize a Windows native locale name to a Unix locale name.
NAME is a sufficiently large buffer.
@@ -2781,7 +2781,7 @@ gl_locale_name_thread (int category, const char *categoryname)
However it does not specify the exact format. Neither do SUSV2 and
ISO C 99. So we can use this feature only on selected systems (e.g.
those using GNU C Library). */
-#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__)
+#if defined _LIBC || ((defined __GLIBC__ && __GLIBC__ >= 2) && !defined __UCLIBC__) || defined(__CYGWIN__)
# define HAVE_LOCALE_NULL
#endif
@@ -2836,11 +2836,6 @@ gl_locale_name_environ (int category, const char *categoryname)
Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0)
#endif
-#if defined __CYGWIN__
- /* Cygwin.
- Ignore dummy LANG value set by ~/.profile. */
- if (strcmp (retval, "C.UTF-8") != 0)
-#endif
return retval;
}
@@ -2878,7 +2873,7 @@ gl_locale_name_default (void)
"C.UTF-8" locale, which operates in the same way as the "C" locale.
*/
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
/* The system does not have a way of setting the locale, other than the
POSIX specified environment variables. We use C as default locale. */
@@ -2933,7 +2928,7 @@ gl_locale_name_default (void)
# endif
-# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+# if defined WINDOWS_NATIVE /* Native Windows */
{
LCID lcid;
Reference in New Issue View Git Blame Copy Permalink