diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-09-06 18:56:18 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-07 14:36:30 +0100 |
commit | 84ba56a144b296e7e8e2f9c7e5c972a57d7d2002 (patch) | |
tree | 1a138661c3bc4c080c3d2c887a240d9e8916d651 /meta/recipes-core/gettext | |
parent | 1584613ca8e7dce3d0c279147782916289416dce (diff) | |
download | poky-84ba56a144b296e7e8e2f9c7e5c972a57d7d2002.tar.gz |
gettext: upgrade 0.21.1 -> 0.22
Drop autoconf-2.73.patch as upstream did update the gnulib.
(From OE-Core rev: 7c29196f8e378cb12b82da31ab2a05f5e8d1b831)
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-0.21.1/autoconf-2.73.patch | 50 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-native_0.22.bb (renamed from meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext-minimal/COPYING (renamed from meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING) | 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 (renamed from meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (renamed from meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/parallel.patch (renamed from meta/recipes-core/gettext/gettext-0.21.1/parallel.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/run-ptest (renamed from meta/recipes-core/gettext/gettext-0.21.1/run-ptest) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/serial-tests-config.patch (renamed from meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext/use-pkgconfig.patch (renamed from meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.22.bb (renamed from meta/recipes-core/gettext/gettext_0.21.1.bb) | 3 |
11 files changed, 3 insertions, 52 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch b/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch deleted file mode 100644 index ae5b2491bb..0000000000 --- a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | The gnulib largefile macro needs updating to work with autoconf 2.73. Rather | ||
2 | than the full code: | ||
3 | |||
4 | https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb | ||
5 | |||
6 | Just tweak the exiting code to work with 2.73. The next gettext upgrade should | ||
7 | update to new gnulib | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
11 | |||
12 | Index: gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 | ||
13 | =================================================================== | ||
14 | --- gettext-0.21.1.orig/gettext-runtime/gnulib-m4/largefile.m4 | ||
15 | +++ gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4 | ||
16 | @@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], | ||
17 | # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: | ||
18 | # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, | ||
19 | # or configures them incorrectly in some cases. | ||
20 | -m4_version_prereq([2.70], [], [ | ||
21 | +m4_version_prereq([2.73], [], [ | ||
22 | |||
23 | # _AC_SYS_LARGEFILE_TEST_INCLUDES | ||
24 | # ------------------------------- | ||
25 | Index: gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 | ||
26 | =================================================================== | ||
27 | --- gettext-0.21.1.orig/gettext-tools/gnulib-m4/largefile.m4 | ||
28 | +++ gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4 | ||
29 | @@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], | ||
30 | # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: | ||
31 | # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, | ||
32 | # or configures them incorrectly in some cases. | ||
33 | -m4_version_prereq([2.70], [], [ | ||
34 | +m4_version_prereq([2.73], [], [ | ||
35 | |||
36 | # _AC_SYS_LARGEFILE_TEST_INCLUDES | ||
37 | # ------------------------------- | ||
38 | Index: gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 | ||
39 | =================================================================== | ||
40 | --- gettext-0.21.1.orig/libtextstyle/gnulib-m4/largefile.m4 | ||
41 | +++ gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4 | ||
42 | @@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], | ||
43 | # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: | ||
44 | # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, | ||
45 | # or configures them incorrectly in some cases. | ||
46 | -m4_version_prereq([2.70], [], [ | ||
47 | +m4_version_prereq([2.73], [], [ | ||
48 | |||
49 | # _AC_SYS_LARGEFILE_TEST_INCLUDES | ||
50 | # ------------------------------- | ||
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.22.bb index db1bbb7e68..db1bbb7e68 100644 --- a/meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.22.bb | |||
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING b/meta/recipes-core/gettext/gettext-minimal/COPYING index 3671ab6985..3671ab6985 100644 --- a/meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING +++ b/meta/recipes-core/gettext/gettext-minimal/COPYING | |||
diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc index da2860fbc8..b4fb647916 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] = "e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45" | 4 | SRC_URI[sha256sum] = "49f089be11b490170bbf09ed2f51e5f5177f55be4cc66504a5861820e0fb06ab" |
diff --git a/meta/recipes-core/gettext/gettext-0.21.1/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..d45b75869a 100644 --- a/meta/recipes-core/gettext/gettext-0.21.1/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 | |||
diff --git a/meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch index b0bc6b97a6..b0bc6b97a6 100644 --- a/meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch +++ b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch | |||
diff --git a/meta/recipes-core/gettext/gettext-0.21.1/parallel.patch b/meta/recipes-core/gettext/gettext/parallel.patch index d96a376b7d..d96a376b7d 100644 --- a/meta/recipes-core/gettext/gettext-0.21.1/parallel.patch +++ b/meta/recipes-core/gettext/gettext/parallel.patch | |||
diff --git a/meta/recipes-core/gettext/gettext-0.21.1/run-ptest b/meta/recipes-core/gettext/gettext/run-ptest index f17f3c87a7..f17f3c87a7 100644 --- a/meta/recipes-core/gettext/gettext-0.21.1/run-ptest +++ b/meta/recipes-core/gettext/gettext/run-ptest | |||
diff --git a/meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch b/meta/recipes-core/gettext/gettext/serial-tests-config.patch index 93f7c03334..93f7c03334 100644 --- a/meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch +++ b/meta/recipes-core/gettext/gettext/serial-tests-config.patch | |||
diff --git a/meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch index c12e0d3b88..c12e0d3b88 100644 --- a/meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch +++ b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch | |||
diff --git a/meta/recipes-core/gettext/gettext_0.21.1.bb b/meta/recipes-core/gettext/gettext_0.22.bb index a3eb3bba54..71e84521b0 100644 --- a/meta/recipes-core/gettext/gettext_0.21.1.bb +++ b/meta/recipes-core/gettext/gettext_0.22.bb | |||
@@ -30,7 +30,6 @@ SRC_URI += " \ | |||
30 | file://serial-tests-config.patch \ | 30 | file://serial-tests-config.patch \ |
31 | file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ | 31 | file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ |
32 | file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ | 32 | file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ |
33 | file://autoconf-2.73.patch \ | ||
34 | " | 33 | " |
35 | 34 | ||
36 | inherit autotools texinfo pkgconfig ptest | 35 | inherit autotools texinfo pkgconfig ptest |
@@ -201,6 +200,8 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\ | |||
201 | glibc-charmap-euc-kr \ | 200 | glibc-charmap-euc-kr \ |
202 | glibc-gconv-euc-jp \ | 201 | glibc-gconv-euc-jp \ |
203 | glibc-charmap-euc-jp \ | 202 | glibc-charmap-euc-jp \ |
203 | glibc-gconv-gb18030 \ | ||
204 | glibc-charmap-gb18030 \ | ||
204 | locale-base-de-de \ | 205 | locale-base-de-de \ |
205 | locale-base-fr-fr \ | 206 | locale-base-fr-fr \ |
206 | " | 207 | " |