Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

gettext: Update to 0.21

Browse Source
This commit is contained in:
Christoph Reiter 2022-01-02 19:18:02 +01:00
parent af329800e7
commit d0b343d951
13 changed files with 752 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gettext/0.19.8.1-have_wprintf.patch
View File

@ -1,11 +0,0 @@
--- gettext-0.19.8.1-2.x86_64/origsrc/gettext-0.19.8.1/gettext-runtime/m4/intl.m4 2016-03-20 02:37:53.000000000 -0500
+++ gettext-0.19.8.1-2.x86_64/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

99
gettext/0.19.8.1-tests-cygwin.patch
View File

@ -1,99 +0,0 @@
diff --git a/gettext-0.19.8.1.orig/gettext-tools/tests/format-c-3-prg.c b/gettext-0.19.8.1/gettext-tools/tests/format-c-3-prg.c
index c417abd..ec395cd 100644
--- a/gettext-0.19.8.1.orig/gettext-tools/tests/format-c-3-prg.c
+++ b/gettext-0.19.8.1/gettext-tools/tests/format-c-3-prg.c
@@ -34,7 +34,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 */
#define _(string) gettext (string)
diff --git a/gettext-0.19.8.1.orig/gettext-tools/tests/format-c-4-prg.c b/gettext-0.19.8.1/gettext-tools/tests/format-c-4-prg.c
index ad96441..eb31ae7 100644
--- a/gettext-0.19.8.1.orig/gettext-tools/tests/format-c-4-prg.c
+++ b/gettext-0.19.8.1/gettext-tools/tests/format-c-4-prg.c
@@ -34,7 +34,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 */
#define _(string) gettext (string)
diff --git a/gettext-0.19.8.1.orig/gettext-tools/tests/plural-1 b/gettext-0.19.8.1/gettext-tools/tests/plural-1
index 66dd10b..b7e6b49 100755
--- a/gettext-0.19.8.1.orig/gettext-tools/tests/plural-1
+++ b/gettext-0.19.8.1/gettext-tools/tests/plural-1
@@ -50,15 +50,15 @@ ${DIFF} plural-1-fr.po.strip plural-1-fr.po.un || Exit 1
: ${DIFF=diff}
echo 'un morceau de gateau' > plural-1-cake.ok
-LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || Exit 1
+LANGUAGE= ../cake fr_FR 1 > plural-1-cake.tmp || Exit 1
LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
${DIFF} plural-1-cake.ok cake.out || Exit 1
echo '2 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || Exit 1
+LANGUAGE= ../cake fr_FR 2 > plural-1-cake.tmp || Exit 1
LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
${DIFF} plural-1-cake.ok cake.out || Exit 1
echo '10 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || Exit 1
+LANGUAGE= ../cake fr_FR 10 > plural-1-cake.tmp || Exit 1
LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
${DIFF} plural-1-cake.ok cake.out || Exit 1
diff --git a/gettext-0.19.8.1.orig/gettext-tools/tests/plural-1-prg.c b/gettext-0.19.8.1/gettext-tools/tests/plural-1-prg.c
index 1480738..9490650 100644
--- a/gettext-0.19.8.1.orig/gettext-tools/tests/plural-1-prg.c
+++ b/gettext-0.19.8.1/gettext-tools/tests/plural-1-prg.c
@@ -30,7 +30,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 */
int
main (int argc, char *argv[])
diff --git a/gettext-0.19.8.1.orig/gettext-tools/tests/plural-2 b/gettext-0.19.8.1/gettext-tools/tests/plural-2
index 983f207..73bb03c 100755
--- a/gettext-0.19.8.1.orig/gettext-tools/tests/plural-2
+++ b/gettext-0.19.8.1/gettext-tools/tests/plural-2
@@ -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

50
gettext/PKGBUILD
View File

@ -2,8 +2,8 @@
pkgbase=gettext pkgbase=gettext
pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl') pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl')
pkgver=0.19.8.1 pkgver=0.21
pkgrel=5 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,38 +11,42 @@ license=('GPL')
makedepends=('libiconv-devel' 'autotools' 'gcc') makedepends=('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}
0.19.8.1-autopoint-V.patch gettext-0.18.1.1-autopoint-V.patch
0.19.8.1-localename.patch gettext-0.19.8.1-no-woe32dll.patch
0.19.8.1-no-woe32dll.patch gettext-localename.patch
0.19.8.1-tests-cygwin.patch gettext-tests-cygwin.patch
0.19.8.1-cygwin-ftm.patch gettext-0.19.8.1-cygwin-ftm.patch
0.19.8.1-have_wprintf.patch gettext-0.19.8.1-have_wprintf.patch
gettext-0.21-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) gnulib-cygwin-weak-bug.patch)
sha256sums=('ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43' sha256sums=('c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12'
'SKIP' 'SKIP'
'0d3082e9a6b997b61dbb160f5af234a1bc89cddf9dc680999429276cf605b731' '9fe8e25783ea629db3c64ce4d8e4d7912e01e6c3b7391cd48c0843b448576c25'
'25aa01d5a2f58e60878f03bead62662434f56247ba965668fd7b26108b80c4f3'
'b182af5d1e60c520fc6e716565c58a5f7497f608b5d4b07e3a58500fec54cdc5' 'b182af5d1e60c520fc6e716565c58a5f7497f608b5d4b07e3a58500fec54cdc5'
'd564c2d10ded1c60c421b0790639339f60ea7a4bc7e6d3034e59ec50d04d07be' '8eaf41ecf774501155a7684e64249bd6b668f2e9b05b6ce5383a22b71ff23ba3'
'7439a9e86628c6f85cc0ff639f7ff46d487e0ffb4c43139a49c6d85775819f45'
'22cfaca417f04507a901cba93a7eb219183d5e681b7459d8c0e9660621a9a696' '22cfaca417f04507a901cba93a7eb219183d5e681b7459d8c0e9660621a9a696'
'd4df598ebde60ea4e069991baed43b00dbb28d3b8a40cc7cf4a6e12847ee3616' 'ec5e9ca3c85163d9f7e2ee19aee0c312bdda9db7be6de4ec7757ee40568aa1e6'
'829132cf5bc1e62f1fd47a5abd8e350fa854a14c574800a6bc58ec492bb70c1b' '544ce0589e9c70f4f75d77c76fd36f88d009ac9cfecb4812a67f878e38ac6418'
'e117ddf7cbb175c0ceabc03d8114f875fa120e8f9999e914ecb2bc4ded8d92ce' '42276af94b61339f24ed2b184cb6bae85e8d32fae4f3cc8d51776e9db146c446'
'8a297177d532e15f7b4eca5c2f56a7b0980ea8ae1432c7d13f500e37e30229c9') '047b74d6240205c21fa3a6cb3d8bfeeb5721064c3ea5a318542d74e0378ab97a'
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') '1233eb631779fa7dfd13313c955080b8e2cd8db4c352a4878db1edc40be7d40b')
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development)
prepare() { prepare() {
cd "${srcdir}/${pkgname}-${pkgver}" cd "${srcdir}/${pkgname}-${pkgver}"
# Cygwin patches # Cygwin patches
patch -p2 -i $srcdir/0.19.8.1-autopoint-V.patch patch -p2 -i $srcdir/gettext-0.18.1.1-autopoint-V.patch
patch -p2 -i $srcdir/0.19.8.1-localename.patch patch -p2 -i $srcdir/gettext-0.19.8.1-no-woe32dll.patch
patch -p2 -i $srcdir/0.19.8.1-no-woe32dll.patch patch -p1 -i $srcdir/gettext-localename.patch
patch -p2 -i $srcdir/0.19.8.1-tests-cygwin.patch patch -p1 -i $srcdir/gettext-tests-cygwin.patch
patch -p2 -i $srcdir/0.19.8.1-cygwin-ftm.patch patch -p2 -i $srcdir/gettext-0.19.8.1-cygwin-ftm.patch
patch -p3 -i $srcdir/0.19.8.1-have_wprintf.patch patch -p2 -i $srcdir/gettext-0.19.8.1-have_wprintf.patch
patch -p1 -i $srcdir/gettext-0.21-disable-libtextstyle.patch
# MSYS2 patch # MSYS2 patch
patch -p1 -i $srcdir/gnulib-cygwin-weak-bug.patch patch -p1 -i $srcdir/gnulib-cygwin-weak-bug.patch

13
gettext/0.19.8.1-autopoint-V.patch → gettext/gettext-0.18.1.1-autopoint-V.patch
View File

@ -1,8 +1,6 @@
diff --git origsrc/gettext-0.19.8.1.orig/gettext-tools/misc/autopoint.in src/gettext-0.19.8.1/gettext-tools/misc/autopoint.in --- origsrc/gettext-0.18.1.1/gettext-tools/misc/autopoint.in 2010-06-06 08:49:57.000000000 -0400
index 6d0746f..5b7c0bb 100755 +++ src/gettext-0.18.1.1/gettext-tools/misc/autopoint.in 2011-10-16 00:57:42.789133600 -0400
--- origsrc/gettext-0.19.8.1.orig/gettext-tools/misc/autopoint.in @@ -161,9 +161,9 @@ Options:
+++ src/gettext-0.19.8.1/gettext-tools/misc/autopoint.in
@@ -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"
@ -15,7 +13,7 @@ index 6d0746f..5b7c0bb 100755
echo " echo "
Report bugs to <bug-gnu-gettext@gnu.org>." Report bugs to <bug-gnu-gettext@gnu.org>."
} }
@@ -249,17 +249,17 @@ unset CLICOLOR_FORCE GREP_OPTIONS @@ -210,17 +210,17 @@ func_fatal_error ()
force=yes ;; force=yes ;;
--help | --hel | --he | --h ) --help | --hel | --he | --h )
func_usage; exit 0 ;; func_usage; exit 0 ;;
@ -44,7 +42,7 @@ index 6d0746f..5b7c0bb 100755
--version | --versio | --versi | --vers | --ver | --ve | --v ) --version | --versio | --versi | --vers | --ver | --ve | --v )
func_version func_version
exit 0 ;; exit 0 ;;
@@ -355,7 +355,7 @@ else @@ -276,7 +276,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
@ -53,3 +51,4 @@ index 6d0746f..5b7c0bb 100755
fi fi
else else
ver="$xver" ver="$xver"

648
gettext/gettext-0.19.7-archive.patch
View File

File diff suppressed because it is too large Load Diff

0
gettext/0.19.8.1-cygwin-ftm.patch → gettext/gettext-0.19.8.1-cygwin-ftm.patch
View File

11
gettext/gettext-0.19.8.1-have_wprintf.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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

12
gettext/gettext-0.19.8.1-msys2.patch
View File

@ -20,14 +20,12 @@ index 42fac95..9ab0952 100644
*) is_woe32=no ;; *) is_woe32=no ;;
esac esac
WOE32=$is_woe32 WOE32=$is_woe32
diff --git gettext-0.19.8.1.orig/gettext-runtime/m4/threadlib.m4 gettext-0.19.8.1/gettext-runtime/m4/threadlib.m4 --- gettext-0.21/gettext-runtime/gnulib-m4/threadlib.m4.orig 2022-01-02 16:50:14.502447900 +0100
index b43534e..bc7a2a8 100644 +++ gettext-0.21/gettext-runtime/gnulib-m4/threadlib.m4 2022-01-02 16:50:46.990712700 +0100
--- gettext-0.19.8.1.orig/gettext-runtime/m4/threadlib.m4 @@ -416,7 +416,7 @@
+++ gettext-0.19.8.1/gettext-runtime/m4/threadlib.m4 dnl Disable multithreading by default on Cygwin 1.5.x, because it has
@@ -68,7 +68,7 @@ changequote(,)dnl
dnl bugs that lead to endless loops or crashes. See dnl bugs that lead to endless loops or crashes. See
dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>. dnl <https://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
osf*) gl_use_threads=no ;;
- cygwin*) - cygwin*)
+ cygwin* | msys*) + cygwin* | msys*)
case `uname -r` in case `uname -r` in

0
gettext/0.19.8.1-no-woe32dll.patch → gettext/gettext-0.19.8.1-no-woe32dll.patch
View File

128
gettext/gettext-0.21-disable-libtextstyle.patch Normal file
View File

@ -0,0 +1,128 @@
diff --git a/Makefile.am b/Makefile.am
index 815e3c7..e897de7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
+SUBDIRS = gnulib-local gettext-runtime gettext-tools
changelog_etc = \
gettext-runtime/ChangeLog.0 \
@@ -123,7 +123,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`"
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)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4
cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.java $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.java
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`"
diff --git a/configure.ac b/configure.ac
index 49689fb..2d23b44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
-AC_CONFIG_SUBDIRS([gettext-runtime libtextstyle gettext-tools])
+AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
@@ -49,7 +49,7 @@ AC_CANONICAL_HOST
dnl Optional Features: AC_ARG_ENABLE calls
dnl Optional Packages: AC_ARG_WITH calls
dnl Some influential environment variables: AC_ARG_VAR calls
-esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.libtextstyle | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
+esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
AC_CONFIG_FILES([Makefile])
diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index 449a797..c5719c2 100644
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -19,7 +19,7 @@
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
-SUBDIRS = intl 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
EXTRA_DIST = misc/DISCLAIM
MOSTLYCLEANFILES = core *.stackdump
diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h
index 536b51b..585ce66 100644
--- a/gettext-tools/libgettextpo/textstyle.in.h
+++ b/gettext-tools/libgettextpo/textstyle.in.h
@@ -213,7 +213,8 @@ typedef ostream_t file_ostream_t;
static inline file_ostream_t
file_ostream_create (FILE *fp)
{
- return fp;
+ /* Closing the stream we return should not close 'fp'. */
+ return fdopen (dup (fileno (fp)), "w");
}
/* --------------------------- From fd-ostream.h --------------------------- */
@@ -413,6 +414,30 @@ html_styled_ostream_create (ostream_t destination _GL_UNUSED,
return NULL;
}
+/* ----------------------- From noop-styled-ostream.h ----------------------- */
+
+/* noop_styled_ostream_t is a subtype of ostream_t. */
+typedef ostream_t noop_styled_ostream_t;
+
+#define noop_styled_ostream_write_mem ostream_write_mem
+#define noop_styled_ostream_flush ostream_flush
+#define noop_styled_ostream_free ostream_free
+#define noop_styled_ostream_begin_use_class styled_ostream_begin_use_class
+#define noop_styled_ostream_end_use_class styled_ostream_end_use_class
+#define noop_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref
+#define noop_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id
+#define noop_styled_ostream_set_hyperlink styled_ostream_set_hyperlink
+#define noop_styled_ostream_flush_to_current_style styled_ostream_flush_to_current_style
+
+static inline ostream_t
+noop_styled_ostream_create (ostream_t destination, bool pass_ownership)
+{
+ if (pass_ownership)
+ return destination;
+ else
+ return fdopen (dup (fileno (destination)), "w");
+}
+
/* ------------------------------ From color.h ------------------------------ */
#define color_test_mode false
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 764ffad..eccfbbd 100644
--- a/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
cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
-if USE_INSTALLED_LIBTEXTSTYLE
-LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@
-else
-# How to get the include files of libtextstyle.
-textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
- here=`pwd`; \
- cd ../../libtextstyle/lib && \
- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
-BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
-MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
-# Where to find the built libtextstyle library.
-LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la
-endif
+# Use the dummy libtextstyle from gnulib, as libgettextpo does.
+LT_LIBTEXTSTYLE =
+AM_CPPFLAGS += -I../libgettextpo -I$(top_srcdir)/libgettextpo
# How to build libgettextsrc.la.
# Need ../gnulib-lib/libgettextlib.la.

68
gettext/0.19.8.1-localename.patch → gettext/gettext-localename.patch
View File

@ -1,8 +1,6 @@
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 --- origsrc/gettext-runtime/gnulib-lib/localename.c 2020-06-26 13:31:00.000000000 -0600
index e67bd01..4d3665f 100644 +++ src/gettext-runtime/gnulib-lib/localename.c 2021-07-26 22:46:33.473276900 -0600
--- a/gettext-0.19.8.1.orig/gettext-runtime/gnulib-lib/localename.c @@ -79,7 +79,7 @@
+++ 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
#endif #endif
@ -11,7 +9,7 @@ index e67bd01..4d3665f 100644
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# include <winnls.h> # include <winnls.h>
@@ -1418,7 +1418,7 @@ gl_locale_name_canonicalize (char *name) @@ -1463,7 +1463,7 @@ gl_locale_name_canonicalize (char *name)
#endif #endif
@ -20,7 +18,7 @@ index e67bd01..4d3665f 100644
/* Canonicalize a Windows native locale name to a Unix locale name. /* Canonicalize a Windows native locale name to a Unix locale name.
NAME is a sufficiently large buffer. NAME is a sufficiently large buffer.
@@ -2836,11 +2836,6 @@ gl_locale_name_environ (int category, const char *categoryname) @@ -3334,11 +3334,6 @@ gl_locale_name_environ (int category, co
Ignore invalid LANG value set by the Terminal application. */ Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0) if (strcmp (retval, "UTF-8") != 0)
#endif #endif
@ -32,16 +30,16 @@ index e67bd01..4d3665f 100644
return retval; return retval;
} }
@@ -2878,7 +2873,7 @@ gl_locale_name_default (void) @@ -3376,7 +3371,7 @@ gl_locale_name_default (void)
"C.UTF-8" locale, which operates in the same way as the "C" locale. "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_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE) +#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
/* The system does not have a way of setting the locale, other than the /* The system does not have a way of setting the locale, other than the
POSIX specified environment variables. We use C as default locale. */ POSIX specified environment variables. We use C as default locale. */
@@ -2933,7 +2928,7 @@ gl_locale_name_default (void) @@ -3429,7 +3424,7 @@ gl_locale_name_default (void)
# endif # endif
@ -50,20 +48,18 @@ index e67bd01..4d3665f 100644
{ {
LCID lcid; 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 --- origsrc/gettext-runtime/intl/localename.c 2020-06-26 16:05:00.000000000 -0600
index 81ab213..fa29d38 100644 +++ src/gettext-runtime/intl/localename.c 2021-07-26 22:46:33.473276900 -0600
--- a/gettext-0.19.8.1.orig/gettext-runtime/intl/localename.c @@ -79,7 +79,7 @@
+++ b/gettext-0.19.8.1/gettext-runtime/intl/localename.c
@@ -66,7 +66,7 @@ extern char * getlocalename_l(int, locale_t);
# endif # endif
#endif #endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ -#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */ +#if defined WINDOWS_NATIVE_ /* Native Windows */
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# include <winnls.h> # include <winnls.h>
@@ -1418,7 +1418,7 @@ gl_locale_name_canonicalize (char *name) @@ -1463,7 +1463,7 @@ gl_locale_name_canonicalize (char *name)
#endif #endif
@ -72,7 +68,7 @@ index 81ab213..fa29d38 100644
/* Canonicalize a Windows native locale name to a Unix locale name. /* Canonicalize a Windows native locale name to a Unix locale name.
NAME is a sufficiently large buffer. NAME is a sufficiently large buffer.
@@ -2781,7 +2781,7 @@ gl_locale_name_thread (int category, const char *categoryname) @@ -3243,7 +3243,7 @@ gl_locale_name_thread (int category, con
However it does not specify the exact format. Neither do SUSV2 and 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. ISO C 99. So we can use this feature only on selected systems (e.g.
those using GNU C Library). */ those using GNU C Library). */
@ -81,7 +77,7 @@ index 81ab213..fa29d38 100644
# define HAVE_LOCALE_NULL # define HAVE_LOCALE_NULL
#endif #endif
@@ -2836,11 +2836,6 @@ gl_locale_name_environ (int category, const char *categoryname) @@ -3334,11 +3334,6 @@ gl_locale_name_environ (int category, co
Ignore invalid LANG value set by the Terminal application. */ Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0) if (strcmp (retval, "UTF-8") != 0)
#endif #endif
@ -93,16 +89,16 @@ index 81ab213..fa29d38 100644
return retval; return retval;
} }
@@ -2878,7 +2873,7 @@ gl_locale_name_default (void) @@ -3376,7 +3371,7 @@ gl_locale_name_default (void)
"C.UTF-8" locale, which operates in the same way as the "C" locale. "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_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE) +#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
/* The system does not have a way of setting the locale, other than the /* The system does not have a way of setting the locale, other than the
POSIX specified environment variables. We use C as default locale. */ POSIX specified environment variables. We use C as default locale. */
@@ -2933,7 +2928,7 @@ gl_locale_name_default (void) @@ -3429,7 +3424,7 @@ gl_locale_name_default (void)
# endif # endif
@ -111,20 +107,18 @@ index 81ab213..fa29d38 100644
{ {
LCID lcid; 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 --- origsrc/gettext-tools/gnulib-lib/localename.c 2020-06-26 13:57:00.000000000 -0600
index e67bd01..226ce6e 100644 +++ src/gettext-tools/gnulib-lib/localename.c 2021-07-26 22:46:33.473276900 -0600
--- a/gettext-0.19.8.1.orig/gettext-tools/gnulib-lib/localename.c @@ -79,7 +79,7 @@
+++ 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
#endif #endif
-#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ -#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
+#if defined WINDOWS_NATIVE /* Native Windows */ +#if defined WINDOWS_NATIVE_ /* Native Windows */
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# include <winnls.h> # include <winnls.h>
@@ -1418,7 +1418,7 @@ gl_locale_name_canonicalize (char *name) @@ -1463,7 +1463,7 @@ gl_locale_name_canonicalize (char *name)
#endif #endif
@ -133,7 +127,7 @@ index e67bd01..226ce6e 100644
/* Canonicalize a Windows native locale name to a Unix locale name. /* Canonicalize a Windows native locale name to a Unix locale name.
NAME is a sufficiently large buffer. NAME is a sufficiently large buffer.
@@ -2781,7 +2781,7 @@ gl_locale_name_thread (int category, const char *categoryname) @@ -3243,7 +3243,7 @@ gl_locale_name_thread (int category, con
However it does not specify the exact format. Neither do SUSV2 and 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. ISO C 99. So we can use this feature only on selected systems (e.g.
those using GNU C Library). */ those using GNU C Library). */
@ -142,7 +136,7 @@ index e67bd01..226ce6e 100644
# define HAVE_LOCALE_NULL # define HAVE_LOCALE_NULL
#endif #endif
@@ -2836,11 +2836,6 @@ gl_locale_name_environ (int category, const char *categoryname) @@ -3334,11 +3334,6 @@ gl_locale_name_environ (int category, co
Ignore invalid LANG value set by the Terminal application. */ Ignore invalid LANG value set by the Terminal application. */
if (strcmp (retval, "UTF-8") != 0) if (strcmp (retval, "UTF-8") != 0)
#endif #endif
@ -154,16 +148,16 @@ index e67bd01..226ce6e 100644
return retval; return retval;
} }
@@ -2878,7 +2873,7 @@ gl_locale_name_default (void) @@ -3376,7 +3371,7 @@ gl_locale_name_default (void)
"C.UTF-8" locale, which operates in the same way as the "C" locale. "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_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE) +#if !(HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE)
/* The system does not have a way of setting the locale, other than the /* The system does not have a way of setting the locale, other than the
POSIX specified environment variables. We use C as default locale. */ POSIX specified environment variables. We use C as default locale. */
@@ -2933,7 +2928,7 @@ gl_locale_name_default (void) @@ -3429,7 +3424,7 @@ gl_locale_name_default (void)
# endif # endif

68
gettext/gettext-tests-cygwin.patch Normal file
View File

@ -0,0 +1,68 @@
--- 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

16
gettext/gnulib-cygwin-weak-bug.patch
View File

@ -1,5 +1,5 @@
--- gettext-0.19.8.1/gettext-runtime/m4/threadlib.m4.orig 2021-12-29 09:09:55.934684000 +0100 --- gettext-0.19.8.1/gettext-runtime/gnulib-m4/threadlib.m4.orig 2021-12-29 09:09:55.934684000 +0100
+++ gettext-0.19.8.1/gettext-runtime/m4/threadlib.m4 2021-12-29 09:13:14.284107200 +0100 +++ gettext-0.19.8.1/gettext-runtime/gnulib-m4/threadlib.m4 2021-12-29 09:13:14.284107200 +0100
@@ -133,6 +133,9 @@ @@ -133,6 +133,9 @@
#pragma weak fputs #pragma weak fputs
int main () int main ()
@ -10,3 +10,15 @@
return (fputs == NULL); return (fputs == NULL);
}]])], }]])],
[gl_cv_have_weak=yes], [gl_cv_have_weak=yes],
--- gettext-0.21/gettext-tools/gnulib-m4/threadlib.m4.orig 2022-01-02 17:16:55.604000000 +0100
+++ gettext-0.21/gettext-tools/gnulib-m4/threadlib.m4 2022-01-02 17:17:21.021853300 +0100
@@ -101,6 +101,9 @@
#pragma weak fputs
int main ()
{
+#ifdef __CYGWIN__
+ return 1;
+#endif
return (fputs == NULL);
}]])],
[gl_cv_have_weak=yes],