summaryrefslogtreecommitdiff
path: root/packages/gettext
diff options
context:
space:
mode:
Diffstat (limited to 'packages/gettext')
-rw-r--r--packages/gettext/0.19.7/version.desc1
-rw-r--r--packages/gettext/0.19.8.1/version.desc1
-rw-r--r--packages/gettext/0.20.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch26
-rw-r--r--packages/gettext/0.20.1/0001-pthread_sigmask.c-mingw.patch356
-rw-r--r--packages/gettext/0.20.1/chksum8
-rw-r--r--packages/gettext/0.20.1/version.desc0
-rw-r--r--packages/gettext/package.desc2
7 files changed, 393 insertions, 1 deletions
diff --git a/packages/gettext/0.19.7/version.desc b/packages/gettext/0.19.7/version.desc
index fcfe389..1945106 100644
--- a/packages/gettext/0.19.7/version.desc
+++ b/packages/gettext/0.19.7/version.desc
@@ -1 +1,2 @@
obsolete='yes'
+archive_formats='.tar.xz .tar.lz .tar.gz'
diff --git a/packages/gettext/0.19.8.1/version.desc b/packages/gettext/0.19.8.1/version.desc
index e69de29..9f75f6b 100644
--- a/packages/gettext/0.19.8.1/version.desc
+++ b/packages/gettext/0.19.8.1/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.xz .tar.lz .tar.gz'
diff --git a/packages/gettext/0.20.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch b/packages/gettext/0.20.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch
new file mode 100644
index 0000000..5e63290
--- /dev/null
+++ b/packages/gettext/0.20.1/0000-Fix-linker-error-redefinition-of-vasprintf.patch
@@ -0,0 +1,26 @@
+From a76649dae62768d0af7017b3fc0ca5f891588c78 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Wed, 29 Feb 2012 10:44:43 +0100
+Subject: [PATCH] Fix linker error: redefinition of vasprintf
+
+This might not be the best patch, but it works for us
+The link error was:
+.libs/autosprintf.o:autosprintf.cc:(.text$vasprintf[_vasprintf]+0x0): multiple definition of `_vasprintf'
+.libs/lib-asprintf.o:lib-asprintf.c:(.text+0x4621): first defined here
+---
+ gettext-runtime/libasprintf/autosprintf.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/gettext-runtime/libasprintf/autosprintf.cc
++++ b/gettext-runtime/libasprintf/autosprintf.cc
+@@ -19,8 +19,10 @@
+ This must come before <config.h> because <config.h> may include
+ <features.h>, and once <features.h> has been included, it's too late. */
+ #ifndef _GNU_SOURCE
++#ifndef _WIN32
+ # define _GNU_SOURCE 1
+ #endif
++#endif
+
+ /* Specification. */
+ #include "autosprintf.h"
diff --git a/packages/gettext/0.20.1/0001-pthread_sigmask.c-mingw.patch b/packages/gettext/0.20.1/0001-pthread_sigmask.c-mingw.patch
new file mode 100644
index 0000000..c3879d5
--- /dev/null
+++ b/packages/gettext/0.20.1/0001-pthread_sigmask.c-mingw.patch
@@ -0,0 +1,356 @@
+commit 64e905db05c32792c3f0e77ce271f65e77980a92
+Author: Bruno Haible <bruno@clisp.org>
+Date: Sat May 18 14:36:33 2019 +0200
+
+ pthread_sigmask: Fix compilation error with --enable-threads=windows.
+
+ Reported by Tim Rühsen in
+ <https://lists.gnu.org/archive/html/bug-gnulib/2018-01/msg00018.html>
+ and Michele Locati in
+ <https://lists.gnu.org/archive/html/bug-gettext/2019-04/msg00057.html>.
+
+ * m4/pthread_sigmask.m4 (gl_FUNC_PTHREAD_SIGMASK): Revert change from
+ 2015-06-01. Test whether pthread_sigmask is a macro, regardless of
+ $LIBMULTITHREAD. Consider it regardless whether module 'threadlib' is
+ in use and regardless which threads API is chosen.
+
+[Dropped ChangeLog; adjusted the paths to apply to gettext; regenerate.]
+
+---
+ gettext-tools/configure | 105 ++++++++++-----------
+ gettext-tools/gnulib-m4/pthread_sigmask.m4 | 140 ++++++++++++++---------------
+ 2 files changed, 118 insertions(+), 127 deletions(-)
+
+--- a/gettext-tools/gnulib-m4/pthread_sigmask.m4
++++ b/gettext-tools/gnulib-m4/pthread_sigmask.m4
+@@ -1,4 +1,4 @@
+-# pthread_sigmask.m4 serial 16
++# pthread_sigmask.m4 serial 17
+ dnl Copyright (C) 2011-2019 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+@@ -9,103 +9,101 @@
+ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
+
+ AC_CHECK_FUNCS_ONCE([pthread_sigmask])
++
++ dnl On MinGW pthread_sigmask is just a macro which always returns 0.
++ dnl It does not exist as a real function, which is required by POSIX.
++ AC_CACHE_CHECK([whether pthread_sigmask is a macro],
++ [gl_cv_func_pthread_sigmask_macro],
++ [AC_EGREP_CPP([headers_define_pthread_sigmask], [
++#include <pthread.h>
++#include <signal.h>
++#ifdef pthread_sigmask
++ headers_define_pthread_sigmask
++#endif],
++ [gl_cv_func_pthread_sigmask_macro=yes],
++ [gl_cv_func_pthread_sigmask_macro=no])
++ ])
++
+ LIB_PTHREAD_SIGMASK=
+
+- dnl Test whether the gnulib module 'threadlib' is in use.
+- dnl Some packages like Emacs use --avoid=threadlib.
+- dnl Write the symbol in such a way that it does not cause 'aclocal' to pick
+- dnl the threadlib.m4 file that is installed in $PREFIX/share/aclocal/.
+- m4_ifdef([gl_][THREADLIB], [
+- AC_REQUIRE([gl_][THREADLIB])
++ if test $gl_cv_func_pthread_sigmask_macro = yes; then
++ dnl pthread_sigmask is a dummy macro.
++ HAVE_PTHREAD_SIGMASK=0
++ dnl Make sure to '#undef pthread_sigmask' before defining it.
++ REPLACE_PTHREAD_SIGMASK=1
++ else
++ dnl Test whether the gnulib module 'threadlib' is in use.
++ dnl Some packages like Emacs use --avoid=threadlib.
++ dnl Write the symbol in such a way that it does not cause 'aclocal' to pick
++ dnl the threadlib.m4 file that is installed in $PREFIX/share/aclocal/.
++ m4_ifdef([gl_][THREADLIB], [
++ AC_REQUIRE([gl_][THREADLIB])
+
+- if test "$gl_threads_api" = posix; then
+- if test $ac_cv_func_pthread_sigmask = yes; then
+- dnl pthread_sigmask is available without -lpthread.
+- :
+- else
+- if test -n "$LIBMULTITHREAD"; then
+- AC_CACHE_CHECK([for pthread_sigmask in $LIBMULTITHREAD],
+- [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD],
+- [gl_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIBMULTITHREAD"
+- AC_LINK_IFELSE(
+- [AC_LANG_PROGRAM(
+- [[#include <pthread.h>
+- #include <signal.h>
+- ]],
+- [[return pthread_sigmask (0, (sigset_t *) 0, (sigset_t *) 0);]])
+- ],
+- [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes],
+- [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no])
+- LIBS="$gl_save_LIBS"
+- ])
+- if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
+- AC_CACHE_CHECK([whether pthread_sigmask is only a macro],
+- [gl_cv_func_pthread_sigmask_is_macro],
++ if test "$gl_threads_api" = posix; then
++ if test $ac_cv_func_pthread_sigmask = yes; then
++ dnl pthread_sigmask is available without -lpthread.
++ :
++ else
++ if test -n "$LIBMULTITHREAD"; then
++ AC_CACHE_CHECK([for pthread_sigmask in $LIBMULTITHREAD],
++ [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD],
+ [gl_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBMULTITHREAD"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>
+ #include <signal.h>
+- #undef pthread_sigmask
+ ]],
+ [[return pthread_sigmask (0, (sigset_t *) 0, (sigset_t *) 0);]])
+ ],
+- [gl_cv_func_pthread_sigmask_is_macro=no],
+- [gl_cv_func_pthread_sigmask_is_macro=yes])
++ [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes],
++ [gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no])
+ LIBS="$gl_save_LIBS"
+ ])
+- if test $gl_cv_func_pthread_sigmask_is_macro = yes; then
+- dnl On MinGW pthread_sigmask is just a macro which always returns 0.
+- dnl It does not exist as a real function, which is required by POSIX.
+- REPLACE_PTHREAD_SIGMASK=1
+- gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no
++ if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
++ dnl pthread_sigmask is available with -pthread or -lpthread.
++ LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD"
++ else
++ dnl pthread_sigmask is not available at all.
++ HAVE_PTHREAD_SIGMASK=0
+ fi
+- fi
+- if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
+- dnl pthread_sigmask is available with -pthread or -lpthread.
+- LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD"
+ else
+ dnl pthread_sigmask is not available at all.
+ HAVE_PTHREAD_SIGMASK=0
+ fi
++ fi
++ else
++ dnl pthread_sigmask may exist but does not interoperate with the chosen
++ dnl multithreading facility.
++ dnl If "$gl_threads_api" = pth, we could use the function pth_sigmask,
++ dnl but it is equivalent to sigprocmask, so we choose to emulate
++ dnl pthread_sigmask with sigprocmask also in this case. This yields
++ dnl fewer link dependencies.
++ if test $ac_cv_func_pthread_sigmask = yes; then
++ REPLACE_PTHREAD_SIGMASK=1
+ else
+- dnl pthread_sigmask is not available at all.
+ HAVE_PTHREAD_SIGMASK=0
+ fi
+ fi
+- else
+- dnl pthread_sigmask may exist but does not interoperate with the chosen
+- dnl multithreading facility.
+- dnl If "$gl_threads_api" = pth, we could use the function pth_sigmask,
+- dnl but it is equivalent to sigprocmask, so we choose to emulate
+- dnl pthread_sigmask with sigprocmask also in this case. This yields fewer
+- dnl link dependencies.
++ ], [
++ dnl The module 'threadlib' is not in use, due to --avoid=threadlib being
++ dnl specified.
++ dnl The package either has prepared CPPFLAGS and LIBS for use of
++ dnl POSIX:2008 threads, or wants to build single-threaded programs.
+ if test $ac_cv_func_pthread_sigmask = yes; then
+- REPLACE_PTHREAD_SIGMASK=1
++ dnl pthread_sigmask exists and does not require extra libraries.
++ dnl Assume that it is declared.
++ :
+ else
++ dnl pthread_sigmask either does not exist or needs extra libraries.
+ HAVE_PTHREAD_SIGMASK=0
++ dnl Define the symbol rpl_pthread_sigmask, not pthread_sigmask,
++ dnl so as to not accidentally override the system's pthread_sigmask
++ dnl symbol from libpthread. This is necessary on IRIX 6.5.
++ REPLACE_PTHREAD_SIGMASK=1
+ fi
+- fi
+- ], [
+- dnl The module 'threadlib' is not in use, due to --avoid=threadlib being
+- dnl specified.
+- dnl The package either has prepared CPPFLAGS and LIBS for use of POSIX:2008
+- dnl threads, or wants to build single-threaded programs.
+- if test $ac_cv_func_pthread_sigmask = yes; then
+- dnl pthread_sigmask exists and does not require extra libraries.
+- dnl Assume that it is declared.
+- :
+- else
+- dnl pthread_sigmask either does not exist or needs extra libraries.
+- HAVE_PTHREAD_SIGMASK=0
+- dnl Define the symbol rpl_pthread_sigmask, not pthread_sigmask,
+- dnl so as to not accidentally override the system's pthread_sigmask
+- dnl symbol from libpthread. This is necessary on IRIX 6.5.
+- REPLACE_PTHREAD_SIGMASK=1
+- fi
+- ])
++ ])
++ fi
+
+ AC_SUBST([LIB_PTHREAD_SIGMASK])
+ dnl We don't need a variable LTLIB_PTHREAD_SIGMASK, because when
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -61291,53 +61291,51 @@
+
+
+
+- LIB_PTHREAD_SIGMASK=
+-
+-
+
+-
+- if test "$gl_threads_api" = posix; then
+- if test $ac_cv_func_pthread_sigmask = yes; then
+- :
+- else
+- if test -n "$LIBMULTITHREAD"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_sigmask in $LIBMULTITHREAD" >&5
+-$as_echo_n "checking for pthread_sigmask in $LIBMULTITHREAD... " >&6; }
+-if ${gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD+:} false; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_sigmask is a macro" >&5
++$as_echo_n "checking whether pthread_sigmask is a macro... " >&6; }
++if ${gl_cv_func_pthread_sigmask_macro+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+- gl_save_LIBS="$LIBS"
+- LIBS="$LIBS $LIBMULTITHREAD"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#include <pthread.h>
+- #include <signal.h>
+-
+-int
+-main ()
+-{
+-return pthread_sigmask (0, (sigset_t *) 0, (sigset_t *) 0);
+- ;
+- return 0;
+-}
+
++#include <pthread.h>
++#include <signal.h>
++#ifdef pthread_sigmask
++ headers_define_pthread_sigmask
++#endif
+ _ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "headers_define_pthread_sigmask" >/dev/null 2>&1; then :
++ gl_cv_func_pthread_sigmask_macro=yes
+ else
+- gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no
++ gl_cv_func_pthread_sigmask_macro=no
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- LIBS="$gl_save_LIBS"
++rm -f conftest*
++
+
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&5
+-$as_echo "$gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&6; }
+- if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_sigmask is only a macro" >&5
+-$as_echo_n "checking whether pthread_sigmask is only a macro... " >&6; }
+-if ${gl_cv_func_pthread_sigmask_is_macro+:} false; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_macro" >&5
++$as_echo "$gl_cv_func_pthread_sigmask_macro" >&6; }
++
++ LIB_PTHREAD_SIGMASK=
++
++ if test $gl_cv_func_pthread_sigmask_macro = yes; then
++ HAVE_PTHREAD_SIGMASK=0
++ REPLACE_PTHREAD_SIGMASK=1
++ else
++
++
++
++ if test "$gl_threads_api" = posix; then
++ if test $ac_cv_func_pthread_sigmask = yes; then
++ :
++ else
++ if test -n "$LIBMULTITHREAD"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_sigmask in $LIBMULTITHREAD" >&5
++$as_echo_n "checking for pthread_sigmask in $LIBMULTITHREAD... " >&6; }
++if ${gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ gl_save_LIBS="$LIBS"
+@@ -61346,7 +61344,6 @@
+ /* end confdefs.h. */
+ #include <pthread.h>
+ #include <signal.h>
+- #undef pthread_sigmask
+
+ int
+ main ()
+@@ -61358,39 +61355,35 @@
+
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- gl_cv_func_pthread_sigmask_is_macro=no
++ gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes
+ else
+- gl_cv_func_pthread_sigmask_is_macro=yes
++ gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$gl_save_LIBS"
+
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_is_macro" >&5
+-$as_echo "$gl_cv_func_pthread_sigmask_is_macro" >&6; }
+- if test $gl_cv_func_pthread_sigmask_is_macro = yes; then
+- REPLACE_PTHREAD_SIGMASK=1
+- gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&5
++$as_echo "$gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&6; }
++ if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
++ LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD"
++ else
++ HAVE_PTHREAD_SIGMASK=0
+ fi
+- fi
+- if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
+- LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD"
+ else
+ HAVE_PTHREAD_SIGMASK=0
+ fi
+- else
+- HAVE_PTHREAD_SIGMASK=0
+ fi
+- fi
+- else
+- if test $ac_cv_func_pthread_sigmask = yes; then
+- REPLACE_PTHREAD_SIGMASK=1
+ else
+- HAVE_PTHREAD_SIGMASK=0
++ if test $ac_cv_func_pthread_sigmask = yes; then
++ REPLACE_PTHREAD_SIGMASK=1
++ else
++ HAVE_PTHREAD_SIGMASK=0
++ fi
+ fi
+- fi
+
++ fi
+
+
+
diff --git a/packages/gettext/0.20.1/chksum b/packages/gettext/0.20.1/chksum
new file mode 100644
index 0000000..608e188
--- /dev/null
+++ b/packages/gettext/0.20.1/chksum
@@ -0,0 +1,8 @@
+md5 gettext-0.20.1.tar.xz 9ed9e26ab613b668e0026222a9c23639
+sha1 gettext-0.20.1.tar.xz 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90
+sha256 gettext-0.20.1.tar.xz 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800
+sha512 gettext-0.20.1.tar.xz 82ffa5a28068272d0587262f8d9269f9629c601da5d122b6645c9c4cf98bfe4149df01bb58522ccf8fe25b931672e18551d7fb34de1cbf6a0463a87f9f8ee221
+md5 gettext-0.20.1.tar.gz bb5b0c0caa028105f3ca1905ddc306e2
+sha1 gettext-0.20.1.tar.gz 2aa01db95b064d7f5d1a46de34a2cc6a57eadf36
+sha256 gettext-0.20.1.tar.gz 66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c
+sha512 gettext-0.20.1.tar.gz af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
diff --git a/packages/gettext/0.20.1/version.desc b/packages/gettext/0.20.1/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/gettext/0.20.1/version.desc
diff --git a/packages/gettext/package.desc b/packages/gettext/package.desc
index 8805ae2..99d493f 100644
--- a/packages/gettext/package.desc
+++ b/packages/gettext/package.desc
@@ -3,5 +3,5 @@ repository='git https://git.savannah.gnu.org/git/gettext.git'
# a separate package and depend on it in case of devel builds?
bootstrap='./autogen.sh'
mirrors='$(CT_Mirrors GNU gettext)'
-archive_formats='.tar.xz .tar.lz .tar.gz'
+archive_formats='.tar.xz .tar.gz'
signature_format='packed/.sig'