From 98a62ea3a46c30255c3f575eb87ac2b2d7b394e2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 2 Jan 2022 16:22:13 +0100 Subject: [PATCH 1/4] gettext: build with a cygwin target triplet let's us drop most of the msysize patches --- gettext/PKGBUILD | 12 +- gettext/gettext-0.19.8.1-msys2.patch | 487 ++------------------------- 2 files changed, 44 insertions(+), 455 deletions(-) diff --git a/gettext/PKGBUILD b/gettext/PKGBUILD index 1473ab03..4524a8f3 100644 --- a/gettext/PKGBUILD +++ b/gettext/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=gettext pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl') pkgver=0.19.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') url="https://www.gnu.org/software/gettext/" @@ -28,7 +28,7 @@ sha256sums=('ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43' 'd564c2d10ded1c60c421b0790639339f60ea7a4bc7e6d3034e59ec50d04d07be' '22cfaca417f04507a901cba93a7eb219183d5e681b7459d8c0e9660621a9a696' 'd4df598ebde60ea4e069991baed43b00dbb28d3b8a40cc7cf4a6e12847ee3616' - 'c049be2f812524647b662d421dc2a5df59e7da68a42ab0e1cef6af6665cb00a0' + '829132cf5bc1e62f1fd47a5abd8e350fa854a14c574800a6bc58ec492bb70c1b' 'e117ddf7cbb175c0ceabc03d8114f875fa120e8f9999e914ecb2bc4ded8d92ce' '8a297177d532e15f7b4eca5c2f56a7b0980ea8ae1432c7d13f500e37e30229c9') validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') @@ -70,8 +70,12 @@ build() { cat > config.cache << EOF ac_cv_header_dirent_h=no EOF - - ./configure --build=${CHOST} \ + + local CYGWIN_CHOST="$(echo "${CHOST}" | sed 's|-msys$|-cygwin|')" + + ./configure \ + --build=${CYGWIN_CHOST} \ + --host=${CYGWIN_CHOST} \ --prefix=/usr \ --with-included-libcroco \ --with-included-libunistring \ diff --git a/gettext/gettext-0.19.8.1-msys2.patch b/gettext/gettext-0.19.8.1-msys2.patch index e2e76bf6..6ccc1fed 100644 --- a/gettext/gettext-0.19.8.1-msys2.patch +++ b/gettext/gettext-0.19.8.1-msys2.patch @@ -1,52 +1,38 @@ -diff --git gettext-0.19.8.1.orig/build-aux/compile gettext-0.19.8.1/build-aux/compile -index a85b723..3cc6cf3 100755 ---- gettext-0.19.8.1.orig/build-aux/compile -+++ gettext-0.19.8.1/build-aux/compile -@@ -53,7 +53,7 @@ func_file_conv () - MINGW*) - file_conv=mingw - ;; -- CYGWIN*) -+ CYGWIN* | MSYS*) - file_conv=cygwin - ;; - *) -@@ -67,7 +67,7 @@ func_file_conv () - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; -- cygwin/*) -+ cygwin/* | msys/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) -diff --git gettext-0.19.8.1.orig/build-aux/config.guess gettext-0.19.8.1/build-aux/config.guess -index c4bd827..f03849d 100755 ---- gettext-0.19.8.1.orig/build-aux/config.guess -+++ gettext-0.19.8.1/build-aux/config.guess -@@ -891,6 +891,9 @@ EOF - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; -+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; -diff --git gettext-0.19.8.1.orig/build-aux/config.libpath gettext-0.19.8.1/build-aux/config.libpath -index 849fa7b..9a67cdc 100755 ---- gettext-0.19.8.1.orig/build-aux/config.libpath -+++ gettext-0.19.8.1/build-aux/config.libpath -@@ -56,7 +56,7 @@ case $host_os in - bsdi[45]*) - shlibpath_var=LD_LIBRARY_PATH - ;; -- cygwin* | mingw* | pw32* | cegcc*) -+ cygwin* | msys* | mingw* | pw32* | cegcc*) - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH - ;; +diff --git gettext-0.19.8.1.orig/gettext-runtime/m4/intl.m4 gettext-0.19.8.1/gettext-runtime/m4/intl.m4 +index 42fac95..9ab0952 100644 +--- gettext-0.19.8.1.orig/gettext-runtime/m4/intl.m4 ++++ gettext-0.19.8.1/gettext-runtime/m4/intl.m4 +@@ -113,7 +113,7 @@ AC_DEFUN([AM_INTL_SUBDIR], + dnl exported variables _also_ in the static library. + if test "$enable_shared" = yes; then + case "$host_os" in +- mingw* | cygwin*) is_woe32dll=yes ;; ++ mingw* | cygwin* | msys*) is_woe32dll=yes ;; + *) is_woe32dll=no ;; + esac + else +@@ -125,7 +125,7 @@ AC_DEFUN([AM_INTL_SUBDIR], + 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*) is_woe32=yes ;; ++ mingw* | cygwin* | msys*) is_woe32=yes ;; + *) is_woe32=no ;; + esac + 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 +index b43534e..bc7a2a8 100644 +--- gettext-0.19.8.1.orig/gettext-runtime/m4/threadlib.m4 ++++ gettext-0.19.8.1/gettext-runtime/m4/threadlib.m4 +@@ -68,7 +68,7 @@ changequote(,)dnl + dnl bugs that lead to endless loops or crashes. See + dnl . + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) 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 index 98183ff..c5d797d 100755 --- gettext-0.19.8.1.orig/build-aux/config.rpath @@ -95,405 +81,4 @@ index 98183ff..c5d797d 100755 + cygwin* | msys* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' - ;; -diff --git gettext-0.19.8.1.orig/gettext-runtime/configure.ac gettext-0.19.8.1/gettext-runtime/configure.ac -index 71adec3..b223f26 100644 ---- gettext-0.19.8.1.orig/gettext-runtime/configure.ac -+++ gettext-0.19.8.1/gettext-runtime/configure.ac -@@ -76,7 +76,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*) is_woe32=yes ;; -+ mingw* | cygwin* | msys*) is_woe32=yes ;; - *) is_woe32=no ;; - esac - AM_CONDITIONAL([WOE32], [test $is_woe32 = yes]) -@@ -116,7 +116,7 @@ dnl must arrange to define the auxiliary pointer variables for the - dnl exported variables _also_ in the static library. - if test "$enable_shared" = yes; then - case "$host_os" in -- mingw* | cygwin*) is_woe32dll=yes ;; -+ mingw* | cygwin* | msys*) is_woe32dll=yes ;; - *) is_woe32dll=no ;; - esac - else -diff --git gettext-0.19.8.1.orig/gettext-runtime/gnulib-lib/Makefile.am gettext-0.19.8.1/gettext-runtime/gnulib-lib/Makefile.am -index 2fec716..c117381 100644 ---- gettext-0.19.8.1.orig/gettext-runtime/gnulib-lib/Makefile.am -+++ gettext-0.19.8.1/gettext-runtime/gnulib-lib/Makefile.am -@@ -478,7 +478,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ -diff --git gettext-0.19.8.1.orig/gettext-runtime/gnulib-m4/double-slash-root.m4 gettext-0.19.8.1/gettext-runtime/gnulib-m4/double-slash-root.m4 -index dfd3921..ab67944 100644 ---- gettext-0.19.8.1.orig/gettext-runtime/gnulib-m4/double-slash-root.m4 -+++ gettext-0.19.8.1/gettext-runtime/gnulib-m4/double-slash-root.m4 -@@ -16,7 +16,7 @@ AC_DEFUN([gl_DOUBLE_SLASH_ROOT], - # special semantics and is distinct from /, please report it to - # . - case $host in -- *-cygwin | i370-ibm-openedition) -+ *-cygwin | *-msys | i370-ibm-openedition) - gl_cv_double_slash_root=yes ;; - *) - # Be optimistic and assume that / and // are the same when we -diff --git gettext-0.19.8.1.orig/gettext-runtime/gnulib-m4/setlocale.m4 gettext-0.19.8.1/gettext-runtime/gnulib-m4/setlocale.m4 -index a359069..9fffac3 100644 ---- gettext-0.19.8.1.orig/gettext-runtime/gnulib-m4/setlocale.m4 -+++ gettext-0.19.8.1/gettext-runtime/gnulib-m4/setlocale.m4 -@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE], - mingw*) REPLACE_SETLOCALE=1 ;; - dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL) - dnl is then still "C". -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.5.*) REPLACE_SETLOCALE=1 ;; - esac -diff --git gettext-0.19.8.1.orig/gettext-runtime/libasprintf/configure.ac gettext-0.19.8.1/gettext-runtime/libasprintf/configure.ac -index 736bf48..6264895 100644 ---- gettext-0.19.8.1.orig/gettext-runtime/libasprintf/configure.ac -+++ gettext-0.19.8.1/gettext-runtime/libasprintf/configure.ac -@@ -44,7 +44,7 @@ LT_INIT([win32-dll]) - case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. -- beos* | mingw* | cygwin* | os2*) LTNOUNDEF='-no-undefined' ;; -+ beos* | mingw* | cygwin* | msys* | os2*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; - esac - AC_SUBST([LTNOUNDEF]) -diff --git gettext-0.19.8.1.orig/gettext-runtime/m4/intl.m4 gettext-0.19.8.1/gettext-runtime/m4/intl.m4 -index 42fac95..9ab0952 100644 ---- gettext-0.19.8.1.orig/gettext-runtime/m4/intl.m4 -+++ gettext-0.19.8.1/gettext-runtime/m4/intl.m4 -@@ -113,7 +113,7 @@ AC_DEFUN([AM_INTL_SUBDIR], - dnl exported variables _also_ in the static library. - if test "$enable_shared" = yes; then - case "$host_os" in -- mingw* | cygwin*) is_woe32dll=yes ;; -+ mingw* | cygwin* | msys*) is_woe32dll=yes ;; - *) is_woe32dll=no ;; - esac - else -@@ -125,7 +125,7 @@ AC_DEFUN([AM_INTL_SUBDIR], - 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*) is_woe32=yes ;; -+ mingw* | cygwin* | msys*) is_woe32=yes ;; - *) is_woe32=no ;; - esac - 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 -index b43534e..bc7a2a8 100644 ---- gettext-0.19.8.1.orig/gettext-runtime/m4/threadlib.m4 -+++ gettext-0.19.8.1/gettext-runtime/m4/threadlib.m4 -@@ -68,7 +68,7 @@ changequote(,)dnl - dnl bugs that lead to endless loops or crashes. See - dnl . - osf*) gl_use_threads=no ;; -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.[0-5].*) gl_use_threads=no ;; - *) gl_use_threads=yes ;; -diff --git gettext-0.19.8.1.orig/gettext-tools/configure.ac gettext-0.19.8.1/gettext-tools/configure.ac -index 3b132ed..a4fa470 100644 ---- gettext-0.19.8.1.orig/gettext-tools/configure.ac -+++ gettext-0.19.8.1/gettext-tools/configure.ac -@@ -111,7 +111,7 @@ dnl On Cygwin 1.7.10-1 or later, error_* variables are defined in the - dnl Cygwin DLL. To avoid any conflict with gettext DLLs, always link - dnl to gnulib's error.c. See GETTEXTLIB_EXPORTS_FLAGS setting below. - case "$host_os" in -- cygwin*) ac_cv_lib_error_at_line=no ;; -+ cygwin* | msys*) ac_cv_lib_error_at_line=no ;; - esac - - dnl Checks for libraries. -diff --git gettext-0.19.8.1.orig/gettext-tools/examples/hello-c++-kde/admin/config.guess gettext-0.19.8.1/gettext-tools/examples/hello-c++-kde/admin/config.guess -index 58dc0e2..ea86d52 100755 ---- gettext-0.19.8.1.orig/gettext-tools/examples/hello-c++-kde/admin/config.guess -+++ gettext-0.19.8.1/gettext-tools/examples/hello-c++-kde/admin/config.guess -@@ -761,6 +761,9 @@ EOF - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit 0 ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; -diff --git gettext-0.19.8.1.orig/gettext-tools/examples/hello-c++-kde/admin/config.sub gettext-0.19.8.1/gettext-tools/examples/hello-c++-kde/admin/config.sub -index 2684853..cf78800 100755 ---- gettext-0.19.8.1.orig/gettext-tools/examples/hello-c++-kde/admin/config.sub -+++ gettext-0.19.8.1/gettext-tools/examples/hello-c++-kde/admin/config.sub -@@ -1110,7 +1110,7 @@ case $os in - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-lib/Makefile.gnulib gettext-0.19.8.1/gettext-tools/gnulib-lib/Makefile.gnulib -index 438bf9d..693bd00 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-lib/Makefile.gnulib -+++ gettext-0.19.8.1/gettext-tools/gnulib-lib/Makefile.gnulib -@@ -1810,7 +1810,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/btowc.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/btowc.m4 -index 47e8fd8..9e1dbf7 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/btowc.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/btowc.m4 -@@ -49,7 +49,7 @@ int main () - changequote(,)dnl - case "$host_os" in - # Guess no on Cygwin. -- cygwin*) gl_cv_func_btowc_nul="guessing no" ;; -+ cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_btowc_nul="guessing yes" ;; - esac -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/csharpexec.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/csharpexec.m4 -index 39aceef..e5517b3 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/csharpexec.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/csharpexec.m4 -@@ -53,7 +53,7 @@ AC_DEFUN([gt_CSHARPEXEC], - ifelse([$1], , , [&& clix $2/$1 >/dev/null 2>/dev/null]); then - HAVE_CLIX=1 - case $host_os in -- cygwin* | mingw* | pw32*) -+ cygwin* | msys* | mingw* | pw32*) - CLIX_PATH_VAR=PATH - ;; - darwin* | rhapsody*) -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/double-slash-root.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/double-slash-root.m4 -index dfd3921..ab67944 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/double-slash-root.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/double-slash-root.m4 -@@ -16,7 +16,7 @@ AC_DEFUN([gl_DOUBLE_SLASH_ROOT], - # special semantics and is distinct from /, please report it to - # . - case $host in -- *-cygwin | i370-ibm-openedition) -+ *-cygwin | *-msys | i370-ibm-openedition) - gl_cv_double_slash_root=yes ;; - *) - # Be optimistic and assume that / and // are the same when we -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/dup2.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/dup2.m4 -index 5b68312..0ed448e 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/dup2.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/dup2.m4 -@@ -78,7 +78,7 @@ AC_DEFUN([gl_FUNC_DUP2], - [case "$host_os" in - mingw*) # on this platform, dup2 always returns 0 for success - gl_cv_func_dup2_works="guessing no" ;; -- cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 -+ cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0 - gl_cv_func_dup2_works="guessing no" ;; - aix* | freebsd*) - # on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE, -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/getcwd.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/getcwd.m4 -index 566c3c1..e7cefcb 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/getcwd.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/getcwd.m4 -@@ -51,7 +51,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_getcwd_null="guessing yes";; - # Guess yes on Cygwin. -- cygwin*) gl_cv_func_getcwd_null="guessing yes";; -+ cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. - *) gl_cv_func_getcwd_null="guessing no";; - esac -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/malloc.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/malloc.m4 -index c393690..675278e 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/malloc.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/malloc.m4 -@@ -33,7 +33,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], - [case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_malloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_malloc_0_nonnull=no ;; -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/printf.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/printf.m4 -index e495e0c..01be733 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/printf.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/printf.m4 -@@ -720,7 +720,7 @@ changequote(,)dnl - openbsd*) gl_cv_func_printf_directive_ls="guessing no";; - irix*) gl_cv_func_printf_directive_ls="guessing no";; - solaris*) gl_cv_func_printf_directive_ls="guessing no";; -- cygwin*) gl_cv_func_printf_directive_ls="guessing no";; -+ cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; - beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; - *) gl_cv_func_printf_directive_ls="guessing yes";; - esac -@@ -797,7 +797,7 @@ int main () - [ - changequote(,)dnl - case "$host_os" in -- cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; -+ cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";; - netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; - mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; - *) gl_cv_func_printf_flag_grouping="guessing yes";; -@@ -1449,7 +1449,7 @@ changequote(,)dnl - darwin[1-6].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - darwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on Cygwin. -- cygwin*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; -+ cygwin* | msys*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on Solaris >= 2.6. - solaris2.[0-5] | solaris2.[0-5].*) - gl_cv_func_vsnprintf_zerosize_c99="guessing no";; -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/realloc.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/realloc.m4 -index fc22825..ce1b2fa 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/realloc.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/realloc.m4 -@@ -33,7 +33,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], - [case "$host_os" in - # Guess yes on platforms where we know the result. - *-gnu* | freebsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ | hpux* | solaris* | cygwin* | msys* | mingw*) - ac_cv_func_realloc_0_nonnull=yes ;; - # If we don't know, assume the worst. - *) ac_cv_func_realloc_0_nonnull=no ;; -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/setlocale.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/setlocale.m4 -index a359069..9fffac3 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/setlocale.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/setlocale.m4 -@@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE], - mingw*) REPLACE_SETLOCALE=1 ;; - dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL) - dnl is then still "C". -- cygwin*) -+ cygwin* | msys*) - case `uname -r` in - 1.5.*) REPLACE_SETLOCALE=1 ;; - esac -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/wctob.m4 gettext-0.19.8.1/gettext-tools/gnulib-m4/wctob.m4 -index bdb5299..7a70017 100644 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-m4/wctob.m4 -+++ gettext-0.19.8.1/gettext-tools/gnulib-m4/wctob.m4 -@@ -29,14 +29,14 @@ AC_DEFUN([gl_FUNC_WCTOB], - changequote(,)dnl - case "$host_os" in - # Guess no on Solaris <= 9 and Cygwin. -- solaris2.[1-9] | solaris2.[1-9].* | cygwin*) -+ solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*) - gl_cv_func_wctob_works="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_wctob_works="guessing yes" ;; - esac - changequote([,])dnl - case "$host_os" in -- cygwin*) -+ cygwin* | msys*) - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ - #include -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-tests/test-copy-acl.sh gettext-0.19.8.1/gettext-tools/gnulib-tests/test-copy-acl.sh -index 147bf56..351b121 100755 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-tests/test-copy-acl.sh -+++ gettext-0.19.8.1/gettext-tools/gnulib-tests/test-copy-acl.sh -@@ -128,7 +128,7 @@ cd "$builddir" || - # the programs. - # func_test_same_acls file1 file2 - case $acl_flavor in -- linux | cygwin | freebsd | solaris) -+ linux | cygwin | msys | freebsd | solaris) - func_test_same_acls () - { - getfacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1 -@@ -302,7 +302,7 @@ cd "$builddir" || - - ;; - -- cygwin) -+ cygwin | msys) - - # Set an ACL for a group. - setfacl -m group:0:1 tmpfile0 -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-tests/test-copy-file.sh gettext-0.19.8.1/gettext-tools/gnulib-tests/test-copy-file.sh -index 98da280..db955b6 100755 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-tests/test-copy-file.sh -+++ gettext-0.19.8.1/gettext-tools/gnulib-tests/test-copy-file.sh -@@ -122,7 +122,7 @@ cd "$builddir" || - # the programs. - # func_test_same_acls file1 file2 - case $acl_flavor in -- linux | cygwin | freebsd | solaris) -+ linux | cygwin | msys | freebsd | solaris) - func_test_same_acls () - { - getfacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1 -@@ -296,7 +296,7 @@ cd "$builddir" || - - ;; - -- cygwin) -+ cygwin | msys) - - # Set an ACL for a group. - setfacl -m group:0:1 tmpfile0 -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-tests/test-file-has-acl.sh gettext-0.19.8.1/gettext-tools/gnulib-tests/test-file-has-acl.sh -index 26610c1..e160de1 100755 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-tests/test-file-has-acl.sh -+++ gettext-0.19.8.1/gettext-tools/gnulib-tests/test-file-has-acl.sh -@@ -247,7 +247,7 @@ cd "$builddir" || - fi - ;; - -- cygwin) -+ cygwin | msys) - - # Set an ACL for a group. - if setfacl -m group:0:1 tmpfile0; then -diff --git gettext-0.19.8.1.orig/gettext-tools/gnulib-tests/test-set-mode-acl.sh gettext-0.19.8.1/gettext-tools/gnulib-tests/test-set-mode-acl.sh -index f0b1641..053adfe 100755 ---- gettext-0.19.8.1.orig/gettext-tools/gnulib-tests/test-set-mode-acl.sh -+++ gettext-0.19.8.1/gettext-tools/gnulib-tests/test-set-mode-acl.sh -@@ -177,7 +177,7 @@ cd "$builddir" || - linux | freebsd | solaris) - setfacl -m user:$auid:1 tmpfile0 - ;; -- cygwin) -+ cygwin | msys) - setfacl -m group:0:1 tmpfile0 - ;; - hpux) -diff --git gettext-0.19.8.1.orig/gettext-tools/libgettextpo/Makefile.gnulib gettext-0.19.8.1/gettext-tools/libgettextpo/Makefile.gnulib -index c68e6f5..b36e9cc 100644 ---- gettext-0.19.8.1.orig/gettext-tools/libgettextpo/Makefile.gnulib -+++ gettext-0.19.8.1/gettext-tools/libgettextpo/Makefile.gnulib -@@ -561,7 +561,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ + ;; \ No newline at end of file From 62b686005aae1d5f475c5578c201b853a3deb812 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 2 Jan 2022 16:38:03 +0100 Subject: [PATCH 2/4] gettext: drop dirent.h workaround not sure why it was needed, but the build seems fine without it. --- gettext/PKGBUILD | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gettext/PKGBUILD b/gettext/PKGBUILD index 4524a8f3..300b858d 100644 --- a/gettext/PKGBUILD +++ b/gettext/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=gettext pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl') pkgver=0.19.8.1 -pkgrel=3 +pkgrel=4 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') url="https://www.gnu.org/software/gettext/" @@ -64,13 +64,8 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-${pkgver}" -cat > config.cache << EOF -ac_cv_header_dirent_h=no -EOF - local CYGWIN_CHOST="$(echo "${CHOST}" | sed 's|-msys$|-cygwin|')" ./configure \ @@ -88,8 +83,7 @@ EOF --disable-java \ --disable-native-java \ --disable-csharp \ - --disable-openmp \ - --cache-file=config.cache + --disable-openmp make From af329800e778cec74096d06da084af7f1916e473 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 2 Jan 2022 16:40:47 +0100 Subject: [PATCH 3/4] gettext: drop install file handled by hooks now --- gettext/PKGBUILD | 3 +-- gettext/gettext.install | 22 ---------------------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 gettext/gettext.install diff --git a/gettext/PKGBUILD b/gettext/PKGBUILD index 300b858d..aba85cdc 100644 --- a/gettext/PKGBUILD +++ b/gettext/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=gettext pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl') pkgver=0.19.8.1 -pkgrel=4 +pkgrel=5 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') url="https://www.gnu.org/software/gettext/" @@ -99,7 +99,6 @@ check() { package_gettext() { depends=('libintl' 'libgettextpo' 'libasprintf') groups=('base-devel') - install=gettext.install mkdir -p ${pkgdir}/usr/{bin,lib,share} diff --git a/gettext/gettext.install b/gettext/gettext.install deleted file mode 100644 index 82b6e3fb..00000000 --- a/gettext/gettext.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=usr/share/info -filelist="gettext.info.gz autosprintf.info.gz" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: From d0b343d95189e35a39d24ecb46ec7c1595ec262f Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 2 Jan 2022 19:18:02 +0100 Subject: [PATCH 4/4] gettext: Update to 0.21 --- gettext/0.19.8.1-have_wprintf.patch | 11 - gettext/0.19.8.1-tests-cygwin.patch | 99 --- gettext/PKGBUILD | 50 +- ...tch => gettext-0.18.1.1-autopoint-V.patch} | 13 +- gettext/gettext-0.19.7-archive.patch | 648 +++++++++++++----- ...atch => gettext-0.19.8.1-cygwin-ftm.patch} | 0 gettext/gettext-0.19.8.1-have_wprintf.patch | 11 + gettext/gettext-0.19.8.1-msys2.patch | 12 +- ...tch => gettext-0.19.8.1-no-woe32dll.patch} | 0 .../gettext-0.21-disable-libtextstyle.patch | 128 ++++ ...alename.patch => gettext-localename.patch} | 68 +- gettext/gettext-tests-cygwin.patch | 68 ++ gettext/gnulib-cygwin-weak-bug.patch | 16 +- 13 files changed, 752 insertions(+), 372 deletions(-) delete mode 100644 gettext/0.19.8.1-have_wprintf.patch delete mode 100644 gettext/0.19.8.1-tests-cygwin.patch rename gettext/{0.19.8.1-autopoint-V.patch => gettext-0.18.1.1-autopoint-V.patch} (82%) rename gettext/{0.19.8.1-cygwin-ftm.patch => gettext-0.19.8.1-cygwin-ftm.patch} (100%) create mode 100644 gettext/gettext-0.19.8.1-have_wprintf.patch rename gettext/{0.19.8.1-no-woe32dll.patch => gettext-0.19.8.1-no-woe32dll.patch} (100%) create mode 100644 gettext/gettext-0.21-disable-libtextstyle.patch rename gettext/{0.19.8.1-localename.patch => gettext-localename.patch} (61%) create mode 100644 gettext/gettext-tests-cygwin.patch diff --git a/gettext/0.19.8.1-have_wprintf.patch b/gettext/0.19.8.1-have_wprintf.patch deleted file mode 100644 index 09dda633..00000000 --- a/gettext/0.19.8.1-have_wprintf.patch +++ /dev/null @@ -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 diff --git a/gettext/0.19.8.1-tests-cygwin.patch b/gettext/0.19.8.1-tests-cygwin.patch deleted file mode 100644 index 73ff1ae1..00000000 --- a/gettext/0.19.8.1-tests-cygwin.patch +++ /dev/null @@ -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 < plural-2.data - ja -@@ -44,7 +44,7 @@ EOF - while read lang; do - read formula - read dataok -- cat > plural-2-ll.po < plural-2-es.po < dataout - test "$dataok" = `cat dataout` || { - echo "Formula evaluation error for language $lang" 1>&2 diff --git a/gettext/PKGBUILD b/gettext/PKGBUILD index aba85cdc..966513c4 100644 --- a/gettext/PKGBUILD +++ b/gettext/PKGBUILD @@ -2,8 +2,8 @@ pkgbase=gettext pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl') -pkgver=0.19.8.1 -pkgrel=5 +pkgver=0.21 +pkgrel=1 pkgdesc="GNU internationalization library" arch=('i686' 'x86_64') url="https://www.gnu.org/software/gettext/" @@ -11,38 +11,42 @@ license=('GPL') makedepends=('libiconv-devel' 'autotools' 'gcc') options=(!docs) source=(https://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig} - 0.19.8.1-autopoint-V.patch - 0.19.8.1-localename.patch - 0.19.8.1-no-woe32dll.patch - 0.19.8.1-tests-cygwin.patch - 0.19.8.1-cygwin-ftm.patch - 0.19.8.1-have_wprintf.patch + gettext-0.18.1.1-autopoint-V.patch + gettext-0.19.8.1-no-woe32dll.patch + gettext-localename.patch + gettext-tests-cygwin.patch + gettext-0.19.8.1-cygwin-ftm.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.7-archive.patch gnulib-cygwin-weak-bug.patch) -sha256sums=('ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43' +sha256sums=('c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12' 'SKIP' - '0d3082e9a6b997b61dbb160f5af234a1bc89cddf9dc680999429276cf605b731' - '25aa01d5a2f58e60878f03bead62662434f56247ba965668fd7b26108b80c4f3' + '9fe8e25783ea629db3c64ce4d8e4d7912e01e6c3b7391cd48c0843b448576c25' 'b182af5d1e60c520fc6e716565c58a5f7497f608b5d4b07e3a58500fec54cdc5' - 'd564c2d10ded1c60c421b0790639339f60ea7a4bc7e6d3034e59ec50d04d07be' + '8eaf41ecf774501155a7684e64249bd6b668f2e9b05b6ce5383a22b71ff23ba3' + '7439a9e86628c6f85cc0ff639f7ff46d487e0ffb4c43139a49c6d85775819f45' '22cfaca417f04507a901cba93a7eb219183d5e681b7459d8c0e9660621a9a696' - 'd4df598ebde60ea4e069991baed43b00dbb28d3b8a40cc7cf4a6e12847ee3616' - '829132cf5bc1e62f1fd47a5abd8e350fa854a14c574800a6bc58ec492bb70c1b' - 'e117ddf7cbb175c0ceabc03d8114f875fa120e8f9999e914ecb2bc4ded8d92ce' - '8a297177d532e15f7b4eca5c2f56a7b0980ea8ae1432c7d13f500e37e30229c9') -validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') + 'ec5e9ca3c85163d9f7e2ee19aee0c312bdda9db7be6de4ec7757ee40568aa1e6' + '544ce0589e9c70f4f75d77c76fd36f88d009ac9cfecb4812a67f878e38ac6418' + '42276af94b61339f24ed2b184cb6bae85e8d32fae4f3cc8d51776e9db146c446' + '047b74d6240205c21fa3a6cb3d8bfeeb5721064c3ea5a318542d74e0378ab97a' + '1233eb631779fa7dfd13313c955080b8e2cd8db4c352a4878db1edc40be7d40b') +validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno + '9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development) prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # Cygwin patches - patch -p2 -i $srcdir/0.19.8.1-autopoint-V.patch - patch -p2 -i $srcdir/0.19.8.1-localename.patch - patch -p2 -i $srcdir/0.19.8.1-no-woe32dll.patch - patch -p2 -i $srcdir/0.19.8.1-tests-cygwin.patch - patch -p2 -i $srcdir/0.19.8.1-cygwin-ftm.patch - patch -p3 -i $srcdir/0.19.8.1-have_wprintf.patch + patch -p2 -i $srcdir/gettext-0.18.1.1-autopoint-V.patch + patch -p2 -i $srcdir/gettext-0.19.8.1-no-woe32dll.patch + patch -p1 -i $srcdir/gettext-localename.patch + patch -p1 -i $srcdir/gettext-tests-cygwin.patch + patch -p2 -i $srcdir/gettext-0.19.8.1-cygwin-ftm.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 patch -p1 -i $srcdir/gnulib-cygwin-weak-bug.patch diff --git a/gettext/0.19.8.1-autopoint-V.patch b/gettext/gettext-0.18.1.1-autopoint-V.patch similarity index 82% rename from gettext/0.19.8.1-autopoint-V.patch rename to gettext/gettext-0.18.1.1-autopoint-V.patch index 55320ea3..49713430 100644 --- a/gettext/0.19.8.1-autopoint-V.patch +++ b/gettext/gettext-0.18.1.1-autopoint-V.patch @@ -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 -index 6d0746f..5b7c0bb 100755 ---- origsrc/gettext-0.19.8.1.orig/gettext-tools/misc/autopoint.in -+++ src/gettext-0.19.8.1/gettext-tools/misc/autopoint.in -@@ -193,9 +193,9 @@ Options: +--- origsrc/gettext-0.18.1.1/gettext-tools/misc/autopoint.in 2010-06-06 08:49:57.000000000 -0400 ++++ src/gettext-0.18.1.1/gettext-tools/misc/autopoint.in 2011-10-16 00:57:42.789133600 -0400 +@@ -161,9 +161,9 @@ Options: --version print version information and exit -f, --force force overwriting of files that already exist -n, --dry-run print modifications but don't perform them" @@ -15,7 +13,7 @@ index 6d0746f..5b7c0bb 100755 echo " Report bugs to ." } -@@ -249,17 +249,17 @@ unset CLICOLOR_FORCE GREP_OPTIONS +@@ -210,17 +210,17 @@ func_fatal_error () force=yes ;; --help | --hel | --he | --h ) func_usage; exit 0 ;; @@ -44,7 +42,7 @@ index 6d0746f..5b7c0bb 100755 --version | --versio | --versi | --vers | --ver | --ve | --v ) func_version exit 0 ;; -@@ -355,7 +355,7 @@ else +@@ -276,7 +276,7 @@ fi if test -n "$xver"; then if test -n "$ver"; then if test "X$ver" != "X$xver"; then @@ -53,3 +51,4 @@ index 6d0746f..5b7c0bb 100755 fi else ver="$xver" + diff --git a/gettext/gettext-0.19.7-archive.patch b/gettext/gettext-0.19.7-archive.patch index 59fad217..b3291857 100644 --- a/gettext/gettext-0.19.7-archive.patch +++ b/gettext/gettext-0.19.7-archive.patch @@ -1,6 +1,6 @@ -diff -Naur archive-orig/gettext-0.11/config.rpath archive/gettext-0.11/config.rpath ---- archive-orig/gettext-0.11/config.rpath 2002-05-01 21:56:22.000000000 +0400 -+++ archive/gettext-0.11/config.rpath 2015-03-03 11:43:26.420800000 +0300 +diff -Nur archive-orig/gettext-0.11/config.rpath archive/gettext-0.11/config.rpath +--- archive-orig/gettext-0.11/config.rpath 2002-05-01 19:56:22.000000000 +0200 ++++ archive/gettext-0.11/config.rpath 2022-01-02 18:33:56.831130700 +0100 @@ -95,7 +95,7 @@ hardcode_minus_L=no @@ -40,9 +40,9 @@ diff -Naur archive-orig/gettext-0.11/config.rpath archive/gettext-0.11/config.rp shlibext=dll.a ;; yes,mingw*) -diff -Naur archive-orig/gettext-0.11.1/config.rpath archive/gettext-0.11.1/config.rpath ---- archive-orig/gettext-0.11.1/config.rpath 2002-05-01 22:02:35.000000000 +0400 -+++ archive/gettext-0.11.1/config.rpath 2015-03-03 11:43:59.602000000 +0300 +diff -Nur archive-orig/gettext-0.11.1/config.rpath archive/gettext-0.11.1/config.rpath +--- archive-orig/gettext-0.11.1/config.rpath 2002-05-01 20:02:35.000000000 +0200 ++++ archive/gettext-0.11.1/config.rpath 2022-01-02 18:33:56.834132100 +0100 @@ -93,7 +93,7 @@ hardcode_minus_L=no @@ -82,9 +82,9 @@ diff -Naur archive-orig/gettext-0.11.1/config.rpath archive/gettext-0.11.1/confi shlibext=dll.a ;; yes,mingw*) -diff -Naur archive-orig/gettext-0.11.2/config.rpath archive/gettext-0.11.2/config.rpath ---- archive-orig/gettext-0.11.2/config.rpath 2002-05-01 22:02:35.000000000 +0400 -+++ archive/gettext-0.11.2/config.rpath 2015-03-03 11:44:29.179600000 +0300 +diff -Nur archive-orig/gettext-0.11.2/config.rpath archive/gettext-0.11.2/config.rpath +--- archive-orig/gettext-0.11.2/config.rpath 2002-05-01 20:02:35.000000000 +0200 ++++ archive/gettext-0.11.2/config.rpath 2022-01-02 18:33:56.836134200 +0100 @@ -93,7 +93,7 @@ hardcode_minus_L=no @@ -124,9 +124,9 @@ diff -Naur archive-orig/gettext-0.11.2/config.rpath archive/gettext-0.11.2/confi shlibext=dll.a ;; yes,mingw*) -diff -Naur archive-orig/gettext-0.11.3/config.rpath archive/gettext-0.11.3/config.rpath ---- archive-orig/gettext-0.11.3/config.rpath 2002-05-01 22:02:35.000000000 +0400 -+++ archive/gettext-0.11.3/config.rpath 2015-03-03 11:45:11.299600000 +0300 +diff -Nur archive-orig/gettext-0.11.3/config.rpath archive/gettext-0.11.3/config.rpath +--- archive-orig/gettext-0.11.3/config.rpath 2002-05-01 20:02:35.000000000 +0200 ++++ archive/gettext-0.11.3/config.rpath 2022-01-02 18:33:56.838128400 +0100 @@ -93,7 +93,7 @@ hardcode_minus_L=no @@ -166,9 +166,9 @@ diff -Naur archive-orig/gettext-0.11.3/config.rpath archive/gettext-0.11.3/confi shlibext=dll.a ;; yes,mingw*) -diff -Naur archive-orig/gettext-0.11.4/config.rpath archive/gettext-0.11.4/config.rpath ---- archive-orig/gettext-0.11.4/config.rpath 2002-05-01 22:02:35.000000000 +0400 -+++ archive/gettext-0.11.4/config.rpath 2015-03-03 11:45:37.694800000 +0300 +diff -Nur archive-orig/gettext-0.11.4/config.rpath archive/gettext-0.11.4/config.rpath +--- archive-orig/gettext-0.11.4/config.rpath 2002-05-01 20:02:35.000000000 +0200 ++++ archive/gettext-0.11.4/config.rpath 2022-01-02 18:33:56.839572700 +0100 @@ -93,7 +93,7 @@ hardcode_minus_L=no @@ -208,9 +208,9 @@ diff -Naur archive-orig/gettext-0.11.4/config.rpath archive/gettext-0.11.4/confi shlibext=dll.a ;; yes,mingw*) -diff -Naur archive-orig/gettext-0.11.5/config.rpath archive/gettext-0.11.5/config.rpath ---- archive-orig/gettext-0.11.5/config.rpath 2002-05-01 22:02:35.000000000 +0400 -+++ archive/gettext-0.11.5/config.rpath 2015-03-03 11:46:03.809200000 +0300 +diff -Nur archive-orig/gettext-0.11.5/config.rpath archive/gettext-0.11.5/config.rpath +--- archive-orig/gettext-0.11.5/config.rpath 2002-05-01 20:02:35.000000000 +0200 ++++ archive/gettext-0.11.5/config.rpath 2022-01-02 18:33:56.841309800 +0100 @@ -93,7 +93,7 @@ hardcode_minus_L=no @@ -250,9 +250,9 @@ diff -Naur archive-orig/gettext-0.11.5/config.rpath archive/gettext-0.11.5/confi shlibext=dll.a ;; yes,mingw*) -diff -Naur archive-orig/gettext-0.12/config.rpath archive/gettext-0.12/config.rpath ---- archive-orig/gettext-0.12/config.rpath 2003-05-17 19:34:29.000000000 +0400 -+++ archive/gettext-0.12/config.rpath 2015-03-03 11:46:52.403200000 +0300 +diff -Nur archive-orig/gettext-0.12/config.rpath archive/gettext-0.12/config.rpath +--- archive-orig/gettext-0.12/config.rpath 2003-05-17 17:34:29.000000000 +0200 ++++ archive/gettext-0.12/config.rpath 2022-01-02 18:33:56.843033300 +0100 @@ -109,7 +109,7 @@ hardcode_minus_L=no @@ -289,9 +289,9 @@ diff -Naur archive-orig/gettext-0.12/config.rpath archive/gettext-0.12/config.rp shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.12.1/config.rpath archive/gettext-0.12.1/config.rpath ---- archive-orig/gettext-0.12.1/config.rpath 2003-05-17 19:34:29.000000000 +0400 -+++ archive/gettext-0.12.1/config.rpath 2015-03-03 11:47:15.194800000 +0300 +diff -Nur archive-orig/gettext-0.12.1/config.rpath archive/gettext-0.12.1/config.rpath +--- archive-orig/gettext-0.12.1/config.rpath 2003-05-17 17:34:29.000000000 +0200 ++++ archive/gettext-0.12.1/config.rpath 2022-01-02 18:33:56.844747700 +0100 @@ -109,7 +109,7 @@ hardcode_minus_L=no @@ -328,9 +328,9 @@ diff -Naur archive-orig/gettext-0.12.1/config.rpath archive/gettext-0.12.1/confi shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.13/config.rpath archive/gettext-0.13/config.rpath ---- archive-orig/gettext-0.13/config.rpath 2003-11-30 17:31:21.000000000 +0300 -+++ archive/gettext-0.13/config.rpath 2015-03-03 11:47:39.000400000 +0300 +diff -Nur archive-orig/gettext-0.13/config.rpath archive/gettext-0.13/config.rpath +--- archive-orig/gettext-0.13/config.rpath 2003-11-30 15:31:21.000000000 +0100 ++++ archive/gettext-0.13/config.rpath 2022-01-02 18:33:56.846749300 +0100 @@ -109,7 +109,7 @@ hardcode_minus_L=no @@ -367,9 +367,9 @@ diff -Naur archive-orig/gettext-0.13/config.rpath archive/gettext-0.13/config.rp shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.13.1/config.rpath archive/gettext-0.13.1/config.rpath ---- archive-orig/gettext-0.13.1/config.rpath 2003-11-30 17:31:21.000000000 +0300 -+++ archive/gettext-0.13.1/config.rpath 2015-03-03 11:48:04.116400000 +0300 +diff -Nur archive-orig/gettext-0.13.1/config.rpath archive/gettext-0.13.1/config.rpath +--- archive-orig/gettext-0.13.1/config.rpath 2003-11-30 15:31:21.000000000 +0100 ++++ archive/gettext-0.13.1/config.rpath 2022-01-02 18:33:56.848291800 +0100 @@ -109,7 +109,7 @@ hardcode_minus_L=no @@ -406,9 +406,9 @@ diff -Naur archive-orig/gettext-0.13.1/config.rpath archive/gettext-0.13.1/confi shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.14/config.rpath archive/gettext-0.14/config.rpath ---- archive-orig/gettext-0.14/config.rpath 2003-11-30 17:31:21.000000000 +0300 -+++ archive/gettext-0.14/config.rpath 2015-03-03 11:48:33.694000000 +0300 +diff -Nur archive-orig/gettext-0.14/config.rpath archive/gettext-0.14/config.rpath +--- archive-orig/gettext-0.14/config.rpath 2003-11-30 15:31:21.000000000 +0100 ++++ archive/gettext-0.14/config.rpath 2022-01-02 18:33:56.850293400 +0100 @@ -109,7 +109,7 @@ hardcode_minus_L=no @@ -445,9 +445,9 @@ diff -Naur archive-orig/gettext-0.14/config.rpath archive/gettext-0.14/config.rp shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.14.1/config.rpath archive/gettext-0.14.1/config.rpath ---- archive-orig/gettext-0.14.1/config.rpath 2003-11-30 17:31:21.000000000 +0300 -+++ archive/gettext-0.14.1/config.rpath 2015-03-03 11:48:54.863200000 +0300 +diff -Nur archive-orig/gettext-0.14.1/config.rpath archive/gettext-0.14.1/config.rpath +--- archive-orig/gettext-0.14.1/config.rpath 2003-11-30 15:31:21.000000000 +0100 ++++ archive/gettext-0.14.1/config.rpath 2022-01-02 18:33:56.851294300 +0100 @@ -109,7 +109,7 @@ hardcode_minus_L=no @@ -484,9 +484,9 @@ diff -Naur archive-orig/gettext-0.14.1/config.rpath archive/gettext-0.14.1/confi shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.14.2/config.rpath archive/gettext-0.14.2/config.rpath ---- archive-orig/gettext-0.14.2/config.rpath 2005-02-24 17:21:47.000000000 +0300 -+++ archive/gettext-0.14.2/config.rpath 2015-03-03 11:49:18.918400000 +0300 +diff -Nur archive-orig/gettext-0.14.2/config.rpath archive/gettext-0.14.2/config.rpath +--- archive-orig/gettext-0.14.2/config.rpath 2005-02-24 15:21:47.000000000 +0100 ++++ archive/gettext-0.14.2/config.rpath 2022-01-02 18:33:56.853296100 +0100 @@ -112,7 +112,7 @@ hardcode_minus_L=no @@ -523,9 +523,9 @@ diff -Naur archive-orig/gettext-0.14.2/config.rpath archive/gettext-0.14.2/confi shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.14.3/config.rpath archive/gettext-0.14.3/config.rpath ---- archive-orig/gettext-0.14.3/config.rpath 2005-02-24 17:21:47.000000000 +0300 -+++ archive/gettext-0.14.3/config.rpath 2015-03-03 11:49:58.277200000 +0300 +diff -Nur archive-orig/gettext-0.14.3/config.rpath archive/gettext-0.14.3/config.rpath +--- archive-orig/gettext-0.14.3/config.rpath 2005-02-24 15:21:47.000000000 +0100 ++++ archive/gettext-0.14.3/config.rpath 2022-01-02 18:33:56.855297900 +0100 @@ -112,7 +112,7 @@ hardcode_minus_L=no @@ -562,9 +562,9 @@ diff -Naur archive-orig/gettext-0.14.3/config.rpath archive/gettext-0.14.3/confi shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.14.4/config.rpath archive/gettext-0.14.4/config.rpath ---- archive-orig/gettext-0.14.4/config.rpath 2005-02-24 17:21:47.000000000 +0300 -+++ archive/gettext-0.14.4/config.rpath 2015-03-03 11:50:31.302400000 +0300 +diff -Nur archive-orig/gettext-0.14.4/config.rpath archive/gettext-0.14.4/config.rpath +--- archive-orig/gettext-0.14.4/config.rpath 2005-02-24 15:21:47.000000000 +0100 ++++ archive/gettext-0.14.4/config.rpath 2022-01-02 18:33:56.857299900 +0100 @@ -112,7 +112,7 @@ hardcode_minus_L=no @@ -601,9 +601,9 @@ diff -Naur archive-orig/gettext-0.14.4/config.rpath archive/gettext-0.14.4/confi shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.14.5/config.rpath archive/gettext-0.14.5/config.rpath ---- archive-orig/gettext-0.14.5/config.rpath 2005-02-24 17:21:47.000000000 +0300 -+++ archive/gettext-0.14.5/config.rpath 2015-03-03 11:50:59.070400000 +0300 +diff -Nur archive-orig/gettext-0.14.5/config.rpath archive/gettext-0.14.5/config.rpath +--- archive-orig/gettext-0.14.5/config.rpath 2005-02-24 15:21:47.000000000 +0100 ++++ archive/gettext-0.14.5/config.rpath 2022-01-02 18:33:56.858839000 +0100 @@ -112,7 +112,7 @@ hardcode_minus_L=no @@ -640,9 +640,9 @@ diff -Naur archive-orig/gettext-0.14.5/config.rpath archive/gettext-0.14.5/confi shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.14.6/config.rpath archive/gettext-0.14.6/config.rpath ---- archive-orig/gettext-0.14.6/config.rpath 2005-02-24 17:21:47.000000000 +0300 -+++ archive/gettext-0.14.6/config.rpath 2015-03-03 11:51:25.496800000 +0300 +diff -Nur archive-orig/gettext-0.14.6/config.rpath archive/gettext-0.14.6/config.rpath +--- archive-orig/gettext-0.14.6/config.rpath 2005-02-24 15:21:47.000000000 +0100 ++++ archive/gettext-0.14.6/config.rpath 2022-01-02 18:33:56.860562800 +0100 @@ -112,7 +112,7 @@ hardcode_minus_L=no @@ -679,9 +679,9 @@ diff -Naur archive-orig/gettext-0.14.6/config.rpath archive/gettext-0.14.6/confi shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.15/config.rpath archive/gettext-0.15/config.rpath ---- archive-orig/gettext-0.15/config.rpath 2006-07-21 17:36:21.000000000 +0400 -+++ archive/gettext-0.15/config.rpath 2015-03-03 11:51:55.386400000 +0300 +diff -Nur archive-orig/gettext-0.15/config.rpath archive/gettext-0.15/config.rpath +--- archive-orig/gettext-0.15/config.rpath 2006-07-21 15:36:21.000000000 +0200 ++++ archive/gettext-0.15/config.rpath 2022-01-02 18:33:56.862261300 +0100 @@ -129,7 +129,7 @@ hardcode_minus_L=no @@ -718,9 +718,9 @@ diff -Naur archive-orig/gettext-0.15/config.rpath archive/gettext-0.15/config.rp shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.16/config.rpath archive/gettext-0.16/config.rpath ---- archive-orig/gettext-0.16/config.rpath 2006-07-21 17:36:21.000000000 +0400 -+++ archive/gettext-0.16/config.rpath 2015-03-03 11:52:25.556800000 +0300 +diff -Nur archive-orig/gettext-0.16/config.rpath archive/gettext-0.16/config.rpath +--- archive-orig/gettext-0.16/config.rpath 2006-07-21 15:36:21.000000000 +0200 ++++ archive/gettext-0.16/config.rpath 2022-01-02 18:33:56.864263100 +0100 @@ -129,7 +129,7 @@ hardcode_minus_L=no @@ -757,9 +757,9 @@ diff -Naur archive-orig/gettext-0.16/config.rpath archive/gettext-0.16/config.rp shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.16/m4/intl.m4 archive/gettext-0.16/m4/intl.m4 ---- archive-orig/gettext-0.16/m4/intl.m4 2006-10-26 17:24:50.000000000 +0400 -+++ archive/gettext-0.16/m4/intl.m4 2015-03-03 11:52:59.939200000 +0300 +diff -Nur archive-orig/gettext-0.16/m4/intl.m4 archive/gettext-0.16/m4/intl.m4 +--- archive-orig/gettext-0.16/m4/intl.m4 2006-10-26 15:24:50.000000000 +0200 ++++ archive/gettext-0.16/m4/intl.m4 2022-01-02 18:33:56.866264300 +0100 @@ -98,7 +98,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -769,9 +769,9 @@ diff -Naur archive-orig/gettext-0.16/m4/intl.m4 archive/gettext-0.16/m4/intl.m4 *) is_woe32dll=no ;; esac else -diff -Naur archive-orig/gettext-0.16.1/config.rpath archive/gettext-0.16.1/config.rpath ---- archive-orig/gettext-0.16.1/config.rpath 2006-07-21 17:36:21.000000000 +0400 -+++ archive/gettext-0.16.1/config.rpath 2015-03-03 11:53:30.749200000 +0300 +diff -Nur archive-orig/gettext-0.16.1/config.rpath archive/gettext-0.16.1/config.rpath +--- archive-orig/gettext-0.16.1/config.rpath 2006-07-21 15:36:21.000000000 +0200 ++++ archive/gettext-0.16.1/config.rpath 2022-01-02 18:33:56.868220400 +0100 @@ -129,7 +129,7 @@ hardcode_minus_L=no @@ -808,9 +808,9 @@ diff -Naur archive-orig/gettext-0.16.1/config.rpath archive/gettext-0.16.1/confi shrext=.dll ;; darwin* | rhapsody*) -diff -Naur archive-orig/gettext-0.16.1/m4/intl.m4 archive/gettext-0.16.1/m4/intl.m4 ---- archive-orig/gettext-0.16.1/m4/intl.m4 2006-10-26 17:24:50.000000000 +0400 -+++ archive/gettext-0.16.1/m4/intl.m4 2015-03-03 11:53:44.414800000 +0300 +diff -Nur archive-orig/gettext-0.16.1/m4/intl.m4 archive/gettext-0.16.1/m4/intl.m4 +--- archive-orig/gettext-0.16.1/m4/intl.m4 2006-10-26 15:24:50.000000000 +0200 ++++ archive/gettext-0.16.1/m4/intl.m4 2022-01-02 18:33:56.869956100 +0100 @@ -98,7 +98,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -820,9 +820,9 @@ diff -Naur archive-orig/gettext-0.16.1/m4/intl.m4 archive/gettext-0.16.1/m4/intl *) is_woe32dll=no ;; esac else -diff -Naur archive-orig/gettext-0.17/config.rpath archive/gettext-0.17/config.rpath ---- archive-orig/gettext-0.17/config.rpath 2007-11-07 05:50:28.000000000 +0300 -+++ archive/gettext-0.17/config.rpath 2015-03-03 11:56:35.422000000 +0300 +diff -Nur archive-orig/gettext-0.17/config.rpath archive/gettext-0.17/config.rpath +--- archive-orig/gettext-0.17/config.rpath 2007-11-07 03:50:28.000000000 +0100 ++++ archive/gettext-0.17/config.rpath 2022-01-02 18:33:56.871601700 +0100 @@ -64,7 +64,7 @@ ;; esac @@ -868,9 +868,9 @@ diff -Naur archive-orig/gettext-0.17/config.rpath archive/gettext-0.17/config.rp shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.17/m4/intl.m4 archive/gettext-0.17/m4/intl.m4 ---- archive-orig/gettext-0.17/m4/intl.m4 2007-11-07 05:50:28.000000000 +0300 -+++ archive/gettext-0.17/m4/intl.m4 2015-03-03 11:56:57.683200000 +0300 +diff -Nur archive-orig/gettext-0.17/m4/intl.m4 archive/gettext-0.17/m4/intl.m4 +--- archive-orig/gettext-0.17/m4/intl.m4 2007-11-07 03:50:28.000000000 +0100 ++++ archive/gettext-0.17/m4/intl.m4 2022-01-02 18:33:56.873376400 +0100 @@ -97,7 +97,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -889,9 +889,9 @@ diff -Naur archive-orig/gettext-0.17/m4/intl.m4 archive/gettext-0.17/m4/intl.m4 *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.18/config.rpath archive/gettext-0.18/config.rpath ---- archive-orig/gettext-0.18/config.rpath 2010-05-09 23:42:50.000000000 +0400 -+++ archive/gettext-0.18/config.rpath 2015-03-03 11:57:25.825600000 +0300 +diff -Nur archive-orig/gettext-0.18/config.rpath archive/gettext-0.18/config.rpath +--- archive-orig/gettext-0.18/config.rpath 2010-05-09 21:42:50.000000000 +0200 ++++ archive/gettext-0.18/config.rpath 2022-01-02 18:33:56.875097800 +0100 @@ -64,7 +64,7 @@ ;; esac @@ -937,9 +937,9 @@ diff -Naur archive-orig/gettext-0.18/config.rpath archive/gettext-0.18/config.rp shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.18/intl/Makefile.in archive/gettext-0.18/intl/Makefile.in ---- archive-orig/gettext-0.18/intl/Makefile.in 2010-05-09 23:42:55.000000000 +0400 -+++ archive/gettext-0.18/intl/Makefile.in 2015-03-03 11:57:47.150800000 +0300 +diff -Nur archive-orig/gettext-0.18/intl/Makefile.in archive/gettext-0.18/intl/Makefile.in +--- archive-orig/gettext-0.18/intl/Makefile.in 2010-05-09 21:42:55.000000000 +0200 ++++ archive/gettext-0.18/intl/Makefile.in 2022-01-02 18:33:56.876977200 +0100 @@ -414,7 +414,7 @@ case '@host_os@' in \ darwin[56]*) \ @@ -958,9 +958,9 @@ diff -Naur archive-orig/gettext-0.18/intl/Makefile.in archive/gettext-0.18/intl/ need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.18/m4/intl.m4 archive/gettext-0.18/m4/intl.m4 ---- archive-orig/gettext-0.18/m4/intl.m4 2010-05-09 23:42:58.000000000 +0400 -+++ archive/gettext-0.18/m4/intl.m4 2015-03-03 11:58:10.550800000 +0300 +diff -Nur archive-orig/gettext-0.18/m4/intl.m4 archive/gettext-0.18/m4/intl.m4 +--- archive-orig/gettext-0.18/m4/intl.m4 2010-05-09 21:42:58.000000000 +0200 ++++ archive/gettext-0.18/m4/intl.m4 2022-01-02 18:33:56.878723300 +0100 @@ -113,7 +113,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -979,9 +979,9 @@ diff -Naur archive-orig/gettext-0.18/m4/intl.m4 archive/gettext-0.18/m4/intl.m4 *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.18.1/config.rpath archive/gettext-0.18.1/config.rpath ---- archive-orig/gettext-0.18.1/config.rpath 2010-06-04 04:07:46.000000000 +0400 -+++ archive/gettext-0.18.1/config.rpath 2015-03-03 12:00:46.722400000 +0300 +diff -Nur archive-orig/gettext-0.18.1/config.rpath archive/gettext-0.18.1/config.rpath +--- archive-orig/gettext-0.18.1/config.rpath 2010-06-04 02:07:46.000000000 +0200 ++++ archive/gettext-0.18.1/config.rpath 2022-01-02 18:33:56.880725100 +0100 @@ -64,7 +64,7 @@ ;; esac @@ -1027,9 +1027,9 @@ diff -Naur archive-orig/gettext-0.18.1/config.rpath archive/gettext-0.18.1/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.18.1/intl/Makefile.in archive/gettext-0.18.1/intl/Makefile.in ---- archive-orig/gettext-0.18.1/intl/Makefile.in 2010-06-04 04:07:28.000000000 +0400 -+++ archive/gettext-0.18.1/intl/Makefile.in 2015-03-03 12:01:14.864800000 +0300 +diff -Nur archive-orig/gettext-0.18.1/intl/Makefile.in archive/gettext-0.18.1/intl/Makefile.in +--- archive-orig/gettext-0.18.1/intl/Makefile.in 2010-06-04 02:07:28.000000000 +0200 ++++ archive/gettext-0.18.1/intl/Makefile.in 2022-01-02 18:33:56.882726400 +0100 @@ -414,7 +414,7 @@ case '@host_os@' in \ darwin[56]*) \ @@ -1048,9 +1048,9 @@ diff -Naur archive-orig/gettext-0.18.1/intl/Makefile.in archive/gettext-0.18.1/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.18.1/m4/intl.m4 archive/gettext-0.18.1/m4/intl.m4 ---- archive-orig/gettext-0.18.1/m4/intl.m4 2010-06-04 04:07:30.000000000 +0400 -+++ archive/gettext-0.18.1/m4/intl.m4 2015-03-03 12:01:29.138800000 +0300 +diff -Nur archive-orig/gettext-0.18.1/m4/intl.m4 archive/gettext-0.18.1/m4/intl.m4 +--- archive-orig/gettext-0.18.1/m4/intl.m4 2010-06-04 02:07:30.000000000 +0200 ++++ archive/gettext-0.18.1/m4/intl.m4 2022-01-02 18:33:56.883727400 +0100 @@ -113,7 +113,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1069,9 +1069,9 @@ diff -Naur archive-orig/gettext-0.18.1/m4/intl.m4 archive/gettext-0.18.1/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.18.2/config.rpath archive/gettext-0.18.2/config.rpath ---- archive-orig/gettext-0.18.2/config.rpath 2013-03-05 13:08:30.000000000 +0400 -+++ archive/gettext-0.18.2/config.rpath 2015-03-03 12:01:54.348400000 +0300 +diff -Nur archive-orig/gettext-0.18.2/config.rpath archive/gettext-0.18.2/config.rpath +--- archive-orig/gettext-0.18.2/config.rpath 2013-03-05 10:08:30.000000000 +0100 ++++ archive/gettext-0.18.2/config.rpath 2022-01-02 18:33:56.885729100 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1117,9 +1117,9 @@ diff -Naur archive-orig/gettext-0.18.2/config.rpath archive/gettext-0.18.2/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.18.2/intl/Makefile.in archive/gettext-0.18.2/intl/Makefile.in ---- archive-orig/gettext-0.18.2/intl/Makefile.in 2013-03-05 13:08:24.000000000 +0400 -+++ archive/gettext-0.18.2/intl/Makefile.in 2015-03-03 12:02:54.205600000 +0300 +diff -Nur archive-orig/gettext-0.18.2/intl/Makefile.in archive/gettext-0.18.2/intl/Makefile.in +--- archive-orig/gettext-0.18.2/intl/Makefile.in 2013-03-05 10:08:24.000000000 +0100 ++++ archive/gettext-0.18.2/intl/Makefile.in 2022-01-02 18:33:56.887731500 +0100 @@ -418,7 +418,7 @@ case '@host_os@' in \ darwin[56]*) \ @@ -1138,9 +1138,9 @@ diff -Naur archive-orig/gettext-0.18.2/intl/Makefile.in archive/gettext-0.18.2/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.18.2/m4/intl.m4 archive/gettext-0.18.2/m4/intl.m4 ---- archive-orig/gettext-0.18.2/m4/intl.m4 2013-03-05 13:08:25.000000000 +0400 -+++ archive/gettext-0.18.2/m4/intl.m4 2015-03-03 12:03:09.244000000 +0300 +diff -Nur archive-orig/gettext-0.18.2/m4/intl.m4 archive/gettext-0.18.2/m4/intl.m4 +--- archive-orig/gettext-0.18.2/m4/intl.m4 2013-03-05 10:08:25.000000000 +0100 ++++ archive/gettext-0.18.2/m4/intl.m4 2022-01-02 18:33:56.889518700 +0100 @@ -113,7 +113,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1159,9 +1159,9 @@ diff -Naur archive-orig/gettext-0.18.2/m4/intl.m4 archive/gettext-0.18.2/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.18.3/config.rpath archive/gettext-0.18.3/config.rpath ---- archive-orig/gettext-0.18.3/config.rpath 2014-01-07 10:32:23.000000000 +0400 -+++ archive/gettext-0.18.3/config.rpath 2015-03-03 12:04:13.375600000 +0300 +diff -Nur archive-orig/gettext-0.18.3/config.rpath archive/gettext-0.18.3/config.rpath +--- archive-orig/gettext-0.18.3/config.rpath 2014-01-07 07:32:23.000000000 +0100 ++++ archive/gettext-0.18.3/config.rpath 2022-01-02 18:33:56.891187000 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1207,9 +1207,9 @@ diff -Naur archive-orig/gettext-0.18.3/config.rpath archive/gettext-0.18.3/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.18.3/intl/Makefile.in archive/gettext-0.18.3/intl/Makefile.in ---- archive-orig/gettext-0.18.3/intl/Makefile.in 2014-01-07 10:32:14.000000000 +0400 -+++ archive/gettext-0.18.3/intl/Makefile.in 2015-03-03 12:03:44.687200000 +0300 +diff -Nur archive-orig/gettext-0.18.3/intl/Makefile.in archive/gettext-0.18.3/intl/Makefile.in +--- archive-orig/gettext-0.18.3/intl/Makefile.in 2014-01-07 07:32:14.000000000 +0100 ++++ archive/gettext-0.18.3/intl/Makefile.in 2022-01-02 18:33:56.893119000 +0100 @@ -418,7 +418,7 @@ case '@host_os@' in \ darwin[56]*) \ @@ -1228,9 +1228,9 @@ diff -Naur archive-orig/gettext-0.18.3/intl/Makefile.in archive/gettext-0.18.3/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.18.3/m4/intl.m4 archive/gettext-0.18.3/m4/intl.m4 ---- archive-orig/gettext-0.18.3/m4/intl.m4 2014-01-07 10:32:15.000000000 +0400 -+++ archive/gettext-0.18.3/m4/intl.m4 2015-03-03 12:06:42.714400000 +0300 +diff -Nur archive-orig/gettext-0.18.3/m4/intl.m4 archive/gettext-0.18.3/m4/intl.m4 +--- archive-orig/gettext-0.18.3/m4/intl.m4 2014-01-07 07:32:15.000000000 +0100 ++++ archive/gettext-0.18.3/m4/intl.m4 2022-01-02 18:33:56.894872600 +0100 @@ -112,7 +112,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1249,9 +1249,9 @@ diff -Naur archive-orig/gettext-0.18.3/m4/intl.m4 archive/gettext-0.18.3/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.19/config.rpath archive/gettext-0.19/config.rpath ---- archive-orig/gettext-0.19/config.rpath 2014-06-02 03:26:46.000000000 +0400 -+++ archive/gettext-0.19/config.rpath 2015-03-03 12:07:10.950400000 +0300 +diff -Nur archive-orig/gettext-0.19/config.rpath archive/gettext-0.19/config.rpath +--- archive-orig/gettext-0.19/config.rpath 2014-06-02 01:26:46.000000000 +0200 ++++ archive/gettext-0.19/config.rpath 2022-01-02 18:33:56.896874400 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1297,9 +1297,9 @@ diff -Naur archive-orig/gettext-0.19/config.rpath archive/gettext-0.19/config.rp shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.19/intl/Makefile.in archive/gettext-0.19/intl/Makefile.in ---- archive-orig/gettext-0.19/intl/Makefile.in 2014-06-02 03:26:33.000000000 +0400 -+++ archive/gettext-0.19/intl/Makefile.in 2015-03-03 12:07:33.164800000 +0300 +diff -Nur archive-orig/gettext-0.19/intl/Makefile.in archive/gettext-0.19/intl/Makefile.in +--- archive-orig/gettext-0.19/intl/Makefile.in 2014-06-02 01:26:33.000000000 +0200 ++++ archive/gettext-0.19/intl/Makefile.in 2022-01-02 18:33:56.898631600 +0100 @@ -418,7 +418,7 @@ case '@host_os@' in \ darwin[56]*) \ @@ -1318,9 +1318,9 @@ diff -Naur archive-orig/gettext-0.19/intl/Makefile.in archive/gettext-0.19/intl/ need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.19/m4/intl.m4 archive/gettext-0.19/m4/intl.m4 ---- archive-orig/gettext-0.19/m4/intl.m4 2014-06-02 03:26:35.000000000 +0400 -+++ archive/gettext-0.19/m4/intl.m4 2015-03-03 12:07:51.198400000 +0300 +diff -Nur archive-orig/gettext-0.19/m4/intl.m4 archive/gettext-0.19/m4/intl.m4 +--- archive-orig/gettext-0.19/m4/intl.m4 2014-06-02 01:26:35.000000000 +0200 ++++ archive/gettext-0.19/m4/intl.m4 2022-01-02 18:33:56.899632600 +0100 @@ -112,7 +112,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1339,9 +1339,9 @@ diff -Naur archive-orig/gettext-0.19/m4/intl.m4 archive/gettext-0.19/m4/intl.m4 *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.19.1/config.rpath archive/gettext-0.19.1/config.rpath ---- archive-orig/gettext-0.19.1/config.rpath 2014-06-10 09:55:08.000000000 +0400 -+++ archive/gettext-0.19.1/config.rpath 2015-03-03 12:08:33.458800000 +0300 +diff -Nur archive-orig/gettext-0.19.1/config.rpath archive/gettext-0.19.1/config.rpath +--- archive-orig/gettext-0.19.1/config.rpath 2014-06-10 07:55:08.000000000 +0200 ++++ archive/gettext-0.19.1/config.rpath 2022-01-02 18:33:56.901998800 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1387,9 +1387,9 @@ diff -Naur archive-orig/gettext-0.19.1/config.rpath archive/gettext-0.19.1/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.19.1/intl/Makefile.in archive/gettext-0.19.1/intl/Makefile.in ---- archive-orig/gettext-0.19.1/intl/Makefile.in 2014-06-10 09:55:00.000000000 +0400 -+++ archive/gettext-0.19.1/intl/Makefile.in 2015-03-03 12:08:49.916800000 +0300 +diff -Nur archive-orig/gettext-0.19.1/intl/Makefile.in archive/gettext-0.19.1/intl/Makefile.in +--- archive-orig/gettext-0.19.1/intl/Makefile.in 2014-06-10 07:55:00.000000000 +0200 ++++ archive/gettext-0.19.1/intl/Makefile.in 2022-01-02 18:33:56.903914200 +0100 @@ -418,7 +418,7 @@ case '@host_os@' in \ darwin[56]*) \ @@ -1408,9 +1408,9 @@ diff -Naur archive-orig/gettext-0.19.1/intl/Makefile.in archive/gettext-0.19.1/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.19.1/m4/intl.m4 archive/gettext-0.19.1/m4/intl.m4 ---- archive-orig/gettext-0.19.1/m4/intl.m4 2014-06-10 09:55:01.000000000 +0400 -+++ archive/gettext-0.19.1/m4/intl.m4 2015-03-03 12:09:41.693200000 +0300 +diff -Nur archive-orig/gettext-0.19.1/m4/intl.m4 archive/gettext-0.19.1/m4/intl.m4 +--- archive-orig/gettext-0.19.1/m4/intl.m4 2014-06-10 07:55:01.000000000 +0200 ++++ archive/gettext-0.19.1/m4/intl.m4 2022-01-02 18:33:56.904915100 +0100 @@ -112,7 +112,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1429,9 +1429,9 @@ diff -Naur archive-orig/gettext-0.19.1/m4/intl.m4 archive/gettext-0.19.1/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.19.2/config.rpath archive/gettext-0.19.2/config.rpath ---- archive-orig/gettext-0.19.2/config.rpath 2014-07-14 11:51:32.000000000 +0400 -+++ archive/gettext-0.19.2/config.rpath 2015-03-03 12:10:08.010400000 +0300 +diff -Nur archive-orig/gettext-0.19.2/config.rpath archive/gettext-0.19.2/config.rpath +--- archive-orig/gettext-0.19.2/config.rpath 2014-07-14 09:51:32.000000000 +0200 ++++ archive/gettext-0.19.2/config.rpath 2022-01-02 18:33:56.907272800 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1477,9 +1477,9 @@ diff -Naur archive-orig/gettext-0.19.2/config.rpath archive/gettext-0.19.2/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.19.2/intl/Makefile.in archive/gettext-0.19.2/intl/Makefile.in ---- archive-orig/gettext-0.19.2/intl/Makefile.in 2014-07-14 11:51:23.000000000 +0400 -+++ archive/gettext-0.19.2/intl/Makefile.in 2015-03-03 12:11:17.711200000 +0300 +diff -Nur archive-orig/gettext-0.19.2/intl/Makefile.in archive/gettext-0.19.2/intl/Makefile.in +--- archive-orig/gettext-0.19.2/intl/Makefile.in 2014-07-14 09:51:23.000000000 +0200 ++++ archive/gettext-0.19.2/intl/Makefile.in 2022-01-02 18:33:56.909137500 +0100 @@ -418,7 +418,7 @@ case '@host_os@' in \ darwin[56]*) \ @@ -1498,9 +1498,9 @@ diff -Naur archive-orig/gettext-0.19.2/intl/Makefile.in archive/gettext-0.19.2/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.19.2/m4/intl.m4 archive/gettext-0.19.2/m4/intl.m4 ---- archive-orig/gettext-0.19.2/m4/intl.m4 2014-07-14 11:51:24.000000000 +0400 -+++ archive/gettext-0.19.2/m4/intl.m4 2015-03-03 12:11:35.448400000 +0300 +diff -Nur archive-orig/gettext-0.19.2/m4/intl.m4 archive/gettext-0.19.2/m4/intl.m4 +--- archive-orig/gettext-0.19.2/m4/intl.m4 2014-07-14 09:51:24.000000000 +0200 ++++ archive/gettext-0.19.2/m4/intl.m4 2022-01-02 18:33:56.911139200 +0100 @@ -112,7 +112,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1519,9 +1519,21 @@ diff -Naur archive-orig/gettext-0.19.2/m4/intl.m4 archive/gettext-0.19.2/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.19.3/config.rpath archive/gettext-0.19.3/config.rpath ---- archive-orig/gettext-0.19.3/config.rpath 2014-10-16 10:09:16.000000000 +0400 -+++ archive/gettext-0.19.3/config.rpath 2015-03-03 12:12:10.720000000 +0300 +diff -Nur archive-orig/gettext-0.19.2/m4/threadlib.m4 archive/gettext-0.19.2/m4/threadlib.m4 +--- archive-orig/gettext-0.19.2/m4/threadlib.m4 2014-07-14 09:51:24.000000000 +0200 ++++ archive/gettext-0.19.2/m4/threadlib.m4 2022-01-02 18:34:56.313785700 +0100 +@@ -68,7 +68,7 @@ + dnl bugs that lead to endless loops or crashes. See + dnl . + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) gl_use_threads=yes ;; +diff -Nur archive-orig/gettext-0.19.3/config.rpath archive/gettext-0.19.3/config.rpath +--- archive-orig/gettext-0.19.3/config.rpath 2014-10-16 08:09:16.000000000 +0200 ++++ archive/gettext-0.19.3/config.rpath 2022-01-02 18:33:56.913140900 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1567,9 +1579,9 @@ diff -Naur archive-orig/gettext-0.19.3/config.rpath archive/gettext-0.19.3/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.19.3/intl/Makefile.in archive/gettext-0.19.3/intl/Makefile.in ---- archive-orig/gettext-0.19.3/intl/Makefile.in 2014-10-16 10:09:07.000000000 +0400 -+++ archive/gettext-0.19.3/intl/Makefile.in 2015-03-03 12:12:30.064000000 +0300 +diff -Nur archive-orig/gettext-0.19.3/intl/Makefile.in archive/gettext-0.19.3/intl/Makefile.in +--- archive-orig/gettext-0.19.3/intl/Makefile.in 2014-10-16 08:09:07.000000000 +0200 ++++ archive/gettext-0.19.3/intl/Makefile.in 2022-01-02 18:33:56.914141900 +0100 @@ -418,7 +418,7 @@ case '@host_os@' in \ darwin[56]*) \ @@ -1588,9 +1600,9 @@ diff -Naur archive-orig/gettext-0.19.3/intl/Makefile.in archive/gettext-0.19.3/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.19.3/m4/intl.m4 archive/gettext-0.19.3/m4/intl.m4 ---- archive-orig/gettext-0.19.3/m4/intl.m4 2014-10-16 10:09:09.000000000 +0400 -+++ archive/gettext-0.19.3/m4/intl.m4 2015-03-03 12:12:52.980400000 +0300 +diff -Nur archive-orig/gettext-0.19.3/m4/intl.m4 archive/gettext-0.19.3/m4/intl.m4 +--- archive-orig/gettext-0.19.3/m4/intl.m4 2014-10-16 08:09:09.000000000 +0200 ++++ archive/gettext-0.19.3/m4/intl.m4 2022-01-02 18:33:56.916380700 +0100 @@ -113,7 +113,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1609,9 +1621,9 @@ diff -Naur archive-orig/gettext-0.19.3/m4/intl.m4 archive/gettext-0.19.3/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.19.4/config.rpath archive/gettext-0.19.4/config.rpath ---- archive-orig/gettext-0.19.4/config.rpath 2014-12-24 10:34:53.000000000 +0300 -+++ archive/gettext-0.19.4/config.rpath 2015-03-03 12:13:20.405200000 +0300 +diff -Nur archive-orig/gettext-0.19.4/config.rpath archive/gettext-0.19.4/config.rpath +--- archive-orig/gettext-0.19.4/config.rpath 2014-12-24 08:34:53.000000000 +0100 ++++ archive/gettext-0.19.4/config.rpath 2022-01-02 18:33:56.918046000 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1657,9 +1669,9 @@ diff -Naur archive-orig/gettext-0.19.4/config.rpath archive/gettext-0.19.4/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.19.4/intl/Makefile.in archive/gettext-0.19.4/intl/Makefile.in ---- archive-orig/gettext-0.19.4/intl/Makefile.in 2014-12-24 10:34:43.000000000 +0300 -+++ archive/gettext-0.19.4/intl/Makefile.in 2015-03-03 12:13:53.695600000 +0300 +diff -Nur archive-orig/gettext-0.19.4/intl/Makefile.in archive/gettext-0.19.4/intl/Makefile.in +--- archive-orig/gettext-0.19.4/intl/Makefile.in 2014-12-24 08:34:43.000000000 +0100 ++++ archive/gettext-0.19.4/intl/Makefile.in 2022-01-02 18:33:56.919811600 +0100 @@ -429,7 +429,7 @@ case '@host_os@' in \ darwin[56]*) \ @@ -1678,9 +1690,9 @@ diff -Naur archive-orig/gettext-0.19.4/intl/Makefile.in archive/gettext-0.19.4/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.19.4/m4/intl.m4 archive/gettext-0.19.4/m4/intl.m4 ---- archive-orig/gettext-0.19.4/m4/intl.m4 2014-12-24 10:34:46.000000000 +0300 -+++ archive/gettext-0.19.4/m4/intl.m4 2015-03-03 12:14:11.432800000 +0300 +diff -Nur archive-orig/gettext-0.19.4/m4/intl.m4 archive/gettext-0.19.4/m4/intl.m4 +--- archive-orig/gettext-0.19.4/m4/intl.m4 2014-12-24 08:34:46.000000000 +0100 ++++ archive/gettext-0.19.4/m4/intl.m4 2022-01-02 18:33:56.921652200 +0100 @@ -113,7 +113,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1699,9 +1711,21 @@ diff -Naur archive-orig/gettext-0.19.4/m4/intl.m4 archive/gettext-0.19.4/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.19.5/config.rpath archive/gettext-0.19.5/config.rpath ---- archive-orig/gettext-0.19.5/config.rpath 2014-12-24 10:34:53.000000000 +0300 -+++ archive/gettext-0.19.5/config.rpath 2015-03-03 12:13:20.405200000 +0300 +diff -Nur archive-orig/gettext-0.19.4/m4/threadlib.m4 archive/gettext-0.19.4/m4/threadlib.m4 +--- archive-orig/gettext-0.19.4/m4/threadlib.m4 2014-12-24 08:34:46.000000000 +0100 ++++ archive/gettext-0.19.4/m4/threadlib.m4 2022-01-02 18:35:05.670611800 +0100 +@@ -68,7 +68,7 @@ + dnl bugs that lead to endless loops or crashes. See + dnl . + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) gl_use_threads=yes ;; +diff -Nur archive-orig/gettext-0.19.5/config.rpath archive/gettext-0.19.5/config.rpath +--- archive-orig/gettext-0.19.5/config.rpath 2015-07-10 08:54:22.000000000 +0200 ++++ archive/gettext-0.19.5/config.rpath 2022-01-02 18:33:56.923324900 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1747,10 +1771,10 @@ diff -Naur archive-orig/gettext-0.19.5/config.rpath archive/gettext-0.19.5/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.19.5/intl/Makefile.in archive/gettext-0.19.5/intl/Makefile.in ---- archive-orig/gettext-0.19.5/intl/Makefile.in 2014-12-24 10:34:43.000000000 +0300 -+++ archive/gettext-0.19.5/intl/Makefile.in 2015-03-03 12:13:53.695600000 +0300 -@@ -429,7 +429,7 @@ +diff -Nur archive-orig/gettext-0.19.5/intl/Makefile.in archive/gettext-0.19.5/intl/Makefile.in +--- archive-orig/gettext-0.19.5/intl/Makefile.in 2015-07-10 08:54:13.000000000 +0200 ++++ archive/gettext-0.19.5/intl/Makefile.in 2022-01-02 18:33:56.925326600 +0100 +@@ -430,7 +430,7 @@ case '@host_os@' in \ darwin[56]*) \ need_charset_alias=true ;; \ @@ -1759,7 +1783,7 @@ diff -Naur archive-orig/gettext-0.19.5/intl/Makefile.in archive/gettext-0.19.5/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -@@ -514,7 +514,7 @@ +@@ -515,7 +515,7 @@ case '@host_os@' in \ darwin[56]*) \ need_charset_alias=true ;; \ @@ -1768,9 +1792,9 @@ diff -Naur archive-orig/gettext-0.19.5/intl/Makefile.in archive/gettext-0.19.5/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.19.5/m4/intl.m4 archive/gettext-0.19.5/m4/intl.m4 ---- archive-orig/gettext-0.19.5/m4/intl.m4 2014-12-24 10:34:46.000000000 +0300 -+++ archive/gettext-0.19.5/m4/intl.m4 2015-03-03 12:14:11.432800000 +0300 +diff -Nur archive-orig/gettext-0.19.5/m4/intl.m4 archive/gettext-0.19.5/m4/intl.m4 +--- archive-orig/gettext-0.19.5/m4/intl.m4 2015-07-10 08:54:15.000000000 +0200 ++++ archive/gettext-0.19.5/m4/intl.m4 2022-01-02 18:33:56.926328100 +0100 @@ -113,7 +113,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1789,9 +1813,21 @@ diff -Naur archive-orig/gettext-0.19.5/m4/intl.m4 archive/gettext-0.19.5/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.19.6/config.rpath archive/gettext-0.19.6/config.rpath ---- archive-orig/gettext-0.19.6/config.rpath 2014-12-24 10:34:53.000000000 +0300 -+++ archive/gettext-0.19.6/config.rpath 2015-03-03 12:13:20.405200000 +0300 +diff -Nur archive-orig/gettext-0.19.5/m4/threadlib.m4 archive/gettext-0.19.5/m4/threadlib.m4 +--- archive-orig/gettext-0.19.5/m4/threadlib.m4 2015-07-10 08:54:15.000000000 +0200 ++++ archive/gettext-0.19.5/m4/threadlib.m4 2022-01-02 18:35:13.746994800 +0100 +@@ -68,7 +68,7 @@ + dnl bugs that lead to endless loops or crashes. See + dnl . + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) gl_use_threads=yes ;; +diff -Nur archive-orig/gettext-0.19.6/config.rpath archive/gettext-0.19.6/config.rpath +--- archive-orig/gettext-0.19.6/config.rpath 2015-09-11 05:14:04.000000000 +0200 ++++ archive/gettext-0.19.6/config.rpath 2022-01-02 18:33:56.928329500 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1837,10 +1873,10 @@ diff -Naur archive-orig/gettext-0.19.6/config.rpath archive/gettext-0.19.6/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.19.6/intl/Makefile.in archive/gettext-0.19.6/intl/Makefile.in ---- archive-orig/gettext-0.19.6/intl/Makefile.in 2014-12-24 10:34:43.000000000 +0300 -+++ archive/gettext-0.19.6/intl/Makefile.in 2015-03-03 12:13:53.695600000 +0300 -@@ -429,7 +429,7 @@ +diff -Nur archive-orig/gettext-0.19.6/intl/Makefile.in archive/gettext-0.19.6/intl/Makefile.in +--- archive-orig/gettext-0.19.6/intl/Makefile.in 2015-09-11 05:13:55.000000000 +0200 ++++ archive/gettext-0.19.6/intl/Makefile.in 2022-01-02 18:33:56.930331500 +0100 +@@ -430,7 +430,7 @@ case '@host_os@' in \ darwin[56]*) \ need_charset_alias=true ;; \ @@ -1849,7 +1885,7 @@ diff -Naur archive-orig/gettext-0.19.6/intl/Makefile.in archive/gettext-0.19.6/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -@@ -514,7 +514,7 @@ +@@ -515,7 +515,7 @@ case '@host_os@' in \ darwin[56]*) \ need_charset_alias=true ;; \ @@ -1858,9 +1894,9 @@ diff -Naur archive-orig/gettext-0.19.6/intl/Makefile.in archive/gettext-0.19.6/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.19.6/m4/intl.m4 archive/gettext-0.19.6/m4/intl.m4 ---- archive-orig/gettext-0.19.6/m4/intl.m4 2014-12-24 10:34:46.000000000 +0300 -+++ archive/gettext-0.19.6/m4/intl.m4 2015-03-03 12:14:11.432800000 +0300 +diff -Nur archive-orig/gettext-0.19.6/m4/intl.m4 archive/gettext-0.19.6/m4/intl.m4 +--- archive-orig/gettext-0.19.6/m4/intl.m4 2015-09-11 05:13:57.000000000 +0200 ++++ archive/gettext-0.19.6/m4/intl.m4 2022-01-02 18:33:56.932639500 +0100 @@ -113,7 +113,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1879,9 +1915,21 @@ diff -Naur archive-orig/gettext-0.19.6/m4/intl.m4 archive/gettext-0.19.6/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 -diff -Naur archive-orig/gettext-0.19.7/config.rpath archive/gettext-0.19.7/config.rpath ---- archive-orig/gettext-0.19.7/config.rpath 2014-12-24 10:34:53.000000000 +0300 -+++ archive/gettext-0.19.7/config.rpath 2015-03-03 12:13:20.405200000 +0300 +diff -Nur archive-orig/gettext-0.19.6/m4/threadlib.m4 archive/gettext-0.19.6/m4/threadlib.m4 +--- archive-orig/gettext-0.19.6/m4/threadlib.m4 2015-09-11 05:13:57.000000000 +0200 ++++ archive/gettext-0.19.6/m4/threadlib.m4 2022-01-02 18:34:24.443693000 +0100 +@@ -68,7 +68,7 @@ + dnl bugs that lead to endless loops or crashes. See + dnl . + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) gl_use_threads=yes ;; +diff -Nur archive-orig/gettext-0.19.7/config.rpath archive/gettext-0.19.7/config.rpath +--- archive-orig/gettext-0.19.7/config.rpath 2015-12-28 01:05:49.000000000 +0100 ++++ archive/gettext-0.19.7/config.rpath 2022-01-02 18:33:56.934418100 +0100 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' @@ -1927,10 +1975,10 @@ diff -Naur archive-orig/gettext-0.19.7/config.rpath archive/gettext-0.19.7/confi shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; -diff -Naur archive-orig/gettext-0.19.7/intl/Makefile.in archive/gettext-0.19.7/intl/Makefile.in ---- archive-orig/gettext-0.19.7/intl/Makefile.in 2014-12-24 10:34:43.000000000 +0300 -+++ archive/gettext-0.19.7/intl/Makefile.in 2015-03-03 12:13:53.695600000 +0300 -@@ -429,7 +429,7 @@ +diff -Nur archive-orig/gettext-0.19.7/intl/Makefile.in archive/gettext-0.19.7/intl/Makefile.in +--- archive-orig/gettext-0.19.7/intl/Makefile.in 2015-12-28 01:05:40.000000000 +0100 ++++ archive/gettext-0.19.7/intl/Makefile.in 2022-01-02 18:33:56.936420300 +0100 +@@ -430,7 +430,7 @@ case '@host_os@' in \ darwin[56]*) \ need_charset_alias=true ;; \ @@ -1939,7 +1987,7 @@ diff -Naur archive-orig/gettext-0.19.7/intl/Makefile.in archive/gettext-0.19.7/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -@@ -514,7 +514,7 @@ +@@ -515,7 +515,7 @@ case '@host_os@' in \ darwin[56]*) \ need_charset_alias=true ;; \ @@ -1948,9 +1996,9 @@ diff -Naur archive-orig/gettext-0.19.7/intl/Makefile.in archive/gettext-0.19.7/i need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ -diff -Naur archive-orig/gettext-0.19.7/m4/intl.m4 archive/gettext-0.19.7/m4/intl.m4 ---- archive-orig/gettext-0.19.7/m4/intl.m4 2014-12-24 10:34:46.000000000 +0300 -+++ archive/gettext-0.19.7/m4/intl.m4 2015-03-03 12:14:11.432800000 +0300 +diff -Nur archive-orig/gettext-0.19.7/m4/intl.m4 archive/gettext-0.19.7/m4/intl.m4 +--- archive-orig/gettext-0.19.7/m4/intl.m4 2015-12-28 01:05:42.000000000 +0100 ++++ archive/gettext-0.19.7/m4/intl.m4 2022-01-02 18:33:56.938029200 +0100 @@ -113,7 +113,7 @@ dnl exported variables _also_ in the static library. if test "$enable_shared" = yes; then @@ -1969,3 +2017,231 @@ diff -Naur archive-orig/gettext-0.19.7/m4/intl.m4 archive/gettext-0.19.7/m4/intl *) is_woe32=no ;; esac WOE32=$is_woe32 +diff -Nur archive-orig/gettext-0.19.7/m4/threadlib.m4 archive/gettext-0.19.7/m4/threadlib.m4 +--- archive-orig/gettext-0.19.7/m4/threadlib.m4 2015-12-28 01:05:42.000000000 +0100 ++++ archive/gettext-0.19.7/m4/threadlib.m4 2022-01-02 18:35:33.417747100 +0100 +@@ -68,7 +68,7 @@ + dnl bugs that lead to endless loops or crashes. See + dnl . + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) gl_use_threads=yes ;; +diff -Nur archive-orig/gettext-0.19.8/config.rpath archive/gettext-0.19.8/config.rpath +--- archive-orig/gettext-0.19.8/config.rpath 2016-06-09 08:59:09.000000000 +0200 ++++ archive/gettext-0.19.8/config.rpath 2022-01-02 18:38:02.088771500 +0100 +@@ -149,7 +149,7 @@ + hardcode_minus_L=no + + case "$host_os" in +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -198,7 +198,7 @@ + ld_shlibs=no + fi + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' +@@ -348,7 +348,7 @@ + ;; + bsdi[45]*) + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is +@@ -533,7 +533,7 @@ + bsdi[45]*) + library_names_spec='$libname$shrext' + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' + ;; +diff -Nur archive-orig/gettext-0.19.8/intl/Makefile.in archive/gettext-0.19.8/intl/Makefile.in +--- archive-orig/gettext-0.19.8/intl/Makefile.in 2016-06-09 08:59:00.000000000 +0200 ++++ archive/gettext-0.19.8/intl/Makefile.in 2022-01-02 18:38:12.841559300 +0100 +@@ -429,7 +429,7 @@ + case '@host_os@' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +@@ -514,7 +514,7 @@ + case '@host_os@' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +diff -Nur archive-orig/gettext-0.19.8/m4/threadlib.m4 archive/gettext-0.19.8/m4/threadlib.m4 +--- archive-orig/gettext-0.19.8/m4/threadlib.m4 2016-06-09 08:59:01.000000000 +0200 ++++ archive/gettext-0.19.8/m4/threadlib.m4 2022-01-02 18:35:38.488431800 +0100 +@@ -68,7 +68,7 @@ + dnl bugs that lead to endless loops or crashes. See + dnl . + osf*) gl_use_threads=no ;; +- cygwin*) ++ cygwin* | msys*) + case `uname -r` in + 1.[0-5].*) gl_use_threads=no ;; + *) gl_use_threads=yes ;; +diff -Nur archive-orig/gettext-0.20/config.rpath archive/gettext-0.20/config.rpath +--- archive-orig/gettext-0.20/config.rpath 2019-05-08 21:23:52.000000000 +0200 ++++ archive/gettext-0.20/config.rpath 2022-01-02 18:36:15.913869300 +0100 +@@ -57,7 +57,7 @@ + aix*) + wl='-Wl,' + ;; +- mingw* | cygwin* | pw32* | os2* | cegcc*) ++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) + ;; + hpux9* | hpux10* | hpux11*) + wl='-Wl,' +@@ -149,7 +149,7 @@ + hardcode_minus_L=no + + case "$host_os" in +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -198,7 +198,7 @@ + ld_shlibs=no + fi + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' +@@ -348,7 +348,7 @@ + ;; + bsdi[45]*) + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is +@@ -533,7 +533,7 @@ + bsdi[45]*) + library_names_spec='$libname$shrext' + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' + ;; +diff -Nur archive-orig/gettext-0.20.2/config.rpath archive/gettext-0.20.2/config.rpath +--- archive-orig/gettext-0.20.2/config.rpath 2020-04-13 16:48:13.000000000 +0200 ++++ archive/gettext-0.20.2/config.rpath 2022-01-02 18:36:36.745376100 +0100 +@@ -57,7 +57,7 @@ + aix*) + wl='-Wl,' + ;; +- mingw* | cygwin* | pw32* | os2* | cegcc*) ++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) + ;; + hpux9* | hpux10* | hpux11*) + wl='-Wl,' +@@ -149,7 +149,7 @@ + hardcode_minus_L=no + + case "$host_os" in +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -198,7 +198,7 @@ + ld_shlibs=no + fi + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' +@@ -348,7 +348,7 @@ + ;; + bsdi[45]*) + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is +@@ -533,7 +533,7 @@ + bsdi[45]*) + library_names_spec='$libname$shrext' + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' + ;; +diff -Nur archive-orig/gettext-0.21/config.rpath archive/gettext-0.21/config.rpath +--- archive-orig/gettext-0.21/config.rpath 2020-07-26 23:52:12.000000000 +0200 ++++ archive/gettext-0.21/config.rpath 2022-01-02 18:37:19.582943400 +0100 +@@ -57,7 +57,7 @@ + aix*) + wl='-Wl,' + ;; +- mingw* | cygwin* | pw32* | os2* | cegcc*) ++ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) + ;; + hpux9* | hpux10* | hpux11*) + wl='-Wl,' +@@ -149,7 +149,7 @@ + hardcode_minus_L=no + + case "$host_os" in +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. +@@ -198,7 +198,7 @@ + ld_shlibs=no + fi + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' +@@ -348,7 +348,7 @@ + ;; + bsdi[45]*) + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is +@@ -533,7 +533,7 @@ + bsdi[45]*) + library_names_spec='$libname$shrext' + ;; +- cygwin* | mingw* | pw32* | cegcc*) ++ cygwin* | msys* | mingw* | pw32* | cegcc*) + shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' + ;; diff --git a/gettext/0.19.8.1-cygwin-ftm.patch b/gettext/gettext-0.19.8.1-cygwin-ftm.patch similarity index 100% rename from gettext/0.19.8.1-cygwin-ftm.patch rename to gettext/gettext-0.19.8.1-cygwin-ftm.patch diff --git a/gettext/gettext-0.19.8.1-have_wprintf.patch b/gettext/gettext-0.19.8.1-have_wprintf.patch new file mode 100644 index 00000000..75efe51a --- /dev/null +++ b/gettext/gettext-0.19.8.1-have_wprintf.patch @@ -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 diff --git a/gettext/gettext-0.19.8.1-msys2.patch b/gettext/gettext-0.19.8.1-msys2.patch index 6ccc1fed..35c14b3f 100644 --- a/gettext/gettext-0.19.8.1-msys2.patch +++ b/gettext/gettext-0.19.8.1-msys2.patch @@ -20,14 +20,12 @@ index 42fac95..9ab0952 100644 *) is_woe32=no ;; esac 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 -index b43534e..bc7a2a8 100644 ---- gettext-0.19.8.1.orig/gettext-runtime/m4/threadlib.m4 -+++ gettext-0.19.8.1/gettext-runtime/m4/threadlib.m4 -@@ -68,7 +68,7 @@ changequote(,)dnl +--- 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 bugs that lead to endless loops or crashes. See - dnl . - osf*) gl_use_threads=no ;; + dnl . - cygwin*) + cygwin* | msys*) case `uname -r` in diff --git a/gettext/0.19.8.1-no-woe32dll.patch b/gettext/gettext-0.19.8.1-no-woe32dll.patch similarity index 100% rename from gettext/0.19.8.1-no-woe32dll.patch rename to gettext/gettext-0.19.8.1-no-woe32dll.patch diff --git a/gettext/gettext-0.21-disable-libtextstyle.patch b/gettext/gettext-0.21-disable-libtextstyle.patch new file mode 100644 index 00000000..66271ad6 --- /dev/null +++ b/gettext/gettext-0.21-disable-libtextstyle.patch @@ -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. diff --git a/gettext/0.19.8.1-localename.patch b/gettext/gettext-localename.patch similarity index 61% rename from gettext/0.19.8.1-localename.patch rename to gettext/gettext-localename.patch index 69d8dc0f..88b0b66b 100644 --- a/gettext/0.19.8.1-localename.patch +++ b/gettext/gettext-localename.patch @@ -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 -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); +--- 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 @@ -11,7 +9,7 @@ index e67bd01..4d3665f 100644 # define WIN32_LEAN_AND_MEAN # include # include -@@ -1418,7 +1418,7 @@ gl_locale_name_canonicalize (char *name) +@@ -1463,7 +1463,7 @@ gl_locale_name_canonicalize (char *name) #endif @@ -20,7 +18,7 @@ index e67bd01..4d3665f 100644 /* 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) +@@ -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 @@ -32,16 +30,16 @@ index e67bd01..4d3665f 100644 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. */ --#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__) -+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE) +-#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. */ -@@ -2933,7 +2928,7 @@ gl_locale_name_default (void) +@@ -3429,7 +3424,7 @@ gl_locale_name_default (void) # endif @@ -50,20 +48,18 @@ index e67bd01..4d3665f 100644 { 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); +--- 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 */ ++#if defined WINDOWS_NATIVE_ /* Native Windows */ # define WIN32_LEAN_AND_MEAN # include # include -@@ -1418,7 +1418,7 @@ gl_locale_name_canonicalize (char *name) +@@ -1463,7 +1463,7 @@ gl_locale_name_canonicalize (char *name) #endif @@ -72,7 +68,7 @@ index 81ab213..fa29d38 100644 /* 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) +@@ -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). */ @@ -81,7 +77,7 @@ index 81ab213..fa29d38 100644 # define HAVE_LOCALE_NULL #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. */ if (strcmp (retval, "UTF-8") != 0) #endif @@ -93,16 +89,16 @@ index 81ab213..fa29d38 100644 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. */ --#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__) -+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE) +-#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. */ -@@ -2933,7 +2928,7 @@ gl_locale_name_default (void) +@@ -3429,7 +3424,7 @@ gl_locale_name_default (void) # endif @@ -111,20 +107,18 @@ index 81ab213..fa29d38 100644 { 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); +--- 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 */ ++#if defined WINDOWS_NATIVE_ /* Native Windows */ # define WIN32_LEAN_AND_MEAN # include # include -@@ -1418,7 +1418,7 @@ gl_locale_name_canonicalize (char *name) +@@ -1463,7 +1463,7 @@ gl_locale_name_canonicalize (char *name) #endif @@ -133,7 +127,7 @@ index e67bd01..226ce6e 100644 /* 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) +@@ -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). */ @@ -142,7 +136,7 @@ index e67bd01..226ce6e 100644 # define HAVE_LOCALE_NULL #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. */ if (strcmp (retval, "UTF-8") != 0) #endif @@ -154,16 +148,16 @@ index e67bd01..226ce6e 100644 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. */ --#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__) -+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE) +-#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. */ -@@ -2933,7 +2928,7 @@ gl_locale_name_default (void) +@@ -3429,7 +3424,7 @@ gl_locale_name_default (void) # endif diff --git a/gettext/gettext-tests-cygwin.patch b/gettext/gettext-tests-cygwin.patch new file mode 100644 index 00000000..74301334 --- /dev/null +++ b/gettext/gettext-tests-cygwin.patch @@ -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 < plural-2.data + ja +@@ -44,7 +44,7 @@ EOF + while read lang; do + read formula + read dataok +- cat > plural-2-ll.po < plural-2-es.po < dataout + test "$dataok" = `cat dataout` || { + echo "Formula evaluation error for language $lang" 1>&2 diff --git a/gettext/gnulib-cygwin-weak-bug.patch b/gettext/gnulib-cygwin-weak-bug.patch index 7c8336f5..92d1994b 100644 --- a/gettext/gnulib-cygwin-weak-bug.patch +++ b/gettext/gnulib-cygwin-weak-bug.patch @@ -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/m4/threadlib.m4 2021-12-29 09:13:14.284107200 +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/gnulib-m4/threadlib.m4 2021-12-29 09:13:14.284107200 +0100 @@ -133,6 +133,9 @@ #pragma weak fputs int main () @@ -10,3 +10,15 @@ return (fputs == NULL); }]])], [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],