diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:08 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:02 +0000 |
commit | 2f12d80948877a520a579aa66d7f2da392524a80 (patch) | |
tree | f749f447a2ea4fdfbbc7ccc68cc54a7c4a6ba69c /meta/recipes-core/gettext | |
parent | 36965634bea2d22bc2ee923d8ab595abb7631a88 (diff) | |
download | poky-2f12d80948877a520a579aa66d7f2da392524a80.tar.gz |
gettext: upgrade 0.22.4 -> 0.22.5
(From OE-Core rev: 3cf9853a1a6872667cffe1dd8ed3d7a5037caaa5)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext')
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb (renamed from meta/recipes-core/gettext/gettext-minimal-native_0.22.4.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-sources.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch | 2 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch | 6 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/parallel.patch | 7 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/serial-tests-config.patch | 9 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/use-pkgconfig.patch | 15 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.22.5.bb (renamed from meta/recipes-core/gettext/gettext_0.22.4.bb) | 2 |
8 files changed, 20 insertions, 23 deletions
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.22.4.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb index db1bbb7e68..db1bbb7e68 100644 --- a/meta/recipes-core/gettext/gettext-minimal-native_0.22.4.bb +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb | |||
diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc index 8b4e240101..fd05837528 100644 --- a/meta/recipes-core/gettext/gettext-sources.inc +++ b/meta/recipes-core/gettext/gettext-sources.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" | 1 | HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" |
2 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ | 2 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ |
3 | " | 3 | " |
4 | SRC_URI[sha256sum] = "c1e0bb2a4427a9024390c662cd532d664c4b36b8ff444ed5e54b115fdb7a1aea" | 4 | SRC_URI[sha256sum] = "ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0" |
diff --git a/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch index d45b75869a..33d45a038c 100644 --- a/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch +++ b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9b912a47f790a7b282ec0c2295a188c5d8fb6a7c Mon Sep 17 00:00:00 2001 | 1 | From c58c503c532d20883a93ef778327c86dd6de24f6 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 6 Mar 2020 21:04:05 +0000 | 3 | Date: Fri, 6 Mar 2020 21:04:05 +0000 |
4 | Subject: [PATCH] init-env.in: do not add C/CXX parameters | 4 | Subject: [PATCH] init-env.in: do not add C/CXX parameters |
diff --git a/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch index b0bc6b97a6..94afb255c3 100644 --- a/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +++ b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 38b256e5aa7dfeb42acffd89565e53a2c0bab3e3 Mon Sep 17 00:00:00 2001 | 1 | From 7006142d199af13628edc687847a9a5bac48b45d Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 7 Jan 2020 16:44:38 +0100 | 3 | Date: Tue, 7 Jan 2020 16:44:38 +0100 |
4 | Subject: [PATCH] tests/autopoint-3: unset MAKEFLAGS | 4 | Subject: [PATCH] tests/autopoint-3: unset MAKEFLAGS |
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
13 | 1 file changed, 1 insertion(+) | 13 | 1 file changed, 1 insertion(+) |
14 | 14 | ||
15 | diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 | 15 | diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 |
16 | index e13552b..55188df 100755 | 16 | index bd3fbf3..380eaac 100755 |
17 | --- a/gettext-tools/tests/autopoint-3 | 17 | --- a/gettext-tools/tests/autopoint-3 |
18 | +++ b/gettext-tools/tests/autopoint-3 | 18 | +++ b/gettext-tools/tests/autopoint-3 |
19 | @@ -126,6 +126,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; } | 19 | @@ -131,6 +131,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; } |
20 | ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err | 20 | ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err |
21 | test $? = 0 || { cat autopoint.err; Exit 1; } | 21 | test $? = 0 || { cat autopoint.err; Exit 1; } |
22 | 22 | ||
diff --git a/meta/recipes-core/gettext/gettext/parallel.patch b/meta/recipes-core/gettext/gettext/parallel.patch index d96a376b7d..8ecba46fd0 100644 --- a/meta/recipes-core/gettext/gettext/parallel.patch +++ b/meta/recipes-core/gettext/gettext/parallel.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4a2a0a93b469093b60ffd0bec55d33d1e03d4713 Mon Sep 17 00:00:00 2001 | 1 | From 83333bc873c2655ff1de161f6b7db930f22f1cea Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <jslater@windriver.com> | 2 | From: Joe Slater <jslater@windriver.com> |
3 | Date: Thu, 7 Jun 2012 16:37:01 -0700 | 3 | Date: Thu, 7 Jun 2012 16:37:01 -0700 |
4 | Subject: [PATCH] instal libgettextlib.a before removing it | 4 | Subject: [PATCH] instal libgettextlib.a before removing it |
@@ -10,16 +10,15 @@ the operations. | |||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | 11 | ||
12 | Signed-off-by: Joe Slater <jslater@windriver.com> | 12 | Signed-off-by: Joe Slater <jslater@windriver.com> |
13 | |||
14 | --- | 13 | --- |
15 | gettext-tools/gnulib-lib/Makefile.am | 4 ++++ | 14 | gettext-tools/gnulib-lib/Makefile.am | 4 ++++ |
16 | 1 file changed, 4 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
17 | 16 | ||
18 | diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am | 17 | diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am |
19 | index 2126699..d2dd7e4 100644 | 18 | index ab729cd..a0d713e 100644 |
20 | --- a/gettext-tools/gnulib-lib/Makefile.am | 19 | --- a/gettext-tools/gnulib-lib/Makefile.am |
21 | +++ b/gettext-tools/gnulib-lib/Makefile.am | 20 | +++ b/gettext-tools/gnulib-lib/Makefile.am |
22 | @@ -58,6 +58,10 @@ endif | 21 | @@ -58,6 +58,10 @@ AM_CFLAGS = @WARN_CFLAGS@ |
23 | # Rules generated and collected by gnulib-tool. | 22 | # Rules generated and collected by gnulib-tool. |
24 | include Makefile.gnulib | 23 | include Makefile.gnulib |
25 | 24 | ||
diff --git a/meta/recipes-core/gettext/gettext/serial-tests-config.patch b/meta/recipes-core/gettext/gettext/serial-tests-config.patch index 93f7c03334..7d39d6086a 100644 --- a/meta/recipes-core/gettext/gettext/serial-tests-config.patch +++ b/meta/recipes-core/gettext/gettext/serial-tests-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ed64a5724ef7d6eb4e9a876f817ea266a536e195 Mon Sep 17 00:00:00 2001 | 1 | From aa8dfe0aafd0b53a6c5bac61b356ca92e1430a36 Mon Sep 17 00:00:00 2001 |
2 | From: "Hongjun.Yang" <hongjun.yang@windriver.com> | 2 | From: "Hongjun.Yang" <hongjun.yang@windriver.com> |
3 | Date: Thu, 28 Jul 2016 12:36:15 +0800 | 3 | Date: Thu, 28 Jul 2016 12:36:15 +0800 |
4 | Subject: [PATCH] fix for ptest | 4 | Subject: [PATCH] fix for ptest |
@@ -8,7 +8,6 @@ Add serial-tests support, ptest need it | |||
8 | Upstream-Status: Inappropriate [oe specific] | 8 | Upstream-Status: Inappropriate [oe specific] |
9 | 9 | ||
10 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 10 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
11 | |||
12 | --- | 11 | --- |
13 | configure.ac | 2 +- | 12 | configure.ac | 2 +- |
14 | gettext-runtime/configure.ac | 2 +- | 13 | gettext-runtime/configure.ac | 2 +- |
@@ -16,7 +15,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
16 | 3 files changed, 3 insertions(+), 3 deletions(-) | 15 | 3 files changed, 3 insertions(+), 3 deletions(-) |
17 | 16 | ||
18 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
19 | index 38db6fd..f019ae0 100644 | 18 | index f4e54ea..a47ff14 100644 |
20 | --- a/configure.ac | 19 | --- a/configure.ac |
21 | +++ b/configure.ac | 20 | +++ b/configure.ac |
22 | @@ -22,7 +22,7 @@ AC_INIT([gettext], | 21 | @@ -22,7 +22,7 @@ AC_INIT([gettext], |
@@ -29,7 +28,7 @@ index 38db6fd..f019ae0 100644 | |||
29 | dnl Override automake's tar command used for creating distributions. | 28 | dnl Override automake's tar command used for creating distributions. |
30 | am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' | 29 | am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' |
31 | diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac | 30 | diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac |
32 | index de203e7..138a07f 100644 | 31 | index 126d069..aa23232 100644 |
33 | --- a/gettext-runtime/configure.ac | 32 | --- a/gettext-runtime/configure.ac |
34 | +++ b/gettext-runtime/configure.ac | 33 | +++ b/gettext-runtime/configure.ac |
35 | @@ -22,7 +22,7 @@ AC_INIT([gettext-runtime], | 34 | @@ -22,7 +22,7 @@ AC_INIT([gettext-runtime], |
@@ -42,7 +41,7 @@ index de203e7..138a07f 100644 | |||
42 | 41 | ||
43 | dnl Installation directories. | 42 | dnl Installation directories. |
44 | diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac | 43 | diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac |
45 | index cf1dd73..b544d6d 100644 | 44 | index 3610ee3..6f56a23 100644 |
46 | --- a/gettext-tools/configure.ac | 45 | --- a/gettext-tools/configure.ac |
47 | +++ b/gettext-tools/configure.ac | 46 | +++ b/gettext-tools/configure.ac |
48 | @@ -22,7 +22,7 @@ AC_INIT([gettext-tools], | 47 | @@ -22,7 +22,7 @@ AC_INIT([gettext-tools], |
diff --git a/meta/recipes-core/gettext/gettext/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch index f1fb61de4e..ceb1856118 100644 --- a/meta/recipes-core/gettext/gettext/use-pkgconfig.patch +++ b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 38c361e6860bfaefbefeccae621e698c301879f2 Mon Sep 17 00:00:00 2001 | 1 | From 6aa1338b916fe72c200b6f160b934be15b6ff590 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 23 Jan 2018 00:54:13 +0000 | 3 | Date: Tue, 23 Jan 2018 00:54:13 +0000 |
4 | Subject: [PATCH] gettext: beat library detection into shape | 4 | Subject: [PATCH] gettext: beat library detection into shape |
@@ -12,12 +12,11 @@ Simply delete all the crazy, and replace with a single call to pkg-config. | |||
12 | 12 | ||
13 | Upstream-Status: Inappropriate [upstream still refuse to consider pkg-config] | 13 | Upstream-Status: Inappropriate [upstream still refuse to consider pkg-config] |
14 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 14 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
15 | |||
16 | --- | 15 | --- |
17 | gettext-tools/gnulib-m4/libxml.m4 | 105 +---------------- | 16 | gettext-tools/gnulib-m4/libxml.m4 | 105 ++--------------------- |
18 | libtextstyle/gnulib-local/m4/libglib.m4 | 106 +++--------------- | 17 | libtextstyle/gnulib-local/m4/libglib.m4 | 106 +++--------------------- |
19 | libtextstyle/gnulib-m4/libglib.m4 | 106 +++--------------- | 18 | libtextstyle/gnulib-m4/libglib.m4 | 106 +++--------------------- |
20 | 3 files changed, 79 insertions(+), 470 deletions(-) | 19 | 3 files changed, 31 insertions(+), 286 deletions(-) |
21 | 20 | ||
22 | diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 | 21 | diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 |
23 | index 0340490..0355388 100644 | 22 | index 0340490..0355388 100644 |
@@ -143,7 +142,7 @@ index 0340490..0355388 100644 | |||
143 | ]) | 142 | ]) |
144 | AC_SUBST([LIBXML]) | 143 | AC_SUBST([LIBXML]) |
145 | diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 | 144 | diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 |
146 | index 7ee5029..bb1e5e4 100644 | 145 | index dbc9eb8..136e512 100644 |
147 | --- a/libtextstyle/gnulib-local/m4/libglib.m4 | 146 | --- a/libtextstyle/gnulib-local/m4/libglib.m4 |
148 | +++ b/libtextstyle/gnulib-local/m4/libglib.m4 | 147 | +++ b/libtextstyle/gnulib-local/m4/libglib.m4 |
149 | @@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. | 148 | @@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. |
@@ -267,7 +266,7 @@ index 7ee5029..bb1e5e4 100644 | |||
267 | AC_SUBST([LTLIBGLIB]) | 266 | AC_SUBST([LTLIBGLIB]) |
268 | AC_SUBST([INCGLIB]) | 267 | AC_SUBST([INCGLIB]) |
269 | diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4 | 268 | diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4 |
270 | index 7ee5029..bb1e5e4 100644 | 269 | index dbc9eb8..136e512 100644 |
271 | --- a/libtextstyle/gnulib-m4/libglib.m4 | 270 | --- a/libtextstyle/gnulib-m4/libglib.m4 |
272 | +++ b/libtextstyle/gnulib-m4/libglib.m4 | 271 | +++ b/libtextstyle/gnulib-m4/libglib.m4 |
273 | @@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. | 272 | @@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. |
diff --git a/meta/recipes-core/gettext/gettext_0.22.4.bb b/meta/recipes-core/gettext/gettext_0.22.5.bb index 75474c8c30..1a66d37916 100644 --- a/meta/recipes-core/gettext/gettext_0.22.4.bb +++ b/meta/recipes-core/gettext/gettext_0.22.5.bb | |||
@@ -175,7 +175,7 @@ do_install_ptest() { | |||
175 | install ${B}/gettext-tools/misc/* ${D}${PTEST_PATH}/misc | 175 | install ${B}/gettext-tools/misc/* ${D}${PTEST_PATH}/misc |
176 | find ${D}${PTEST_PATH}/ -name "*.o" -exec rm {} \; | 176 | find ${D}${PTEST_PATH}/ -name "*.o" -exec rm {} \; |
177 | chmod 0755 ${D}${PTEST_PATH}/tests/lang-vala ${D}${PTEST_PATH}/tests/plural-1 ${D}${PTEST_PATH}/tests/xgettext-tcl-4 \ | 177 | chmod 0755 ${D}${PTEST_PATH}/tests/lang-vala ${D}${PTEST_PATH}/tests/plural-1 ${D}${PTEST_PATH}/tests/xgettext-tcl-4 \ |
178 | ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 | 178 | ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 ${D}${PTEST_PATH}/tests/xgettext-vala-6 |
179 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env | 179 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env |
180 | fi | 180 | fi |
181 | } | 181 | } |