From: Marcel Ziswiler <[email protected]> Subject: [PATCH] gettext: upgrade 0.22.5 -> 0.23 Date: 12/23/2024 09:30:24 PM
Signed-off-by: Marcel Ziswiler <[email protected]> --- ...22.5.bb => gettext-minimal-native_0.23.bb} | 2 +- meta/recipes-core/gettext/gettext-sources.inc | 2 +- ...t-env.in-do-not-add-C-CXX-parameters.patch | 4 +-- ...1-intl-Fix-build-failure-with-make-j.patch | 35 ------------------- ...01-tests-autopoint-3-unset-MAKEFLAGS.patch | 4 +-- .../gettext/gettext/parallel.patch | 10 +++--- .../gettext/gettext/serial-tests-config.patch | 8 ++--- .../gettext/gettext/use-pkgconfig.patch | 16 ++++----- .../{gettext_0.22.5.bb => gettext_0.23.bb} | 3 +- 9 files changed, 24 insertions(+), 60 deletions(-) rename meta/recipes-core/gettext/{gettext-minimal-native_0.22.5.bb => gettext-minimal-native_0.23.bb} (94%) delete mode 100644 meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch rename meta/recipes-core/gettext/{gettext_0.22.5.bb => gettext_0.23.bb} (98%) diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb b/meta/recipes-core/gettext/gettext- minimal-native_0.23.bb similarity index 94% rename from meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb rename to meta/recipes-core/gettext/gettext-minimal-native_0.23.bb index 96acf9bb9f..ce18a3b0bc 100644 --- a/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb +++ b/meta/recipes-core/gettext/gettext-minimal-native_0.23.bb @@ -42,5 +42,5 @@ do_install () { install -d ${D}${datadir}/gettext/po/ cp ${S}/build-aux/config.rpath ${D}${datadir}/gettext/ cp ${S}/gettext-runtime/po/Makefile.in.in ${D}${datadir}/gettext/po/ - cp ${S}/gettext-runtime/po/remove-potcdate.sin ${D}${datadir}/gettext/po/ + cp ${S}/gettext-runtime/po/remove-potcdate.sed ${D}${datadir}/gettext/po/remove-potcdate.sin } diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc index fd05837528..9805b1d907 100644 --- 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] = "ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0" +SRC_URI[sha256sum] = "945dd7002a02dd7108ad0510602e13416b41d327898cf8522201bc6af10907a6" 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 33d45a038c..e7cb93d6e2 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 @@ -24,6 +24,6 @@ index cc84ffd..b69c990 100644 -CFLAGS="@CFLAGS@" -CXX="@CXX@" -CXXFLAGS="@CXXFLAGS@" + OBJC="@OBJC@" + OBJCFLAGS="@OBJCFLAGS@" CPPFLAGS="@CPPFLAGS@" - LDFLAGS="@LDFLAGS@" - LTLIBINTL="@LTLIBINTL@" diff --git a/meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch b/meta/recipes- core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch deleted file mode 100644 index 144259dd3f..0000000000 --- a/meta/recipes-core/gettext/gettext/0001-intl-Fix-build-failure-with-make-j.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 97a6a63ad61949663283f5fad68c9d5fb9be1f15 Mon Sep 17 00:00:00 2001 -From: Bruno Haible <[email protected]> -Date: Tue, 12 Sep 2023 11:33:41 +0200 -Subject: [PATCH] intl: Fix build failure with "make -j". - -Reported by Christian Weisgerber <[email protected]> at -<https://lists.gnu.org/archive/html/bug-gettext/2023-09/msg00005.html>. - -* gettext-runtime/intl/Makefile.am (langprefs.lo, log.lo): Depend on gettextP.h -and its subordinate includes. - -Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=97a6a63ad61949663283f5fad68c9d5fb9be1f15] -Signed-off-by: Changqing Li <[email protected]> ---- - gettext-runtime/intl/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am -index da7abb758..9e56978bc 100644 ---- a/gettext-runtime/intl/Makefile.am -+++ b/gettext-runtime/intl/Makefile.am -@@ -387,8 +387,8 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo - ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h - plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS) - plural-exp.lo: ../config.h $(srcdir)/plural-exp.h --langprefs.lo: ../config.h --log.lo: ../config.h -+langprefs.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h -+log.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h - printf.lo: ../config.h - setlocale.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h - version.lo: ../config.h libgnuintl.h --- -2.25.1 - 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 94afb255c3..6aa1b7d851 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 @@ -16,10 +16,10 @@ diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 index bd3fbf3..380eaac 100755 --- a/gettext-tools/tests/autopoint-3 +++ b/gettext-tools/tests/autopoint-3 -@@ -131,6 +131,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; } - ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err +@@ -137,6 +137,7 @@ ${CONFIG_SHELL} ./configure >/dev/null 2>autopoint.err test $? = 0 || { cat autopoint.err; Exit 1; } + : ${MAKE=make} +unset MAKEFLAGS ${MAKE} >/dev/null 2>autopoint.err test $? = 0 || { cat autopoint.err; Exit 1; } diff --git a/meta/recipes-core/gettext/gettext/parallel.patch b/meta/recipes- core/gettext/gettext/parallel.patch index 8ecba46fd0..22515c24ac 100644 --- a/meta/recipes-core/gettext/gettext/parallel.patch +++ b/meta/recipes-core/gettext/gettext/parallel.patch @@ -1,4 +1,4 @@ -From 83333bc873c2655ff1de161f6b7db930f22f1cea Mon Sep 17 00:00:00 2001 +From f2455b7ab3826875d09eb3a11fbb830dd856f974 Mon Sep 17 00:00:00 2001 From: Joe Slater <[email protected]> Date: Thu, 7 Jun 2012 16:37:01 -0700 Subject: [PATCH] instal libgettextlib.a before removing it @@ -15,12 +15,12 @@ Signed-off-by: Joe Slater <[email protected]> 1 file changed, 4 insertions(+) diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am -index ab729cd..a0d713e 100644 +index a7fa494..4d0536a 100644 --- a/gettext-tools/gnulib-lib/Makefile.am +++ b/gettext-tools/gnulib-lib/Makefile.am -@@ -58,6 +58,10 @@ AM_CFLAGS = @WARN_CFLAGS@ - # Rules generated and collected by gnulib-tool. - include Makefile.gnulib +@@ -88,6 +88,10 @@ endif + libgettextlib_la_LIBADD += $(WOE32_LIBADD) + libgettextlib_la_DEPENDENCIES += $(WOE32_LIBADD) +# defined in Makefile.gnulib but missing this dependency +# diff --git a/meta/recipes-core/gettext/gettext/serial-tests-config.patch b/meta/recipes- core/gettext/gettext/serial-tests-config.patch index 7d39d6086a..3c354c21ff 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 @@ -From aa8dfe0aafd0b53a6c5bac61b356ca92e1430a36 Mon Sep 17 00:00:00 2001 +From 111376001f75209d9342c8f2c6495c99a443da7f Mon Sep 17 00:00:00 2001 From: "Hongjun.Yang" <[email protected]> Date: Thu, 28 Jul 2016 12:36:15 +0800 Subject: [PATCH] fix for ptest @@ -15,7 +15,7 @@ Signed-off-by: Changqing Li <[email protected]> 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index f4e54ea..a47ff14 100644 +index 5106676..3114998 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext], @@ -28,7 +28,7 @@ index f4e54ea..a47ff14 100644 dnl Override automake's tar command used for creating distributions. am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac -index 126d069..aa23232 100644 +index e128f5b..9f7447c 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -22,7 +22,7 @@ AC_INIT([gettext-runtime], @@ -41,7 +41,7 @@ index 126d069..aa23232 100644 dnl Installation directories. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac -index 3610ee3..6f56a23 100644 +index 034936c..d31decf 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -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 ceb1856118..796b700056 100644 --- a/meta/recipes-core/gettext/gettext/use-pkgconfig.patch +++ b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch @@ -1,4 +1,4 @@ -From 6aa1338b916fe72c200b6f160b934be15b6ff590 Mon Sep 17 00:00:00 2001 +From 54ae005d0258d1e2041304c5568de768ad8c3248 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 23 Jan 2018 00:54:13 +0000 Subject: [PATCH] gettext: beat library detection into shape @@ -19,10 +19,10 @@ Signed-off-by: Ross Burton <[email protected]> 3 files changed, 31 insertions(+), 286 deletions(-) diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4 -index 0340490..0355388 100644 +index c7160d7..8e46cc7 100644 --- a/gettext-tools/gnulib-m4/libxml.m4 +++ b/gettext-tools/gnulib-m4/libxml.m4 -@@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) +@@ -14,6 +14,7 @@ dnl gl_LIBXML(FORCE-INCLUDED) dnl forces the use of the included or an external libxml. AC_DEFUN([gl_LIBXML], [ @@ -30,7 +30,7 @@ index 0340490..0355388 100644 AC_REQUIRE([AM_ICONV_LINK]) ifelse([$1], , [ -@@ -30,106 +31,10 @@ AC_DEFUN([gl_LIBXML], +@@ -31,106 +32,10 @@ AC_DEFUN([gl_LIBXML], INCXML= ifelse([$1], [yes], , [ if test "$gl_cv_libxml_use_included" != yes; then @@ -142,10 +142,10 @@ index 0340490..0355388 100644 ]) AC_SUBST([LIBXML]) diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4 -index dbc9eb8..136e512 100644 +index baa2cf4..b287c5b 100644 --- a/libtextstyle/gnulib-local/m4/libglib.m4 +++ b/libtextstyle/gnulib-local/m4/libglib.m4 -@@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. +@@ -7,106 +7,26 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. @@ -266,10 +266,10 @@ index dbc9eb8..136e512 100644 AC_SUBST([LTLIBGLIB]) AC_SUBST([INCGLIB]) diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4 -index dbc9eb8..136e512 100644 +index baa2cf4..b287c5b 100644 --- a/libtextstyle/gnulib-m4/libglib.m4 +++ b/libtextstyle/gnulib-m4/libglib.m4 -@@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved. +@@ -7,106 +7,26 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. diff --git a/meta/recipes-core/gettext/gettext_0.22.5.bb b/meta/recipes-core/gettext/gettext_0.23.bb similarity index 98% rename from meta/recipes-core/gettext/gettext_0.22.5.bb rename to meta/recipes-core/gettext/gettext_0.23.bb index 0bf2a56e5f..181457f771 100644 --- a/meta/recipes-core/gettext/gettext_0.22.5.bb +++ b/meta/recipes-core/gettext/gettext_0.23.bb @@ -28,7 +28,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://0001-intl-Fix-build-failure-with-make-j.patch \ " inherit autotools texinfo pkgconfig ptest @@ -130,7 +129,7 @@ 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 + rm ${D}${datadir}/gettext/po/remove-potcdate.sed create_wrapper ${D}${bindir}/msgfmt \ GETTEXTDATADIR="${STAGING_DATADIR_NATIVE}/gettext-${PV}/" -- 2.47.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#209053): https://lists.openembedded.org/g/openembedded-core/message/209053 Mute This Topic: https://lists.openembedded.org/mt/110264446/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
