gettext: upgrade 0.21.1 -> 0.22

Drop autoconf-2.73.patch as upstream did update the gnulib.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 (file)
index ae5b249..0000000
--- a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
-than the full code:
-
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
-
-Just tweak the exiting code to work with 2.73. The next gettext upgrade should
-update to new gnulib
-
-Upstream-Status: Inappropriate
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Index: gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4
-===================================================================
---- gettext-0.21.1.orig/gettext-runtime/gnulib-m4/largefile.m4
-+++ gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4
-@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
- # with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
- # or configures them incorrectly in some cases.
--m4_version_prereq([2.70], [], [
-+m4_version_prereq([2.73], [], [
- 
- # _AC_SYS_LARGEFILE_TEST_INCLUDES
- # -------------------------------
-Index: gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4
-===================================================================
---- gettext-0.21.1.orig/gettext-tools/gnulib-m4/largefile.m4
-+++ gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4
-@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
- # with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
- # or configures them incorrectly in some cases.
--m4_version_prereq([2.70], [], [
-+m4_version_prereq([2.73], [], [
- 
- # _AC_SYS_LARGEFILE_TEST_INCLUDES
- # -------------------------------
-Index: gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4
-===================================================================
---- gettext-0.21.1.orig/libtextstyle/gnulib-m4/largefile.m4
-+++ gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4
-@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
- # with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
- # or configures them incorrectly in some cases.
--m4_version_prereq([2.70], [], [
-+m4_version_prereq([2.73], [], [
- 
- # _AC_SYS_LARGEFILE_TEST_INCLUDES
- # -------------------------------

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
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-native_0.21.1.bb
rename to 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
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.21.1/COPYING
rename to 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 da2860fbc85001a318f363941466bff0ae1700d9..b4fb64791612a5c5a2d7144d929cf7ad9ee4de5c 100644 (file)
--- a/meta/recipes-core/gettext/gettext-sources.inc
+++ b/meta/recipes-core/gettext/gettext-sources.inc
@@ -1,4 +1,4 @@
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            "
-SRC_URI[sha256sum] = "e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45"
+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
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.21.1/0001-init-env.in-do-not-add-C-CXX-parameters.patch
rename to 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
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.21.1/0001-tests-autopoint-3-unset-MAKEFLAGS.patch
rename to 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
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.21.1/parallel.patch
rename to 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
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.21.1/run-ptest
rename to 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
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.21.1/serial-tests-config.patch
rename to 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
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.21.1/use-pkgconfig.patch
rename to 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
similarity index 99%
rename from meta/recipes-core/gettext/gettext_0.21.1.bb
rename to meta/recipes-core/gettext/gettext_0.22.bb
index a3eb3bba541422dd56fa5b9f0c9b59e77069eb75..71e84521b0d5a2ff8f84dc28cb5461ba03f9fadd 100644 (file)
--- 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 += " \
            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://autoconf-2.73.patch \
            "
 
 inherit autotools texinfo pkgconfig ptest
@@ -201,6 +200,8 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\
     glibc-charmap-euc-kr \
     glibc-gconv-euc-jp \
     glibc-charmap-euc-jp \
+    glibc-gconv-gb18030 \
+    glibc-charmap-gb18030 \
     locale-base-de-de \
     locale-base-fr-fr \
 "