diff options
Diffstat (limited to 'meta/recipes-core/gettext')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch | 58 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch | 29 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch | 23 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/mingw.patch | 28 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/parallel.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/parallel.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/run-ptest (renamed from meta/recipes-core/gettext/gettext-0.20.2/run-ptest) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch (renamed from meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch) | 16 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/COPYING (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in) | 9 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4) | 0 | ||||
-rwxr-xr-x | meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin (renamed from meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-native_0.21.bb (renamed from meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.21.bb (renamed from meta/recipes-core/gettext/gettext_0.20.2.bb) | 59 |
26 files changed, 124 insertions, 98 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch b/meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch deleted file mode 100644 index 35a131067a..0000000000 --- a/meta/recipes-core/gettext/gettext-0.20.2/add-with-bisonlocaledir.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 04bd40fe2c48c6e01ab418a04d27c4aff644ad96 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Wed, 17 Feb 2016 23:54:02 -0500 -Subject: [PATCH] m4/bison-i18n.m4: add --with-bisonlocaledir to assign - BISON_LOCALEDIR - -The variable BISON_LOCALEDIR is assigned only by the output of -'bison --print-localedir', we add option --with-bisonlocaledir -to assign it explicitly. It is helpful for user to split the -native compile and cross compile. - -For backward compatibility, if option not used, it still -make use of the output of 'bison --print-localedir'. - -Upstream-Status: Submitted [bison-patches@gnu.org] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - gettext-tools/gnulib-m4/bison-i18n.m4 | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/gettext-tools/gnulib-m4/bison-i18n.m4 b/gettext-tools/gnulib-m4/bison-i18n.m4 -index f5cfd3a..fb6ac4d 100644 ---- a/gettext-tools/gnulib-m4/bison-i18n.m4 -+++ b/gettext-tools/gnulib-m4/bison-i18n.m4 -@@ -14,11 +14,16 @@ dnl sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files - dnl and defines YYENABLE_NLS if there are bison-runtime.mo files at all. - AC_DEFUN([BISON_I18N], - [ -+ dnl Default is not to set bisonlocaledir -+ AC_ARG_WITH([bisonlocaledir], -+ [ --with-bisonlocaledir sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files], -+ BISON_LOCALEDIR=$withval, -+ BISON_LOCALEDIR=) -+ - if test -z "$USE_NLS"; then - echo "The BISON-I18N macro is used without being preceded by AM-GNU-GETTEXT." 1>&2 - exit 1 - fi -- BISON_LOCALEDIR= - BISON_USE_NLS=no - if test "$USE_NLS" = yes; then - dnl Determine bison's localedir. -@@ -26,9 +31,10 @@ AC_DEFUN([BISON_I18N], - dnl But even is YACC is called "yacc", it may be a script that invokes bison - dnl and accepts the --print-localedir option. - dnl YACC's default value is empty; BISON's default value is :. -- if (${YACC-${BISON-:}} --print-localedir) >/dev/null 2>&1; then -+ if test -z "$BISON_LOCALEDIR" -a ${YACC-${BISON-:}} --print-localedir >/dev/null 2>&1; then - BISON_LOCALEDIR=`${YACC-${BISON-:}} --print-localedir` - fi -+ AC_MSG_RESULT([$BISON_LOCALEDIR]) - AC_SUBST([BISON_LOCALEDIR]) - if test -n "$BISON_LOCALEDIR"; then - dnl There is no need to enable internationalization if the user doesn't --- -1.9.1 - diff --git a/meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch index d45b75869a..d45b75869a 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/0001-init-env.in-do-not-add-C-CXX-parameters.patch +++ b/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch b/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch new file mode 100644 index 0000000000..727d1db552 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.21/0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch @@ -0,0 +1,29 @@ +From 2f127ebe425c97b0641fe1bc73247e91e18c2be0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Thu, 11 Nov 2021 22:06:16 +0100 +Subject: [PATCH] libtextstyle: fix builds with automake 1.16.4 and newer + +Upstream-Status: Submitted [http://savannah.gnu.org/bugs/?59929] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + libtextstyle/configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/libtextstyle/configure.ac b/libtextstyle/configure.ac +index 63b4c2a..cab9025 100644 +--- a/libtextstyle/configure.ac ++++ b/libtextstyle/configure.ac +@@ -17,11 +17,10 @@ dnl along with this program. If not, see <https://www.gnu.org/licenses/>. + dnl Process this file with autoconf to produce a configure script. + + AC_PREREQ([2.63]) +-AC_INIT ++AC_INIT([libtextstyle], ++ [0.20.1]) + AC_CONFIG_SRCDIR([version.sh]) + AC_CONFIG_AUX_DIR([build-aux]) +-. $srcdir/version.sh +-gl_INIT_PACKAGE([libtextstyle], [$VERSION_NUMBER]) + AM_INIT_AUTOMAKE([1.13 silent-rules]) + AM_CONFIG_HEADER([config.h]) + diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch b/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch new file mode 100644 index 0000000000..e42a6c0a4d --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch @@ -0,0 +1,23 @@ +From 71988f83b69c4ed98d1b9418da80edf11a931894 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 23 Sep 2020 22:08:34 -0700 +Subject: [PATCH] msgmerge-29: Add executable file mode bits + +This script is installed with default mode bits and executed directly +e.g ./msgmerge-29 when doing make check which results in + +/bin/bash: line 9: ./msgmerge-29: Permission denied + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gettext-tools/tests/msgmerge-29 | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + mode change 100644 => 100755 gettext-tools/tests/msgmerge-29 + +diff --git a/gettext-tools/tests/msgmerge-29 b/gettext-tools/tests/msgmerge-29 +old mode 100644 +new mode 100755 +-- +2.28.0 + diff --git a/meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch index b0bc6b97a6..b0bc6b97a6 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +++ b/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch diff --git a/meta/recipes-core/gettext/gettext-0.21/mingw.patch b/meta/recipes-core/gettext/gettext-0.21/mingw.patch new file mode 100644 index 0000000000..b062c784f6 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.21/mingw.patch @@ -0,0 +1,28 @@ +From 7cf68dffb2adb76375bfb0781e277510523a1f3e Mon Sep 17 00:00:00 2001 +From: Michele Locati <michele@locati.it> +Date: Thu, 30 Jul 2020 18:58:02 +0200 +Subject: [PATCH] build: Fix build failure on Cygwin and mingw. + +* gettext-tools/woe32dll/gettextsrc-exports.c: Export formatstring_ruby. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + gettext-tools/woe32dll/gettextsrc-exports.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c +index 4477ae8..6d76089 100644 +--- a/gettext-tools/woe32dll/gettextsrc-exports.c ++++ b/gettext-tools/woe32dll/gettextsrc-exports.c +@@ -50,6 +50,7 @@ VARIABLE(formatstring_python) + VARIABLE(formatstring_python_brace) + VARIABLE(formatstring_qt) + VARIABLE(formatstring_qt_plural) ++VARIABLE(formatstring_ruby) + VARIABLE(formatstring_scheme) + VARIABLE(formatstring_sh) + VARIABLE(formatstring_smalltalk) +-- +1.9.1 + diff --git a/meta/recipes-core/gettext/gettext-0.20.2/parallel.patch b/meta/recipes-core/gettext/gettext-0.21/parallel.patch index d96a376b7d..d96a376b7d 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/parallel.patch +++ b/meta/recipes-core/gettext/gettext-0.21/parallel.patch diff --git a/meta/recipes-core/gettext/gettext-0.20.2/run-ptest b/meta/recipes-core/gettext/gettext-0.21/run-ptest index f17f3c87a7..f17f3c87a7 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/run-ptest +++ b/meta/recipes-core/gettext/gettext-0.21/run-ptest diff --git a/meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch b/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch index 93f7c03334..93f7c03334 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/serial-tests-config.patch +++ b/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch diff --git a/meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch index feb56719d7..fc77feb270 100644 --- a/meta/recipes-core/gettext/gettext-0.20.2/use-pkgconfig.patch +++ b/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch @@ -1,4 +1,4 @@ -From c832880c5242b454a2c9e61b6a2dc26aecdc51bd Mon Sep 17 00:00:00 2001 +From 15647f679834be633fb4a9aeff4671b9cb95ccb8 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 23 Jan 2018 00:54:13 +0000 Subject: [PATCH] gettext: beat library detection into shape @@ -25,7 +25,7 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> 8 files changed, 83 insertions(+), 450 deletions(-) diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 -index 05b9550..031ee65 100644 +index 2f80c37..30ce58e 100644 --- a/gettext-tools/gnulib-m4/libxml.m4 +++ b/gettext-tools/gnulib-m4/libxml.m4 @@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) @@ -142,7 +142,7 @@ index 05b9550..031ee65 100644 ]) AC_SUBST([LIBXML]) diff --git a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c -index 2cfd4a8..d42c8b4 100644 +index 2ff978f..5ffb17a 100644 --- a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c +++ b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c @@ -22,15 +22,15 @@ @@ -166,7 +166,7 @@ index 2cfd4a8..d42c8b4 100644 +#include <libcroco/cr-string.h> #include "term-ostream.h" - #include "hash.h" + #include "mem-hash-map.h" diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4 index bc53cc6..10b2455 100644 --- a/libtextstyle/gnulib-local/m4/libcroco.m4 @@ -646,7 +646,7 @@ index 5853772..767fba2 100644 AC_SUBST([LTLIBGLIB]) AC_SUBST([INCGLIB]) diff --git a/libtextstyle/lib/term-styled-ostream.c b/libtextstyle/lib/term-styled-ostream.c -index 3675b5f..811e546 100644 +index 5484800..16793fa 100644 --- a/libtextstyle/lib/term-styled-ostream.c +++ b/libtextstyle/lib/term-styled-ostream.c @@ -28,15 +28,15 @@ @@ -670,9 +670,9 @@ index 3675b5f..811e546 100644 +#include <libcroco/cr-string.h> #include "term-ostream.h" - #include "hash.h" + #include "mem-hash-map.h" diff --git a/libtextstyle/lib/term-styled-ostream.oo.c b/libtextstyle/lib/term-styled-ostream.oo.c -index 2cfd4a8..d42c8b4 100644 +index 2ff978f..5ffb17a 100644 --- a/libtextstyle/lib/term-styled-ostream.oo.c +++ b/libtextstyle/lib/term-styled-ostream.oo.c @@ -22,15 +22,15 @@ @@ -696,4 +696,4 @@ index 2cfd4a8..d42c8b4 100644 +#include <libcroco/cr-string.h> #include "term-ostream.h" - #include "hash.h" + #include "mem-hash-map.h" diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING b/meta/recipes-core/gettext/gettext-minimal-0.21/COPYING index 3671ab6985..3671ab6985 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/COPYING +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/COPYING diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in index de980e040a..6b25f0d916 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/Makefile.in.in +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in @@ -7,7 +7,7 @@ # notice and this notice are preserved. This file is offered as-is, # without any warranty. # -# Origin: gettext-0.20.2 +# Origin: gettext-0.21 GETTEXT_MACRO_VERSION = 0.20 PACKAGE = @PACKAGE@ @@ -415,12 +415,17 @@ dist distdir: @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: $(srcdir)/stamp-po $(DISTFILES) - dists="$(DISTFILES)"; \ + @dists="$(DISTFILES)"; \ if test "$(PACKAGE)" = "gettext-tools"; then \ dists="$$dists Makevars.template"; \ fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ dists="$$dists $(DOMAIN).pot stamp-po"; \ + else \ + case $(XGETTEXT) in \ + :) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because a suitable 'xgettext' program was not found in PATH." 1>&2;; \ + *) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because 'xgettext' found no strings to extract. Check the contents of the POTFILES.in file and the XGETTEXT_OPTIONS in the Makevars file." 1>&2;; \ + esac; \ fi; \ if test -f $(srcdir)/ChangeLog; then \ dists="$$dists ChangeLog"; \ diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 index 4f25a27d93..4f25a27d93 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/gettext.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 index 6db2aa25ae..6db2aa25ae 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/host-cpu-c-abi.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 index e593b7270a..e593b7270a 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/iconv.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 index ebd9937c1a..ebd9937c1a 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/intlmacosx.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 index 98c348faff..98c348faff 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-ld.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 index eecf70ec76..eecf70ec76 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-link.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 index c8a0b464c2..c8a0b464c2 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/lib-prefix.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 index 5a506fc4b5..5a506fc4b5 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/nls.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 index 3778fd7aac..3778fd7aac 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/po.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 index f28010aed1..f28010aed1 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/aclocal/progtest.m4 +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath index 24be79cfb6..24be79cfb6 100755 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/config.rpath +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin index 8c70dfbf14..8c70dfbf14 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.20.2/remove-potcdate.sin +++ b/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb index 7a4dcbec57..7a4dcbec57 100644 --- a/meta/recipes-core/gettext/gettext-minimal-native_0.20.2.bb +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb diff --git a/meta/recipes-core/gettext/gettext_0.20.2.bb b/meta/recipes-core/gettext/gettext_0.21.bb index fda11c44cc..30c1955d86 100644 --- a/meta/recipes-core/gettext/gettext_0.20.2.bb +++ b/meta/recipes-core/gettext/gettext_0.21.bb @@ -5,28 +5,26 @@ naming organization for the message catalogs themselves, a runtime library suppo a few stand-alone programs to massage in various ways the sets of translatable and already translated strings." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" -LICENSE = "GPLv3+ & LGPL-2.1+" +LICENSE = "GPL-3.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" -# Because po-gram-gen.y has been modified by fix-CVE-2018-18751.patch, -# it requires yacc which provided by bison-native -# Please remove bison-native from DEPENDS* when next upgrade -DEPENDS = "bison-native gettext-native virtual/libiconv" -DEPENDS_class-native = "bison-native gettext-minimal-native" +DEPENDS = "gettext-native virtual/libiconv" +DEPENDS:class-native = "gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" -PROVIDES_class-native = "virtual/gettext-native" -RCONFLICTS_${PN} = "proxy-libintl" +PROVIDES:class-native = "virtual/gettext-native" +RCONFLICTS:${PN} = "proxy-libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://parallel.patch \ - file://add-with-bisonlocaledir.patch \ file://use-pkgconfig.patch \ file://run-ptest \ file://serial-tests-config.patch \ file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ + file://mingw.patch \ + file://0001-msgmerge-29-Add-executable-file-mode-bits.patch \ + file://0001-libtextstyle-fix-builds-with-automake-1.16.4-and-new.patch \ " -SRC_URI[md5sum] = "30fec34a895fab4c02584449c500aac2" -SRC_URI[sha256sum] = "ecb9d0908ca41d5ca5fef974323b3bba6bec19eebba0b44f396de98cfcc089f1" +SRC_URI[sha256sum] = "c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12" inherit autotools texinfo pkgconfig ptest @@ -42,7 +40,7 @@ EXTRA_OECONF += "--without-lispdir \ --without-git \ --cache-file=${B}/config.cache \ " -EXTRA_OECONF_append_class-target = " \ +EXTRA_OECONF:append:class-target = " \ --with-bisonlocaledir=${datadir}/locale \ gt_cv_locale_fr_utf8=fr_FR \ gt_cv_locale_fr=fr_FR.ISO-8859-1 \ @@ -51,8 +49,8 @@ EXTRA_OECONF_append_class-target = " \ " PACKAGECONFIG ??= "croco glib libxml" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG:class-native = "" +PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco" PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0" @@ -65,7 +63,7 @@ PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,-- acpaths = '-I ${S}/gettext-runtime/m4 \ -I ${S}/gettext-tools/m4' -do_install_append_libc-musl () { +do_install:append:libc-musl () { rm -f ${D}${libdir}/charset.alias rm -f ${D}${includedir}/libintl.h rm -f ${D}${libdir}/libintl.la @@ -82,29 +80,29 @@ do_install_append_libc-musl () { # 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk PACKAGES =+ "libgettextlib libgettextsrc" -FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" -FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" +FILES:libgettextlib = "${libdir}/libgettextlib-*.so*" +FILES:libgettextsrc = "${libdir}/libgettextsrc-*.so*" PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc" -FILES_${PN} += "${libdir}/${BPN}/*" +FILES:${PN} += "${libdir}/${BPN}/*" # The its/Makefile.am has defined: # itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its # not itsdir = $(pkgdatadir), so use wildcard to match the version. -FILES_${PN} += "${datadir}/${BPN}-*/*" +FILES:${PN} += "${datadir}/${BPN}-*/*" -FILES_gettext-runtime = "${bindir}/gettext \ +FILES:gettext-runtime = "${bindir}/gettext \ ${bindir}/ngettext \ ${bindir}/envsubst \ ${bindir}/gettext.sh \ ${libdir}/libasprintf.so* \ ${libdir}/GNU.Gettext.dll \ " -FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ +FILES:gettext-runtime-dev += "${libdir}/libasprintf.a \ ${includedir}/autosprintf.h \ " -FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ +FILES:gettext-runtime-doc = "${mandir}/man1/gettext.* \ ${mandir}/man1/ngettext.* \ ${mandir}/man1/envsubst.* \ ${mandir}/man1/.* \ @@ -119,18 +117,18 @@ FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ ${infodir}/autosprintf.info \ " -do_install_append() { +do_install:append() { rm -f ${D}${libdir}/preloadable_libintl.so } -do_install_append_class-native () { +do_install:append:class-native () { rm ${D}${datadir}/aclocal/* rm ${D}${datadir}/gettext/config.rpath rm ${D}${datadir}/gettext/po/Makefile.in.in rm ${D}${datadir}/gettext/po/remove-potcdate.sin create_wrapper ${D}${bindir}/msgfmt \ - GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-0.20.2/" + GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-${PV}/" } @@ -174,11 +172,12 @@ do_install_ptest() { find ${D}${PTEST_PATH}/ -name "*.o" -exec rm {} \; chmod 0755 ${D}${PTEST_PATH}/tests/lang-vala ${D}${PTEST_PATH}/tests/plural-1 ${D}${PTEST_PATH}/tests/xgettext-tcl-4 \ ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 + sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env fi } -RDEPENDS_${PN}-ptest += "make" -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ +RDEPENDS:${PN}-ptest += "make xz" +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-gconv-big5 \ glibc-charmap-big5 \ glibc-gconv-cp1251 \ @@ -199,12 +198,12 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ locale-base-fr-fr \ " -RRECOMMENDS_${PN}-ptest_append_libc-glibc = "\ +RRECOMMENDS:${PN}-ptest:append:libc-glibc = "\ locale-base-de-de.iso-8859-1 \ locale-base-fr-fr.iso-8859-1 \ " -INSANE_SKIP_${PN}-ptest += "ldflags" -INSANE_SKIP_${PN}-ptest += "rpaths" +INSANE_SKIP:${PN}-ptest += "ldflags" +INSANE_SKIP:${PN}-ptest += "rpaths" BBCLASSEXTEND = "native nativesdk" |