Merge pull request #3866 from lazka/gettext-0.22
gettext: Update to 0.22
This commit is contained in:
Christoph Reiter
GitHub
commit
a1dac18e38
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
pkgbase=gettext
|
pkgbase=gettext
|
||||||
pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl')
|
pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl')
|
||||||
pkgver=0.21
|
pkgver=0.22
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
pkgdesc="GNU internationalization library"
|
pkgdesc="GNU internationalization library"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="https://www.gnu.org/software/gettext/"
|
url="https://www.gnu.org/software/gettext/"
|
||||||
@ -11,28 +11,30 @@ license=('GPL')
|
|||||||
makedepends=('groff' 'libiconv-devel' 'autotools' 'gcc')
|
makedepends=('groff' 'libiconv-devel' 'autotools' 'gcc')
|
||||||
options=(!docs)
|
options=(!docs)
|
||||||
source=(https://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig}
|
source=(https://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig}
|
||||||
gettext-0.18.1.1-autopoint-V.patch
|
gettext-tools-tests-locale-ll-es.patch
|
||||||
gettext-0.19.8.1-no-woe32dll.patch
|
gettext-0.21.1-autopoint-V.patch
|
||||||
gettext-localename.patch
|
gettext-0.21.1-cygwin-ftm.patch
|
||||||
gettext-tests-cygwin.patch
|
gettext-0.22-no-woe32dll-gettext-tools-configure-ac.patch
|
||||||
gettext-0.19.8.1-cygwin-ftm.patch
|
gettext-0.22-no-woe32dll-m4-woe32-dll-m4.patch
|
||||||
gettext-0.19.8.1-have_wprintf.patch
|
gettext-0.22-gettext-runtime-gnulib-lib-localename-c.patch
|
||||||
gettext-0.21-disable-libtextstyle.patch
|
gettext-0.22-gettext-runtime-intl-gnulib-lib-localename-c.patch
|
||||||
|
gettext-0.22-gettext-tools-gnulib-lib-localename-c.patch
|
||||||
|
gettext-0.22-disable-libtextstyle.patch
|
||||||
gettext-0.19.8.1-msys2.patch
|
gettext-0.19.8.1-msys2.patch
|
||||||
gettext-0.19.7-archive.patch
|
gettext-0.19.7-archive.patch)
|
||||||
gnulib-cygwin-weak-bug.patch)
|
sha256sums=('49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab'
|
||||||
sha256sums=('c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12'
|
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'9fe8e25783ea629db3c64ce4d8e4d7912e01e6c3b7391cd48c0843b448576c25'
|
'a83c2e89aa799232847d120ce3da856fbee2fda87245233d336c5de044465321'
|
||||||
'b182af5d1e60c520fc6e716565c58a5f7497f608b5d4b07e3a58500fec54cdc5'
|
'2a8ea083abf7278b3b6157e6f3eed4e6a90b803308396e30b1302085b840c8e9'
|
||||||
'8eaf41ecf774501155a7684e64249bd6b668f2e9b05b6ce5383a22b71ff23ba3'
|
'62c0cf906df4c0196e2e3e4f79b91486f6a95d29bf9de8aed8c92b5075058497'
|
||||||
'7439a9e86628c6f85cc0ff639f7ff46d487e0ffb4c43139a49c6d85775819f45'
|
'71f26d49ddabf400ee14ea574495a5d3b3055957d81fecfb4cb5cb99dab3cd47'
|
||||||
'22cfaca417f04507a901cba93a7eb219183d5e681b7459d8c0e9660621a9a696'
|
'd5b14b03ca609764f1c646efa9e85dedafe69f967f37b8db194fcddc199f2d97'
|
||||||
'ec5e9ca3c85163d9f7e2ee19aee0c312bdda9db7be6de4ec7757ee40568aa1e6'
|
'd618348b44a4b19466707edf195aa84ca6825d7e4b4459f4c2c64fe47388b24c'
|
||||||
'544ce0589e9c70f4f75d77c76fd36f88d009ac9cfecb4812a67f878e38ac6418'
|
'1e5af27a1c29e1595696c899e0cc411a54acd9b7f8aef186c1640d79434f30f7'
|
||||||
'42276af94b61339f24ed2b184cb6bae85e8d32fae4f3cc8d51776e9db146c446'
|
'42edf54a3d63a57ba80ae7e65c641dd13276141ae4657002e70da1078ade354f'
|
||||||
'047b74d6240205c21fa3a6cb3d8bfeeb5721064c3ea5a318542d74e0378ab97a'
|
'3d15cfa0b06e882483c1b967d1240af25a6338e088a641de9582a7809e64d474'
|
||||||
'1233eb631779fa7dfd13313c955080b8e2cd8db4c352a4878db1edc40be7d40b')
|
'b28c5e2edb90bffbb4bae2b19f2677650f4cd56b061d427beb6ff50280dc835b'
|
||||||
|
'ceede59c0a5f8ad09fedcb5ad2ffb2261169d6aaaef04126f204c120512b977e')
|
||||||
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno
|
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno
|
||||||
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development)
|
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development)
|
||||||
|
|
||||||
@ -40,16 +42,17 @@ prepare() {
|
|||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
|
|
||||||
# Cygwin patches
|
# Cygwin patches
|
||||||
patch -p2 -i $srcdir/gettext-0.18.1.1-autopoint-V.patch
|
patch -p1 -i $srcdir/gettext-tools-tests-locale-ll-es.patch
|
||||||
patch -p2 -i $srcdir/gettext-0.19.8.1-no-woe32dll.patch
|
patch -p1 -i $srcdir/gettext-0.21.1-autopoint-V.patch
|
||||||
patch -p1 -i $srcdir/gettext-localename.patch
|
patch -p1 -i $srcdir/gettext-0.21.1-cygwin-ftm.patch
|
||||||
patch -p1 -i $srcdir/gettext-tests-cygwin.patch
|
patch -p1 -i $srcdir/gettext-0.22-no-woe32dll-gettext-tools-configure-ac.patch
|
||||||
patch -p2 -i $srcdir/gettext-0.19.8.1-cygwin-ftm.patch
|
patch -p1 -i $srcdir/gettext-0.22-no-woe32dll-m4-woe32-dll-m4.patch
|
||||||
patch -p2 -i $srcdir/gettext-0.19.8.1-have_wprintf.patch
|
patch -p1 -i $srcdir/gettext-0.22-gettext-runtime-gnulib-lib-localename-c.patch
|
||||||
patch -p1 -i $srcdir/gettext-0.21-disable-libtextstyle.patch
|
patch -p1 -i $srcdir/gettext-0.22-gettext-runtime-intl-gnulib-lib-localename-c.patch
|
||||||
|
patch -p1 -i $srcdir/gettext-0.22-gettext-tools-gnulib-lib-localename-c.patch
|
||||||
|
patch -p1 -i $srcdir/gettext-0.22-disable-libtextstyle.patch
|
||||||
|
|
||||||
# MSYS2 patch
|
# MSYS2 patch
|
||||||
patch -p1 -i $srcdir/gnulib-cygwin-weak-bug.patch
|
|
||||||
patch -p1 -i $srcdir/gettext-0.19.8.1-msys2.patch
|
patch -p1 -i $srcdir/gettext-0.19.8.1-msys2.patch
|
||||||
|
|
||||||
pushd gettext-tools/misc > /dev/null
|
pushd gettext-tools/misc > /dev/null
|
||||||
|
|||||||
@ -2245,3 +2245,14 @@ diff -Nur archive-orig/gettext-0.21/config.rpath archive/gettext-0.21/config.rpa
|
|||||||
shrext=.dll
|
shrext=.dll
|
||||||
library_names_spec='$libname.dll.a $libname.lib'
|
library_names_spec='$libname.dll.a $libname.lib'
|
||||||
;;
|
;;
|
||||||
|
--- archive-orig/gettext-0.22/m4/build-to-host.m4.orig 2023-06-29 21:38:02.580298900 +0200
|
||||||
|
+++ archive/gettext-0.22/m4/build-to-host.m4 2023-06-29 21:38:13.957674100 +0200
|
||||||
|
@@ -39,7 +39,7 @@
|
||||||
|
gl_final_[$1]="$[$1]"
|
||||||
|
dnl Translate it from build syntax to host syntax.
|
||||||
|
case "$build_os" in
|
||||||
|
- cygwin*)
|
||||||
|
+ cygwin* | msys*)
|
||||||
|
case "$host_os" in
|
||||||
|
mingw*)
|
||||||
|
gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;;
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
--- origsrc/gettext-0.19.8.1/gettext-runtime/m4/intl.m4 2016-03-20 02:37:53.000000000 -0500
|
|
||||||
+++ src/gettext-0.19.8.1/gettext-runtime/m4/intl.m4 2016-10-20 11:07:16.828746100 -0500
|
|
||||||
@@ -94,7 +94,7 @@
|
|
||||||
HAVE_NEWLOCALE=0
|
|
||||||
fi
|
|
||||||
AC_SUBST([HAVE_NEWLOCALE])
|
|
||||||
- if test "$ac_cv_func_wprintf" = yes; then
|
|
||||||
+ if test "$ac_cv_func_fwprintf" = yes; then
|
|
||||||
HAVE_WPRINTF=1
|
|
||||||
else
|
|
||||||
HAVE_WPRINTF=0
|
|
||||||
@ -1,28 +1,26 @@
|
|||||||
diff --git gettext-0.19.8.1.orig/gettext-runtime/m4/intl.m4 gettext-0.19.8.1/gettext-runtime/m4/intl.m4
|
--- gettext-0.22/gettext-runtime/m4/build-to-host.m4.orig 2023-06-29 21:38:02.580298900 +0200
|
||||||
index 42fac95..9ab0952 100644
|
+++ gettext-0.22/gettext-runtime/m4/build-to-host.m4 2023-06-29 21:38:13.957674100 +0200
|
||||||
--- gettext-0.19.8.1.orig/gettext-runtime/m4/intl.m4
|
@@ -39,7 +39,7 @@
|
||||||
+++ gettext-0.19.8.1/gettext-runtime/m4/intl.m4
|
gl_final_[$1]="$[$1]"
|
||||||
@@ -113,7 +113,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
dnl Translate it from build syntax to host syntax.
|
||||||
dnl exported variables _also_ in the static library.
|
case "$build_os" in
|
||||||
if test "$enable_shared" = yes; then
|
- cygwin*)
|
||||||
|
+ cygwin* | msys*)
|
||||||
case "$host_os" in
|
case "$host_os" in
|
||||||
- mingw* | cygwin*) is_woe32dll=yes ;;
|
mingw*)
|
||||||
+ mingw* | cygwin* | msys*) is_woe32dll=yes ;;
|
gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;;
|
||||||
*) is_woe32dll=no ;;
|
--- gettext-0.22/gettext-runtime/gnulib-m4/threadlib.m4.orig 2023-06-29 21:17:29.190147400 +0200
|
||||||
esac
|
+++ gettext-0.22/gettext-runtime/gnulib-m4/threadlib.m4 2023-06-29 21:20:04.677589400 +0200
|
||||||
else
|
@@ -85,7 +85,7 @@
|
||||||
@@ -125,7 +125,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
AC_CACHE_CHECK([whether imported symbols can be declared weak],
|
||||||
dnl On mingw and Cygwin, we can activate special Makefile rules which add
|
[gl_cv_have_weak],
|
||||||
dnl version information to the shared libraries and executables.
|
[case "$host_os" in
|
||||||
case "$host_os" in
|
- cygwin* | mingw*)
|
||||||
- mingw* | cygwin*) is_woe32=yes ;;
|
+ cygwin* | msys* | mingw*)
|
||||||
+ mingw* | cygwin* | msys*) is_woe32=yes ;;
|
dnl On Cygwin 3.2.0 with gcc 10.2, and likewise on mingw 10.0.0 with
|
||||||
*) is_woe32=no ;;
|
dnl gcc 11.3, the test below would succeed, but programs that use
|
||||||
esac
|
dnl pthread_in_use() with weak symbol references crash miserably at
|
||||||
WOE32=$is_woe32
|
@@ -461,7 +461,7 @@
|
||||||
--- gettext-0.21/gettext-runtime/gnulib-m4/threadlib.m4.orig 2022-01-02 16:50:14.502447900 +0100
|
|
||||||
+++ gettext-0.21/gettext-runtime/gnulib-m4/threadlib.m4 2022-01-02 16:50:46.990712700 +0100
|
|
||||||
@@ -416,7 +416,7 @@
|
|
||||||
dnl Disable multithreading by default on Cygwin 1.5.x, because it has
|
dnl Disable multithreading by default on Cygwin 1.5.x, because it has
|
||||||
dnl bugs that lead to endless loops or crashes. See
|
dnl bugs that lead to endless loops or crashes. See
|
||||||
dnl <https://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
|
dnl <https://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
|
||||||
@ -31,6 +29,7 @@ index 42fac95..9ab0952 100644
|
|||||||
case `uname -r` in
|
case `uname -r` in
|
||||||
1.[0-5].*) gl_use_threads=no ;;
|
1.[0-5].*) gl_use_threads=no ;;
|
||||||
*) gl_use_threads=yes ;;
|
*) gl_use_threads=yes ;;
|
||||||
|
|
||||||
diff --git gettext-0.19.8.1.orig/build-aux/config.rpath gettext-0.19.8.1/build-aux/config.rpath
|
diff --git gettext-0.19.8.1.orig/build-aux/config.rpath gettext-0.19.8.1/build-aux/config.rpath
|
||||||
index 98183ff..c5d797d 100755
|
index 98183ff..c5d797d 100755
|
||||||
--- gettext-0.19.8.1.orig/build-aux/config.rpath
|
--- gettext-0.19.8.1.orig/build-aux/config.rpath
|
||||||
|
|||||||
@ -1,31 +0,0 @@
|
|||||||
--- origsrc/gettext-0.19.8.1/gettext-tools/configure.ac 2016-06-09 17:56:00.000000000 -0500
|
|
||||||
+++ src/gettext-0.19.8.1/gettext-tools/configure.ac 2016-10-10 02:10:37.323106300 -0500
|
|
||||||
@@ -100,7 +100,7 @@ LT_LANG([Windows Resource])
|
|
||||||
dnl On mingw and Cygwin, we can activate special Makefile rules which add
|
|
||||||
dnl version information to the shared libraries and executables.
|
|
||||||
case "$host_os" in
|
|
||||||
- mingw* | cygwin*) special_makefile_rules=woe32 ;;
|
|
||||||
+ mingw*) special_makefile_rules=woe32 ;;
|
|
||||||
os2*) special_makefile_rules=os2 ;;
|
|
||||||
*) special_makefile_rules=none ;;
|
|
||||||
esac
|
|
||||||
@@ -212,7 +212,7 @@ dnl must arrange to define the auxili
|
|
||||||
dnl exported variables _also_ in the static library.
|
|
||||||
if test "$enable_shared" = yes; then
|
|
||||||
case "$host_os" in
|
|
||||||
- mingw* | cygwin*) is_woe32dll=yes ;;
|
|
||||||
+ mingw*) is_woe32dll=yes ;;
|
|
||||||
*) is_woe32dll=no ;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
--- origsrc/gettext-0.19.8.1/m4/woe32-dll.m4 2016-03-20 02:37:53.000000000 -0500
|
|
||||||
+++ src/gettext-0.19.8.1/m4/woe32-dll.m4 2016-10-10 02:11:04.906081600 -0500
|
|
||||||
@@ -30,7 +30,7 @@ AC_DEFUN([gl_WOE32_DLL],
|
|
||||||
[
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
|
||||||
case "$host_os" in
|
|
||||||
- mingw* | cygwin*)
|
|
||||||
+ mingw*)
|
|
||||||
AC_MSG_CHECKING([for auto-import of symbols])
|
|
||||||
AC_CACHE_VAL([gl_cv_ld_autoimport], [
|
|
||||||
gl_save_LDFLAGS="$LDFLAGS"
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
--- origsrc/gettext-0.18.1.1/gettext-tools/misc/autopoint.in 2010-06-06 08:49:57.000000000 -0400
|
--- origsrc/gettext-tools/misc/autopoint.in 2022-10-09 14:52:03.000000000 -0600
|
||||||
+++ src/gettext-0.18.1.1/gettext-tools/misc/autopoint.in 2011-10-16 00:57:42.789133600 -0400
|
+++ src/gettext-tools/misc/autopoint.in 2022-10-29 11:53:55.388261300 -0600
|
||||||
@@ -161,9 +161,9 @@ Options:
|
@@ -193,9 +193,9 @@ Options:
|
||||||
--version print version information and exit
|
--version print version information and exit
|
||||||
-f, --force force overwriting of files that already exist
|
-f, --force force overwriting of files that already exist
|
||||||
-n, --dry-run print modifications but don't perform them"
|
-n, --dry-run print modifications but don't perform them"
|
||||||
@ -11,9 +11,9 @@
|
|||||||
+ -V version copy the infrastructure of the specified gettext version
|
+ -V version copy the infrastructure of the specified gettext version
|
||||||
+ (dangerous)"
|
+ (dangerous)"
|
||||||
echo "
|
echo "
|
||||||
Report bugs to <bug-gnu-gettext@gnu.org>."
|
Report bugs in the bug tracker at <https://savannah.gnu.org/projects/gettext>
|
||||||
}
|
or by email to <bug-gettext@gnu.org>."
|
||||||
@@ -210,17 +210,17 @@ func_fatal_error ()
|
@@ -255,17 +255,17 @@ func_fatal_error ()
|
||||||
force=yes ;;
|
force=yes ;;
|
||||||
--help | --hel | --he | --h )
|
--help | --hel | --he | --h )
|
||||||
func_usage; exit 0 ;;
|
func_usage; exit 0 ;;
|
||||||
@ -39,10 +39,10 @@
|
|||||||
+ -V*) # Some people omit the space between -V and the version number.
|
+ -V*) # Some people omit the space between -V and the version number.
|
||||||
+ ver=`echo "X$1" | sed -e 's/^X-V//'`
|
+ ver=`echo "X$1" | sed -e 's/^X-V//'`
|
||||||
+ shift ;;
|
+ shift ;;
|
||||||
--version | --versio | --versi | --vers | --ver | --ve | --v )
|
--version-without-config )
|
||||||
func_version
|
# Print version output without build dependent details.
|
||||||
exit 0 ;;
|
func_version false
|
||||||
@@ -276,7 +276,7 @@ fi
|
@@ -365,7 +365,7 @@ fi
|
||||||
if test -n "$xver"; then
|
if test -n "$xver"; then
|
||||||
if test -n "$ver"; then
|
if test -n "$ver"; then
|
||||||
if test "X$ver" != "X$xver"; then
|
if test "X$ver" != "X$xver"; then
|
||||||
11
gettext/gettext-0.21.1-cygwin-ftm.patch
Normal file
11
gettext/gettext-0.21.1-cygwin-ftm.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- origsrc/gettext-runtime/intl/libgnuintl.in.h 2022-10-09 14:08:36.000000000 -0600
|
||||||
|
+++ src/gettext-runtime/intl/libgnuintl.in.h 2022-10-29 12:21:09.667333500 -0600
|
||||||
|
@@ -562,7 +562,7 @@ extern char *setlocale (int, const char
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
|
||||||
|
-# if @HAVE_NEWLOCALE@
|
||||||
|
+# if @HAVE_NEWLOCALE@ && __POSIX_VISIBLE >= 200809
|
||||||
|
|
||||||
|
# undef newlocale
|
||||||
|
# define newlocale libintl_newlocale
|
||||||
@ -1,5 +1,5 @@
|
|||||||
diff --git a/Makefile.am b/Makefile.am
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
index 815e3c7..e897de7 100644
|
index 5a7184c..28267a5 100644
|
||||||
--- a/Makefile.am
|
--- a/Makefile.am
|
||||||
+++ b/Makefile.am
|
+++ b/Makefile.am
|
||||||
@@ -19,7 +19,7 @@
|
@@ -19,7 +19,7 @@
|
||||||
@ -11,7 +11,7 @@ index 815e3c7..e897de7 100644
|
|||||||
|
|
||||||
changelog_etc = \
|
changelog_etc = \
|
||||||
gettext-runtime/ChangeLog.0 \
|
gettext-runtime/ChangeLog.0 \
|
||||||
@@ -123,7 +123,6 @@ distcheck-hook:
|
@@ -124,7 +124,6 @@ distcheck-hook:
|
||||||
test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`"
|
test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`"
|
||||||
cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
|
cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
|
||||||
cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in
|
cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in
|
||||||
@ -20,7 +20,7 @@ index 815e3c7..e897de7 100644
|
|||||||
cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class
|
cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class
|
||||||
test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`"
|
test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`"
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 49689fb..2d23b44 100644
|
index f4e54ea..ff850ae 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
|
@@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
|
||||||
@ -42,23 +42,23 @@ index 49689fb..2d23b44 100644
|
|||||||
AC_CONFIG_FILES([Makefile])
|
AC_CONFIG_FILES([Makefile])
|
||||||
|
|
||||||
diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
|
diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
|
||||||
index 449a797..c5719c2 100644
|
index 449a797..bce4ad8 100644
|
||||||
--- a/gettext-tools/Makefile.am
|
--- a/gettext-tools/Makefile.am
|
||||||
+++ b/gettext-tools/Makefile.am
|
+++ b/gettext-tools/Makefile.am
|
||||||
@@ -19,7 +19,7 @@
|
@@ -19,7 +19,7 @@
|
||||||
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
|
||||||
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
|
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
|
||||||
|
|
||||||
-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
||||||
+SUBDIRS = intl gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
+SUBDIRS = gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
|
||||||
|
|
||||||
EXTRA_DIST = misc/DISCLAIM
|
EXTRA_DIST = misc/DISCLAIM
|
||||||
MOSTLYCLEANFILES = core *.stackdump
|
MOSTLYCLEANFILES = core *.stackdump
|
||||||
diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h
|
diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h
|
||||||
index 536b51b..585ce66 100644
|
index 05ce0cf..936331c 100644
|
||||||
--- a/gettext-tools/libgettextpo/textstyle.in.h
|
--- a/gettext-tools/libgettextpo/textstyle.in.h
|
||||||
+++ b/gettext-tools/libgettextpo/textstyle.in.h
|
+++ b/gettext-tools/libgettextpo/textstyle.in.h
|
||||||
@@ -213,7 +213,8 @@ typedef ostream_t file_ostream_t;
|
@@ -239,7 +239,8 @@ typedef ostream_t file_ostream_t;
|
||||||
static inline file_ostream_t
|
static inline file_ostream_t
|
||||||
file_ostream_create (FILE *fp)
|
file_ostream_create (FILE *fp)
|
||||||
{
|
{
|
||||||
@ -68,7 +68,7 @@ index 536b51b..585ce66 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* --------------------------- From fd-ostream.h --------------------------- */
|
/* --------------------------- From fd-ostream.h --------------------------- */
|
||||||
@@ -413,6 +414,30 @@ html_styled_ostream_create (ostream_t destination _GL_UNUSED,
|
@@ -439,6 +440,30 @@ html_styled_ostream_create (_GL_ATTRIBUTE_MAYBE_UNUSED ostream_t destination,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -100,10 +100,10 @@ index 536b51b..585ce66 100644
|
|||||||
|
|
||||||
#define color_test_mode false
|
#define color_test_mode false
|
||||||
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
|
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
|
||||||
index 764ffad..eccfbbd 100644
|
index 510ab2a..72791ba 100644
|
||||||
--- a/gettext-tools/src/Makefile.am
|
--- a/gettext-tools/src/Makefile.am
|
||||||
+++ b/gettext-tools/src/Makefile.am
|
+++ b/gettext-tools/src/Makefile.am
|
||||||
@@ -292,19 +292,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c
|
@@ -291,19 +291,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c
|
||||||
cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
|
cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
|
||||||
cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
|
cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
|
||||||
|
|
||||||
@ -126,3 +126,4 @@ index 764ffad..eccfbbd 100644
|
|||||||
|
|
||||||
# How to build libgettextsrc.la.
|
# How to build libgettextsrc.la.
|
||||||
# Need ../gnulib-lib/libgettextlib.la.
|
# Need ../gnulib-lib/libgettextlib.la.
|
||||||
|
|
||||||
@ -0,0 +1,97 @@
|
|||||||
|
--- origsrc/gettext-runtime/gnulib-lib/localename.c 2023-04-09 03:52:51.000000000 -0600
|
||||||
|
+++ src/gettext-runtime/gnulib-lib/localename.c 2023-06-17 10:47:51.943999100 -0600
|
||||||
|
@@ -74,7 +74,7 @@ extern char * getlocalename_l(int, local
|
||||||
|
# include "glthread/lock.h"
|
||||||
|
#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>
|
||||||
|
@@ -1458,7 +1458,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.
|
||||||
|
@@ -3193,19 +3193,6 @@ gl_locale_name_thread_unsafe (int catego
|
||||||
|
# endif
|
||||||
|
# elif defined _AIX && HAVE_NAMELESS_LOCALES
|
||||||
|
return get_locale_t_name (category, thread_locale);
|
||||||
|
-# elif defined __CYGWIN__
|
||||||
|
- /* Cygwin < 2.6 lacks uselocale and thread-local locales altogether.
|
||||||
|
- Cygwin <= 2.6.1 lacks NL_LOCALE_NAME, requiring peeking inside
|
||||||
|
- an opaque struct. */
|
||||||
|
-# ifdef NL_LOCALE_NAME
|
||||||
|
- return nl_langinfo_l (NL_LOCALE_NAME (category), thread_locale);
|
||||||
|
-# else
|
||||||
|
- /* FIXME: Remove when we can assume new-enough Cygwin. */
|
||||||
|
- struct __locale_t {
|
||||||
|
- char categories[7][32];
|
||||||
|
- };
|
||||||
|
- return ((struct __locale_t *) thread_locale)->categories[category];
|
||||||
|
-# endif
|
||||||
|
# elif defined __HAIKU__
|
||||||
|
/* Since 2022, Haiku has per-thread locales. locale_t is 'void *',
|
||||||
|
but in fact a 'LocaleBackendData *'. */
|
||||||
|
@@ -3299,7 +3286,7 @@ gl_locale_name_thread (int category, _GL
|
||||||
|
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
|
||||||
|
|
||||||
|
@@ -3335,7 +3322,7 @@ gl_locale_name_posix (int category, _GL_
|
||||||
|
environment variables directly. This is necessary
|
||||||
|
1. on systems which have a facility for customizing the default locale
|
||||||
|
(Mac OS X, native Windows, Cygwin) and where the system's setlocale()
|
||||||
|
- function ignores this default locale (Mac OS X, Cygwin), in two cases:
|
||||||
|
+ function ignores this default locale (Mac OS X), in two cases:
|
||||||
|
a. when the user missed to use the setlocale() override from libintl
|
||||||
|
(for example by not including <libintl.h>),
|
||||||
|
b. when setlocale supports only the "C" locale, such as on Cygwin
|
||||||
|
@@ -3390,11 +3377,6 @@ gl_locale_name_environ (_GL_UNUSED int c
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -3423,16 +3405,11 @@ gl_locale_name_default (void)
|
||||||
|
- On native Windows, by default, none of LC_* or LANG are set.
|
||||||
|
When no environment variable is set, setlocale (LC_ALL, "") uses the
|
||||||
|
locale chosen by the user.
|
||||||
|
- - On Cygwin 1.5.x, by default, none of LC_* or LANG are set.
|
||||||
|
- When no environment variable is set, setlocale (LC_ALL, "") uses the
|
||||||
|
- "C" locale.
|
||||||
|
- - On Cygwin 1.7, by default, LANG is set to "C.UTF-8" when the default
|
||||||
|
- ~/.profile is executed.
|
||||||
|
When no environment variable is set, setlocale (LC_ALL, "") uses the
|
||||||
|
"C.UTF-8" locale, which operates in the same way as the "C" locale.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
|
||||||
|
+#if !(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. */
|
||||||
|
@@ -3485,7 +3462,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;
|
||||||
|
|
||||||
@ -0,0 +1,97 @@
|
|||||||
|
--- origsrc/gettext-runtime/intl/gnulib-lib/localename.c 2023-04-09 03:53:06.000000000 -0600
|
||||||
|
+++ src/gettext-runtime/intl/gnulib-lib/localename.c 2023-06-17 11:05:44.942389500 -0600
|
||||||
|
@@ -74,7 +74,7 @@ extern char * getlocalename_l(int, local
|
||||||
|
# include "glthread/lock.h"
|
||||||
|
#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>
|
||||||
|
@@ -1458,7 +1458,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.
|
||||||
|
@@ -3193,19 +3193,6 @@ gl_locale_name_thread_unsafe (int catego
|
||||||
|
# endif
|
||||||
|
# elif defined _AIX && HAVE_NAMELESS_LOCALES
|
||||||
|
return get_locale_t_name (category, thread_locale);
|
||||||
|
-# elif defined __CYGWIN__
|
||||||
|
- /* Cygwin < 2.6 lacks uselocale and thread-local locales altogether.
|
||||||
|
- Cygwin <= 2.6.1 lacks NL_LOCALE_NAME, requiring peeking inside
|
||||||
|
- an opaque struct. */
|
||||||
|
-# ifdef NL_LOCALE_NAME
|
||||||
|
- return nl_langinfo_l (NL_LOCALE_NAME (category), thread_locale);
|
||||||
|
-# else
|
||||||
|
- /* FIXME: Remove when we can assume new-enough Cygwin. */
|
||||||
|
- struct __locale_t {
|
||||||
|
- char categories[7][32];
|
||||||
|
- };
|
||||||
|
- return ((struct __locale_t *) thread_locale)->categories[category];
|
||||||
|
-# endif
|
||||||
|
# elif defined __HAIKU__
|
||||||
|
/* Since 2022, Haiku has per-thread locales. locale_t is 'void *',
|
||||||
|
but in fact a 'LocaleBackendData *'. */
|
||||||
|
@@ -3299,7 +3286,7 @@ gl_locale_name_thread (int category, _GL
|
||||||
|
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
|
||||||
|
|
||||||
|
@@ -3335,7 +3322,7 @@ gl_locale_name_posix (int category, _GL_
|
||||||
|
environment variables directly. This is necessary
|
||||||
|
1. on systems which have a facility for customizing the default locale
|
||||||
|
(Mac OS X, native Windows, Cygwin) and where the system's setlocale()
|
||||||
|
- function ignores this default locale (Mac OS X, Cygwin), in two cases:
|
||||||
|
+ function ignores this default locale (Mac OS X), in two cases:
|
||||||
|
a. when the user missed to use the setlocale() override from libintl
|
||||||
|
(for example by not including <libintl.h>),
|
||||||
|
b. when setlocale supports only the "C" locale, such as on Cygwin
|
||||||
|
@@ -3390,11 +3377,6 @@ gl_locale_name_environ (_GL_UNUSED int c
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -3423,16 +3405,11 @@ gl_locale_name_default (void)
|
||||||
|
- On native Windows, by default, none of LC_* or LANG are set.
|
||||||
|
When no environment variable is set, setlocale (LC_ALL, "") uses the
|
||||||
|
locale chosen by the user.
|
||||||
|
- - On Cygwin 1.5.x, by default, none of LC_* or LANG are set.
|
||||||
|
- When no environment variable is set, setlocale (LC_ALL, "") uses the
|
||||||
|
- "C" locale.
|
||||||
|
- - On Cygwin 1.7, by default, LANG is set to "C.UTF-8" when the default
|
||||||
|
- ~/.profile is executed.
|
||||||
|
When no environment variable is set, setlocale (LC_ALL, "") uses the
|
||||||
|
"C.UTF-8" locale, which operates in the same way as the "C" locale.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
|
||||||
|
+#if !(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. */
|
||||||
|
@@ -3485,7 +3462,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;
|
||||||
|
|
||||||
@ -0,0 +1,97 @@
|
|||||||
|
--- origsrc/gettext-tools/gnulib-lib/localename.c 2023-04-09 03:54:01.000000000 -0600
|
||||||
|
+++ src/gettext-tools/gnulib-lib/localename.c 2023-06-17 11:04:08.426713100 -0600
|
||||||
|
@@ -74,7 +74,7 @@ extern char * getlocalename_l(int, local
|
||||||
|
# include "glthread/lock.h"
|
||||||
|
#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>
|
||||||
|
@@ -1458,7 +1458,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.
|
||||||
|
@@ -3193,19 +3193,6 @@ gl_locale_name_thread_unsafe (int catego
|
||||||
|
# endif
|
||||||
|
# elif defined _AIX && HAVE_NAMELESS_LOCALES
|
||||||
|
return get_locale_t_name (category, thread_locale);
|
||||||
|
-# elif defined __CYGWIN__
|
||||||
|
- /* Cygwin < 2.6 lacks uselocale and thread-local locales altogether.
|
||||||
|
- Cygwin <= 2.6.1 lacks NL_LOCALE_NAME, requiring peeking inside
|
||||||
|
- an opaque struct. */
|
||||||
|
-# ifdef NL_LOCALE_NAME
|
||||||
|
- return nl_langinfo_l (NL_LOCALE_NAME (category), thread_locale);
|
||||||
|
-# else
|
||||||
|
- /* FIXME: Remove when we can assume new-enough Cygwin. */
|
||||||
|
- struct __locale_t {
|
||||||
|
- char categories[7][32];
|
||||||
|
- };
|
||||||
|
- return ((struct __locale_t *) thread_locale)->categories[category];
|
||||||
|
-# endif
|
||||||
|
# elif defined __HAIKU__
|
||||||
|
/* Since 2022, Haiku has per-thread locales. locale_t is 'void *',
|
||||||
|
but in fact a 'LocaleBackendData *'. */
|
||||||
|
@@ -3299,7 +3286,7 @@ gl_locale_name_thread (int category, _GL
|
||||||
|
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
|
||||||
|
|
||||||
|
@@ -3335,7 +3322,7 @@ gl_locale_name_posix (int category, _GL_
|
||||||
|
environment variables directly. This is necessary
|
||||||
|
1. on systems which have a facility for customizing the default locale
|
||||||
|
(Mac OS X, native Windows, Cygwin) and where the system's setlocale()
|
||||||
|
- function ignores this default locale (Mac OS X, Cygwin), in two cases:
|
||||||
|
+ function ignores this default locale (Mac OS X), in two cases:
|
||||||
|
a. when the user missed to use the setlocale() override from libintl
|
||||||
|
(for example by not including <libintl.h>),
|
||||||
|
b. when setlocale supports only the "C" locale, such as on Cygwin
|
||||||
|
@@ -3390,11 +3377,6 @@ gl_locale_name_environ (_GL_UNUSED int c
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -3423,16 +3405,11 @@ gl_locale_name_default (void)
|
||||||
|
- On native Windows, by default, none of LC_* or LANG are set.
|
||||||
|
When no environment variable is set, setlocale (LC_ALL, "") uses the
|
||||||
|
locale chosen by the user.
|
||||||
|
- - On Cygwin 1.5.x, by default, none of LC_* or LANG are set.
|
||||||
|
- When no environment variable is set, setlocale (LC_ALL, "") uses the
|
||||||
|
- "C" locale.
|
||||||
|
- - On Cygwin 1.7, by default, LANG is set to "C.UTF-8" when the default
|
||||||
|
- ~/.profile is executed.
|
||||||
|
When no environment variable is set, setlocale (LC_ALL, "") uses the
|
||||||
|
"C.UTF-8" locale, which operates in the same way as the "C" locale.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
|
||||||
|
+#if !(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. */
|
||||||
|
@@ -3485,7 +3462,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;
|
||||||
|
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
--- origsrc/gettext-tools/configure.ac 2023-06-17 04:58:50.000000000 -0600
|
||||||
|
+++ src/gettext-tools/configure.ac 2023-06-17 10:01:43.448648800 -0600
|
||||||
|
@@ -103,10 +103,10 @@ dnl Prepares the libtool configuration f
|
||||||
|
dnl sets the RC variable to a program that compiles Windows resource files.
|
||||||
|
LT_LANG([Windows Resource])
|
||||||
|
|
||||||
|
-dnl On mingw and Cygwin, we can activate special Makefile rules which add
|
||||||
|
+dnl On mingw, we can activate special Makefile rules which add
|
||||||
|
dnl version information to the shared libraries and executables.
|
||||||
|
case "$host_os" in
|
||||||
|
- mingw* | cygwin*) is_woe32=yes ;;
|
||||||
|
+ mingw*) is_woe32=yes ;;
|
||||||
|
*) is_woe32=no ;;
|
||||||
|
esac
|
||||||
|
AM_CONDITIONAL([WOE32], [test $is_woe32 = yes])
|
||||||
|
@@ -263,7 +263,7 @@ if test "$gl_cv_libxml_use_included" = y
|
||||||
|
[Define if libxml is being used as a static library.])
|
||||||
|
fi
|
||||||
|
|
||||||
|
-dnl Compilation on mingw and Cygwin needs special Makefile rules, because
|
||||||
|
+dnl Compilation on mingw needs special Makefile rules, because
|
||||||
|
dnl 1. when we install a shared library, we must arrange to export
|
||||||
|
dnl auxiliary pointer variables for every exported variable,
|
||||||
|
dnl 2. when we install a shared library and a static library simultaneously,
|
||||||
|
@@ -272,7 +272,7 @@ dnl must arrange to define the auxili
|
||||||
|
dnl exported variables _also_ in the static library.
|
||||||
|
if test "$enable_shared" = yes; then
|
||||||
|
case "$host_os" in
|
||||||
|
- mingw* | cygwin*) is_woe32dll=yes ;;
|
||||||
|
+ mingw*) is_woe32dll=yes ;;
|
||||||
|
*) is_woe32dll=no ;;
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
@@ -281,7 +281,7 @@ fi
|
||||||
|
AM_CONDITIONAL([WOE32DLL], [test $is_woe32dll = yes])
|
||||||
|
if test $is_woe32dll = yes; then
|
||||||
|
AC_DEFINE([WOE32DLL], [1],
|
||||||
|
- [Define when --enable-shared is used on mingw or Cygwin.])
|
||||||
|
+ [Define when --enable-shared is used on mingw.])
|
||||||
|
fi
|
||||||
|
|
||||||
|
GETTEXTLIB_EXPORTS_FLAGS=
|
||||||
11
gettext/gettext-0.22-no-woe32dll-m4-woe32-dll-m4.patch
Normal file
11
gettext/gettext-0.22-no-woe32dll-m4-woe32-dll-m4.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- origsrc/m4/woe32-dll.m4 2020-10-04 17:58:09.000000000 -0600
|
||||||
|
+++ src/m4/woe32-dll.m4 2023-06-17 10:04:48.858239300 -0600
|
||||||
|
@@ -30,7 +30,7 @@ AC_DEFUN([gl_WOE32_DLL],
|
||||||
|
[
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
|
case "$host_os" in
|
||||||
|
- mingw* | cygwin*)
|
||||||
|
+ mingw*)
|
||||||
|
AC_CACHE_CHECK([for auto-import of symbols],
|
||||||
|
[gl_cv_ld_autoimport],
|
||||||
|
[dnl --disable-auto-import is unsupported in MSVC and in MSVC/clang.
|
||||||
@ -1,168 +0,0 @@
|
|||||||
--- origsrc/gettext-runtime/gnulib-lib/localename.c 2020-06-26 13:31:00.000000000 -0600
|
|
||||||
+++ src/gettext-runtime/gnulib-lib/localename.c 2021-07-26 22:46:33.473276900 -0600
|
|
||||||
@@ -79,7 +79,7 @@
|
|
||||||
# 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>
|
|
||||||
@@ -1463,7 +1463,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.
|
|
||||||
@@ -3334,11 +3334,6 @@ gl_locale_name_environ (int category, co
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -3376,7 +3371,7 @@ gl_locale_name_default (void)
|
|
||||||
"C.UTF-8" locale, which operates in the same way as the "C" locale.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
|
|
||||||
+#if !(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. */
|
|
||||||
@@ -3429,7 +3424,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;
|
|
||||||
|
|
||||||
--- origsrc/gettext-runtime/intl/localename.c 2020-06-26 16:05:00.000000000 -0600
|
|
||||||
+++ src/gettext-runtime/intl/localename.c 2021-07-26 22:46:33.473276900 -0600
|
|
||||||
@@ -79,7 +79,7 @@
|
|
||||||
# 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>
|
|
||||||
@@ -1463,7 +1463,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.
|
|
||||||
@@ -3243,7 +3243,7 @@ gl_locale_name_thread (int category, con
|
|
||||||
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
|
|
||||||
|
|
||||||
@@ -3334,11 +3334,6 @@ gl_locale_name_environ (int category, co
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -3376,7 +3371,7 @@ gl_locale_name_default (void)
|
|
||||||
"C.UTF-8" locale, which operates in the same way as the "C" locale.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
|
|
||||||
+#if !(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. */
|
|
||||||
@@ -3429,7 +3424,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;
|
|
||||||
|
|
||||||
--- origsrc/gettext-tools/gnulib-lib/localename.c 2020-06-26 13:57:00.000000000 -0600
|
|
||||||
+++ src/gettext-tools/gnulib-lib/localename.c 2021-07-26 22:46:33.473276900 -0600
|
|
||||||
@@ -79,7 +79,7 @@
|
|
||||||
# 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>
|
|
||||||
@@ -1463,7 +1463,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.
|
|
||||||
@@ -3243,7 +3243,7 @@ gl_locale_name_thread (int category, con
|
|
||||||
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
|
|
||||||
|
|
||||||
@@ -3334,11 +3334,6 @@ gl_locale_name_environ (int category, co
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -3376,7 +3371,7 @@ gl_locale_name_default (void)
|
|
||||||
"C.UTF-8" locale, which operates in the same way as the "C" locale.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
|
|
||||||
+#if !(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. */
|
|
||||||
@@ -3429,7 +3424,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;
|
|
||||||
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
--- origsrc/gettext-tools/tests/format-c-3-prg.c 2020-07-26 06:56:00.000000000 -0600
|
|
||||||
+++ src/gettext-tools/tests/format-c-3-prg.c 2021-07-26 23:26:38.655478800 -0600
|
|
||||||
@@ -39,7 +39,7 @@
|
|
||||||
/* Disable the override of setlocale that libgnuintl.h activates on MacOS X
|
|
||||||
and Windows. This test relies on the fake setlocale function in
|
|
||||||
setlocale.c. */
|
|
||||||
-#undef setlocale
|
|
||||||
+/* #undef setlocale */
|
|
||||||
#if defined _WIN32 && !defined __CYGWIN__
|
|
||||||
# define setlocale fake_setlocale
|
|
||||||
extern char *setlocale (int category, SETLOCALE_CONST char *locale);
|
|
||||||
--- origsrc/gettext-tools/tests/format-c-4-prg.c 2020-07-26 06:56:00.000000000 -0600
|
|
||||||
+++ src/gettext-tools/tests/format-c-4-prg.c 2021-07-26 23:26:38.655478800 -0600
|
|
||||||
@@ -39,7 +39,7 @@
|
|
||||||
/* Disable the override of setlocale that libgnuintl.h activates on MacOS X
|
|
||||||
and Windows. This test relies on the fake setlocale function in
|
|
||||||
setlocale.c. */
|
|
||||||
-#undef setlocale
|
|
||||||
+/* #undef setlocale */
|
|
||||||
#if defined _WIN32 && !defined __CYGWIN__
|
|
||||||
# define setlocale fake_setlocale
|
|
||||||
extern char *setlocale (int category, SETLOCALE_CONST char *locale);
|
|
||||||
--- origsrc/gettext-tools/tests/plural-1-prg.c 2020-06-06 08:03:00.000000000 -0600
|
|
||||||
+++ src/gettext-tools/tests/plural-1-prg.c 2021-07-26 23:26:38.655478800 -0600
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
/* Disable the override of setlocale that libgnuintl.h activates on MacOS X
|
|
||||||
and Windows. This test relies on the fake setlocale function in
|
|
||||||
setlocale.c. */
|
|
||||||
-#undef setlocale
|
|
||||||
+/* #undef setlocale */
|
|
||||||
#if defined _WIN32 && !defined __CYGWIN__
|
|
||||||
# define setlocale fake_setlocale
|
|
||||||
extern char *setlocale (int category, SETLOCALE_CONST char *locale);
|
|
||||||
--- origsrc/gettext-tools/tests/plural-2 2019-05-11 05:29:00.000000000 -0600
|
|
||||||
+++ src/gettext-tools/tests/plural-2 2021-07-26 23:26:38.655478800 -0600
|
|
||||||
@@ -3,8 +3,8 @@
|
|
||||||
|
|
||||||
: ${MSGFMT=msgfmt}
|
|
||||||
test -d plural-2-dir || mkdir plural-2-dir
|
|
||||||
-test -d plural-2-dir/ll || mkdir plural-2-dir/ll
|
|
||||||
-test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES
|
|
||||||
+test -d plural-2-dir/es || mkdir plural-2-dir/es
|
|
||||||
+test -d plural-2-dir/es/LC_MESSAGES || mkdir plural-2-dir/es/LC_MESSAGES
|
|
||||||
|
|
||||||
cat <<EOF > plural-2.data
|
|
||||||
ja
|
|
||||||
@@ -44,7 +44,7 @@ EOF
|
|
||||||
while read lang; do
|
|
||||||
read formula
|
|
||||||
read dataok
|
|
||||||
- cat > plural-2-ll.po <<EOF
|
|
||||||
+ cat > plural-2-es.po <<EOF
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
@@ -65,10 +65,10 @@ msgstr[7] "7"
|
|
||||||
msgstr[8] "8"
|
|
||||||
msgstr[9] "9"
|
|
||||||
EOF
|
|
||||||
- ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || Exit 1
|
|
||||||
+ ${MSGFMT} -o plural-2-dir/es/LC_MESSAGES/plural.mo plural-2-es.po || Exit 1
|
|
||||||
(for i in '' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
|
|
||||||
LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=plural-2-dir \
|
|
||||||
- $NGETTEXT --env LC_ALL=ll X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
|
|
||||||
+ $NGETTEXT --env LC_ALL=es_ES X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
|
|
||||||
done) > dataout
|
|
||||||
test "$dataok" = `cat dataout` || {
|
|
||||||
echo "Formula evaluation error for language $lang" 1>&2
|
|
||||||
35
gettext/gettext-tools-tests-locale-ll-es.patch
Normal file
35
gettext/gettext-tools-tests-locale-ll-es.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
--- origsrc/gettext-tools/tests/plural-2 2019-05-11 05:29:00.000000000 -0600
|
||||||
|
+++ src/gettext-tools/tests/plural-2 2021-07-26 23:26:38.655478800 -0600
|
||||||
|
@@ -3,8 +3,8 @@
|
||||||
|
|
||||||
|
: ${MSGFMT=msgfmt}
|
||||||
|
test -d plural-2-dir || mkdir plural-2-dir
|
||||||
|
-test -d plural-2-dir/ll || mkdir plural-2-dir/ll
|
||||||
|
-test -d plural-2-dir/ll/LC_MESSAGES || mkdir plural-2-dir/ll/LC_MESSAGES
|
||||||
|
+test -d plural-2-dir/es || mkdir plural-2-dir/es
|
||||||
|
+test -d plural-2-dir/es/LC_MESSAGES || mkdir plural-2-dir/es/LC_MESSAGES
|
||||||
|
|
||||||
|
cat <<EOF > plural-2.data
|
||||||
|
ja
|
||||||
|
@@ -44,7 +44,7 @@ EOF
|
||||||
|
while read lang; do
|
||||||
|
read formula
|
||||||
|
read dataok
|
||||||
|
- cat > plural-2-ll.po <<EOF
|
||||||
|
+ cat > plural-2-es.po <<EOF
|
||||||
|
msgid ""
|
||||||
|
msgstr ""
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
@@ -65,10 +65,10 @@ msgstr[7] "7"
|
||||||
|
msgstr[8] "8"
|
||||||
|
msgstr[9] "9"
|
||||||
|
EOF
|
||||||
|
- ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || Exit 1
|
||||||
|
+ ${MSGFMT} -o plural-2-dir/es/LC_MESSAGES/plural.mo plural-2-es.po || Exit 1
|
||||||
|
(for i in '' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
|
||||||
|
LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=plural-2-dir \
|
||||||
|
- $NGETTEXT --env LC_ALL=ll X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
|
||||||
|
+ $NGETTEXT --env LC_ALL=es_ES X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
|
||||||
|
done) > dataout
|
||||||
|
test "$dataok" = `cat dataout` || {
|
||||||
|
echo "Formula evaluation error for language $lang" 1>&2
|
||||||
Loading…
x
Reference in New Issue
Block a user