[PATCH 1/1] gettext: 0.26 -> 1.0

liezhi.yang
2026-03-07T15:07:47Z

From: Robert Yang <liezhi.yang@windriver.com>

* Rebased use-pkgconfig.patch
* Modify the location of Makevars.template

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
..._0.26.bb => gettext-minimal-native_1.0.bb} | 3 +-
meta/recipes-core/gettext/gettext-sources.inc | 2 +-
.../gettext/gettext/use-pkgconfig.patch | 86 +++++++++----------
.../{gettext_0.26.bb => gettext_1.0.bb} | 0
4 files changed, 44 insertions(+), 47 deletions(-)
rename meta/recipes-core/gettext/{gettext-minimal-native_0.26.bb => gettext-minimal-native_1.0.bb} (93%)
rename meta/recipes-core/gettext/{gettext_0.26.bb => gettext_1.0.bb} (100%)

diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.26.bb b/meta/recipes-core/gettext/gettext-minimal-native_1.0.bb
similarity index 93%
rename from meta/recipes-core/gettext/gettext-minimal-native_0.26.bb
rename to meta/recipes-core/gettext/gettext-minimal-native_1.0.bb
index b5c32d0786..372aac472d 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.26.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_1.0.bb
@@ -44,5 +44,6 @@ do_install () {
cp ${S}/gettext-runtime/po/Makefile.in.in ${D}${datadir}/gettext/po/
cp ${S}/gettext-runtime/po/remove-potcdate.sed ${D}${datadir}/gettext/po/
# The gettext recipe also installs the same Makevars.template at the same place, rename it
- cp ${S}/gettext-tools/po/Makevars.template ${D}${datadir}/gettext/po/Makevars.template.minimal
+ cp ${S}/gettext-tools/wizard/po-templates/traditional/Makevars.template \
+ ${D}${datadir}/gettext/po/Makevars.template.minimal
}
diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc
index 2ddf47334d..02ad72fc9f 100644
--- a/meta/recipes-core/gettext/gettext-sources.inc
+++ b/meta/recipes-core/gettext/gettext-sources.inc
@@ -1,3 +1,3 @@
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz"
-SRC_URI[sha256sum] = "39acf4b0371e9b110b60005562aace5b3631fed9b1bb9ecccfc7f56e58bb1d7f"
+SRC_URI[sha256sum] = "85d99b79c981a404874c02e0342176cf75c7698e2b51fe41031cf6526d974f1a"
diff --git a/meta/recipes-core/gettext/gettext/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch
index 2b9fef1e94..3bea1ea371 100644
--- a/meta/recipes-core/gettext/gettext/use-pkgconfig.patch
+++ b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch
@@ -18,16 +18,17 @@ Added also selinux discovery.
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>

---
- gettext-tools/gnulib-m4/libxml.m4 | 105 ++---------------------
- libtextstyle/gnulib-local/m4/libglib.m4 | 106 +++---------------------
- libtextstyle/gnulib-m4/libglib.m4 | 106 +++---------------------
- 3 files changed, 31 insertions(+), 286 deletions(-)
+ gettext-tools/gnulib-m4/libxml.m4 | 105 ++++-----------------------------------------------------------------------------------
+ gettext-tools/gnulib-m4/selinux-selinux-h.m4 | 13 ----------
+ libtextstyle/gnulib-local/m4/libglib.m4 | 106 ++++++++++------------------------------------------------------------------------------
+ libtextstyle/gnulib-m4/libglib.m4 | 106 ++++++++++------------------------------------------------------------------------------
+ 4 files changed, 32 insertions(+), 298 deletions(-)

diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4
-index c7160d7..8e46cc7 100644
+index 8c1dc78..4dd7f33 100644
--- a/gettext-tools/gnulib-m4/libxml.m4
+++ b/gettext-tools/gnulib-m4/libxml.m4
-@@ -14,6 +14,7 @@ dnl gl_LIBXML(FORCE-INCLUDED)
+@@ -15,6 +15,7 @@ dnl gl_LIBXML(FORCE-INCLUDED)
dnl forces the use of the included or an external libxml.
AC_DEFUN([gl_LIBXML],
[
@@ -35,7 +36,7 @@ index c7160d7..8e46cc7 100644
AC_REQUIRE([AM_ICONV_LINK])

ifelse([$1], , [
-@@ -31,106 +32,10 @@ AC_DEFUN([gl_LIBXML],
+@@ -32,106 +33,10 @@ AC_DEFUN([gl_LIBXML],
INCXML=
ifelse([$1], [yes], , [
if test "$gl_cv_libxml_use_included" != yes; then
@@ -146,11 +147,40 @@ index c7160d7..8e46cc7 100644
fi
])
AC_SUBST([LIBXML])
+diff --git a/gettext-tools/gnulib-m4/selinux-selinux-h.m4 b/gettext-tools/gnulib-m4/selinux-selinux-h.m4
+index c964ced..1641bd5 100644
+--- a/gettext-tools/gnulib-m4/selinux-selinux-h.m4
++++ b/gettext-tools/gnulib-m4/selinux-selinux-h.m4
+@@ -71,6 +71,7 @@ AC_DEFUN([gl_LIBSELINUX],
+ [
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([AC_CANONICAL_BUILD])
++ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+
+ AC_ARG_WITH([selinux],
+ AS_HELP_STRING([[--without-selinux]], [do not use SELinux, even on systems with SELinux]),
+@@ -87,16 +88,4 @@ AC_DEFUN([gl_LIBSELINUX],
+ LIBS=$gl_saved_LIBS
+ fi
+ AC_SUBST([LIB_SELINUX])
+-
+- # Warn if SELinux is found but libselinux is absent;
+- if test "$ac_cv_search_getfilecon_raw" = no; then
+- if test "$host" = "$build" \
+- && { test -d /sys/fs/selinux || test -d /selinux; }; then
+- AC_MSG_WARN([This system supports SELinux but libselinux is missing.])
+- AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.])
+- fi
+- if test "$with_selinux" = maybe; then
+- with_selinux=no
+- fi
+- fi
+ ])
diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4
-index baa2cf4..b287c5b 100644
+index d9305cd..2501461 100644
--- a/libtextstyle/gnulib-local/m4/libglib.m4
+++ b/libtextstyle/gnulib-local/m4/libglib.m4
-@@ -7,106 +7,26 @@ dnl with or without modifications, as long as this notice is preserved.
+@@ -8,106 +8,26 @@ dnl This file is offered as-is, without any warranty.

dnl From Bruno Haible.

@@ -271,10 +301,10 @@ index baa2cf4..b287c5b 100644
AC_SUBST([LTLIBGLIB])
AC_SUBST([INCGLIB])
diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4
-index baa2cf4..b287c5b 100644
+index d9305cd..2501461 100644
--- a/libtextstyle/gnulib-m4/libglib.m4
+++ b/libtextstyle/gnulib-m4/libglib.m4
-@@ -7,106 +7,26 @@ dnl with or without modifications, as long as this notice is preserved.
+@@ -8,106 +8,26 @@ dnl This file is offered as-is, without any warranty.

dnl From Bruno Haible.

@@ -394,37 +424,3 @@ index baa2cf4..b287c5b 100644
AC_SUBST([LIBGLIB])
AC_SUBST([LTLIBGLIB])
AC_SUBST([INCGLIB])
-
-diff --git a/gettext-tools/gnulib-m4/selinux-selinux-h.m4 b/gettext-tools/gnulib-m4/selinux-selinux-h.m4
-index e2613fa..2a733a7 100644
---- a/gettext-tools/gnulib-m4/selinux-selinux-h.m4
-+++ b/gettext-tools/gnulib-m4/selinux-selinux-h.m4
-@@ -71,6 +71,7 @@ AC_DEFUN([gl_LIBSELINUX],
- [
- AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_CANONICAL_BUILD])
-+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-
- AC_ARG_WITH([selinux],
- AS_HELP_STRING([[--without-selinux]], [do not use SELinux, even on systems with SELinux]),
-@@ -79,19 +80,8 @@ AC_DEFUN([gl_LIBSELINUX],
- LIB_SELINUX=
- if test "$with_selinux" != no; then
- gl_saved_LIBS=$LIBS
-- AC_SEARCH_LIBS([setfilecon], [selinux],
-- [test "$ac_cv_search_setfilecon" = "none required" ||
-- LIB_SELINUX=$ac_cv_search_setfilecon])
-+ PKG_CHECK_MODULES([SELINUX], [libselinux], [LIB_SELINUX=$SELINUX_LIBS])
- LIBS=$gl_saved_LIBS
- fi
- AC_SUBST([LIB_SELINUX])
--
-- # Warn if SELinux is found but libselinux is absent;
-- if test "$ac_cv_search_setfilecon" = no; then
-- if test "$host" = "$build" && test -d /selinux; then
-- AC_MSG_WARN([This system supports SELinux but libselinux is missing.])
-- AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.])
-- fi
-- with_selinux=no
-- fi
- ])
diff --git a/meta/recipes-core/gettext/gettext_0.26.bb b/meta/recipes-core/gettext/gettext_1.0.bb
similarity index 100%
rename from meta/recipes-core/gettext/gettext_0.26.bb
rename to meta/recipes-core/gettext/gettext_1.0.bb
--
2.49.1