From f541b9fe410892476777af93ce36a1cce8664f00 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Thu, 15 Jan 2026 13:16:43 +0000
Subject: [PATCH] icu: upgrade 78.1 -> 78.2

---
 .../0001-Disable-LDFLAGSICUDT-for-Linux.patch | 10 ++--
 ...nicodeStringTest-TestLargeMemory-on-.patch | 18 +++----
 ...tput-compatible-with-Automake-format.patch | 39 +++++++-------
 .../icu/0001-icu-Added-armeb-support.patch    | 10 ++--
 .../icu/icu/0001-test-Add-support-ptest.patch | 51 +++++++++----------
 .../icu/{icu_78.1.bb => icu_78.2.bb}          |  2 +-
 6 files changed, 61 insertions(+), 69 deletions(-)
 rename meta/recipes-support/icu/{icu_78.1.bb => icu_78.2.bb} (98%)

diff --git a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
index c0e9e2806b..4ce2f938c2 100644
--- a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
+++ b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
@@ -1,4 +1,4 @@
-From 0f4e9eee64bd4220aa4fae1ab4f7bbf10b87cd69 Mon Sep 17 00:00:00 2001
+From 7ac9b69160ba5d19292504cf08804feb4697c8d5 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 15 Feb 2014 21:06:42 +0000
 Subject: [PATCH] Disable LDFLAGSICUDT for Linux
@@ -7,13 +7,13 @@ Upstream-Status: Inappropriate [ OE Configuration ]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
- config/mh-linux | 2 +-
+ source/config/mh-linux | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/config/mh-linux b/config/mh-linux
+diff --git a/source/config/mh-linux b/source/config/mh-linux
 index 53d6780..b622513 100644
---- a/config/mh-linux
-+++ b/config/mh-linux
+--- a/source/config/mh-linux
++++ b/source/config/mh-linux
 @@ -23,7 +23,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
  LD_RPATH_PRE = -Wl,-rpath,
  
diff --git a/meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch b/meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch
index e2e9546679..d4b4ee4242 100644
--- a/meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch
+++ b/meta/recipes-support/icu/icu/0001-ICU-23120-Mask-UnicodeStringTest-TestLargeMemory-on-.patch
@@ -1,20 +1,21 @@
-From 4b3e6888c2aaba6465f1bc96f61b17a2513050f3 Mon Sep 17 00:00:00 2001
+From c1662e60c68a87897c27f074b2ea2395637fe695 Mon Sep 17 00:00:00 2001
 From: David Seifert <soap@gentoo.org>
 Date: Sat, 21 Jun 2025 12:28:15 +0200
 Subject: [PATCH] ICU-23120 Mask UnicodeStringTest::TestLargeMemory on 32-bit
+
  platforms
 
 Upstream-Status: Submitted [https://github.com/unicode-org/icu/pull/3496]
 Signed-off-by: Daisuke Yamane <yamane07ynct@gmail.com>
 ---
- test/intltest/ustrtest.cpp | 2 +-
+ source/test/intltest/ustrtest.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp
-index 56976b3e3d2..26225f5b5b5 100644
---- a/test/intltest/ustrtest.cpp
-+++ b/test/intltest/ustrtest.cpp
-@@ -2353,7 +2353,7 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() {
+diff --git a/source/test/intltest/ustrtest.cpp b/source/test/intltest/ustrtest.cpp
+index 3f382c5..6049332 100644
+--- a/source/test/intltest/ustrtest.cpp
++++ b/source/test/intltest/ustrtest.cpp
+@@ -2375,7 +2375,7 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() {
  }
  
  void UnicodeStringTest::TestLargeMemory() {
@@ -23,6 +24,3 @@ index 56976b3e3d2..26225f5b5b5 100644
      if(quick) { return; }
      IcuTestErrorCode status(*this, "TestLargeMemory");
      constexpr uint32_t len = 2147483643;
--- 
-2.43.0
-
diff --git a/meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch b/meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch
index 484e1c7f6f..cfa849a472 100644
--- a/meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch
+++ b/meta/recipes-support/icu/icu/0001-Make-ICU-test-output-compatible-with-Automake-format.patch
@@ -1,4 +1,4 @@
-From 4779f798463d673dd74623979ec93141eb60d07a Mon Sep 17 00:00:00 2001
+From d85dcf9147f6b6d05e8d3bf690e586256547aef2 Mon Sep 17 00:00:00 2001
 From: Jiaying Song <jiaying.song.cn@windriver.com>
 Date: Fri, 21 Nov 2025 10:47:59 +0800
 Subject: [PATCH] Make ICU test output compatible with Automake format
@@ -16,16 +16,16 @@ Upstream-Status: Submitted [https://github.com/unicode-org/icu/pull/3764]
 
 Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
 ---
- configure.ac               | 17 +++++++++++++++++
- test/intltest/intltest.cpp | 10 +++++++++-
- tools/ctestfw/ctest.c      |  9 ++++++++-
+ source/configure.ac               | 17 +++++++++++++++++
+ source/test/intltest/intltest.cpp | 10 +++++++++-
+ source/tools/ctestfw/ctest.c      |  9 ++++++++-
  3 files changed, 34 insertions(+), 2 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index da4f170..514fa0c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1165,6 +1165,21 @@ If set, it will REPLACE any automatic list of libraries.],
+diff --git a/source/configure.ac b/source/configure.ac
+index 8ffacf8..9ba3b4e 100644
+--- a/source/configure.ac
++++ b/source/configure.ac
+@@ -1103,6 +1103,21 @@ If set, it will REPLACE any automatic list of libraries.],
  		*) AC_MSG_ERROR(bad value ${enableval} for --enable-samples) ;;
  		esac],
  	samples=true)
@@ -47,17 +47,17 @@ index da4f170..514fa0c 100644
  ICU_CONDITIONAL(SAMPLES, test "$samples" = true)
  
  ICUDATA_CHAR=$U_ENDIAN_CHAR
-@@ -1428,3 +1443,5 @@ then
+@@ -1366,3 +1381,5 @@ then
  fi
  
  $as_unset _CXX_CXXSUFFIX
 +
 +
-diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp
-index 33829b0..bf3ef56 100644
---- a/test/intltest/intltest.cpp
-+++ b/test/intltest/intltest.cpp
-@@ -830,11 +830,19 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName )
+diff --git a/source/test/intltest/intltest.cpp b/source/test/intltest/intltest.cpp
+index 5379479..579dcbc 100644
+--- a/source/test/intltest/intltest.cpp
++++ b/source/test/intltest/intltest.cpp
+@@ -824,11 +824,19 @@ UBool IntlTest::runTestLoop( char* testname, char* par, char *baseName )
              saveBaseLoc[0]=0; /* reset path */
              
              if (lastErrorCount == errorCount) {
@@ -78,10 +78,10 @@ index 33829b0..bf3ef56 100644
                  if(!no_time) str_timeDelta(msg+strlen(msg),timeStop-timeStart);
  
                  for(int i=0;i<LL_indentlevel;i++) {
-diff --git a/tools/ctestfw/ctest.c b/tools/ctestfw/ctest.c
+diff --git a/source/tools/ctestfw/ctest.c b/source/tools/ctestfw/ctest.c
 index 7634526..c2e11dd 100644
---- a/tools/ctestfw/ctest.c
-+++ b/tools/ctestfw/ctest.c
+--- a/source/tools/ctestfw/ctest.c
++++ b/source/tools/ctestfw/ctest.c
 @@ -413,9 +413,16 @@ static void iterateTestsWithLevel ( const TestNode* root,
          ctest_xml_testcase(pathToFunction, pathToFunction, timeSeconds, (myERROR_COUNT!=ERROR_COUNT)?"error":NULL);
  
@@ -100,6 +100,3 @@ index 7634526..c2e11dd 100644
            if(!ON_LINE) { /* had some output */
              int spaces = FLAG_INDENT-(depth-1);
              log_testinfo_i("} %*s[OK] ", spaces, "---");
--- 
-2.34.1
-
diff --git a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch
index a25285fb54..15d7edf714 100644
--- a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch
+++ b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch
@@ -1,4 +1,4 @@
-From cf55c077b77b7a219502364eaadf12c074ab005e Mon Sep 17 00:00:00 2001
+From 725b12ea7e21ba9c74188a180db22b2f92d69649 Mon Sep 17 00:00:00 2001
 From: Lei Maohui <leimaohui@cn.fujitsu.com>
 Date: Wed, 8 May 2019 14:42:30 +0900
 Subject: [PATCH] icu: Added armeb support.
@@ -9,13 +9,13 @@ Upstream-Status: Pending
 
 Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
 ---
- i18n/double-conversion-utils.h | 2 +-
+ source/i18n/double-conversion-utils.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h
+diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h
 index 303668f..7d859dc 100644
---- a/i18n/double-conversion-utils.h
-+++ b/i18n/double-conversion-utils.h
+--- a/source/i18n/double-conversion-utils.h
++++ b/source/i18n/double-conversion-utils.h
 @@ -146,7 +146,7 @@ int main(int argc, char** argv) {
  //
  // If it prints "correct" then the architecture should be here, in the "correct" section.
diff --git a/meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch b/meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch
index 88350c0db5..51d223ae19 100644
--- a/meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch
+++ b/meta/recipes-support/icu/icu/0001-test-Add-support-ptest.patch
@@ -1,4 +1,4 @@
-From 783d9e0d3d7824fbca53c2c3a80e8e5e23eacc82 Mon Sep 17 00:00:00 2001
+From 9ba05edeb4c9b1c583e773f0402f9761369a822a Mon Sep 17 00:00:00 2001
 From: Daisuke Yamane <yamane07ynct@gmail.com>
 Date: Tue, 1 Jul 2025 18:35:25 +0900
 Subject: [PATCH] test: Add support ptest
@@ -7,17 +7,17 @@ Upstream-Status: Inappropriate [oe-core specific]
 
 Signed-off-by: Daisuke Yamane <yamane07ynct@gmail.com>
 ---
- test/cintltst/Makefile.in  | 2 +-
- test/intltest/Makefile.in  | 2 +-
- test/intltest/intltest.cpp | 2 +-
- test/iotest/Makefile.in    | 2 +-
- test/letest/Makefile.in    | 2 +-
+ source/test/cintltst/Makefile.in  | 2 +-
+ source/test/intltest/Makefile.in  | 2 +-
+ source/test/intltest/intltest.cpp | 2 +-
+ source/test/iotest/Makefile.in    | 2 +-
+ source/test/letest/Makefile.in    | 2 +-
  5 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/test/cintltst/Makefile.in b/test/cintltst/Makefile.in
+diff --git a/source/test/cintltst/Makefile.in b/source/test/cintltst/Makefile.in
 index 552a105..9cf3071 100644
---- a/test/cintltst/Makefile.in
-+++ b/test/cintltst/Makefile.in
+--- a/source/test/cintltst/Makefile.in
++++ b/source/test/cintltst/Makefile.in
 @@ -39,7 +39,7 @@ CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ct
  ifdef QNX_TARGET
  DEFS += -D'ICU_UNICODE_VERSION="$(UNICODE_VERSION)"' -D'ICU_VERSION="@VERSION@"' -D'ICUDATA_NAME="$(ICUDATA_PLATFORM_NAME)"' -D'U_TOPSRCDIR="/var/icu_tests"' -D'U_TOPBUILDDIR="/var/icu_tests/"'
@@ -27,10 +27,10 @@ index 552a105..9cf3071 100644
  endif
  LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
  
-diff --git a/test/intltest/Makefile.in b/test/intltest/Makefile.in
-index 5d4a03b..ca4e4cd 100644
---- a/test/intltest/Makefile.in
-+++ b/test/intltest/Makefile.in
+diff --git a/source/test/intltest/Makefile.in b/source/test/intltest/Makefile.in
+index 2e44831..d5bd240 100644
+--- a/source/test/intltest/Makefile.in
++++ b/source/test/intltest/Makefile.in
 @@ -39,7 +39,7 @@ CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT=
  ifdef QNX_TARGET
  DEFS += -D'U_TOPSRCDIR="/var/icu_tests"' -D'U_TOPBUILDDIR="/var/icu_tests/"'
@@ -40,11 +40,11 @@ index 5d4a03b..ca4e4cd 100644
  endif
  LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(LIB_THREAD)
  
-diff --git a/test/intltest/intltest.cpp b/test/intltest/intltest.cpp
-index 3806d0f..33829b0 100644
---- a/test/intltest/intltest.cpp
-+++ b/test/intltest/intltest.cpp
-@@ -1713,7 +1713,7 @@ static bool fileExists(const char* fileName) {
+diff --git a/source/test/intltest/intltest.cpp b/source/test/intltest/intltest.cpp
+index a856715..5379479 100644
+--- a/source/test/intltest/intltest.cpp
++++ b/source/test/intltest/intltest.cpp
+@@ -1707,7 +1707,7 @@ static bool fileExists(const char* fileName) {
   * Returns the path to icu/testdata/
   */
  const char *IntlTest::getSharedTestData(UErrorCode& err) {
@@ -53,10 +53,10 @@ index 3806d0f..33829b0 100644
  #define REPO_TOP SOURCE_TARBALL_TOP ".." U_FILE_SEP_STRING
  #define FILE_NAME U_FILE_SEP_STRING "message2" U_FILE_SEP_STRING "valid-tests.json"
      const char *srcDataDir = nullptr;
-diff --git a/test/iotest/Makefile.in b/test/iotest/Makefile.in
+diff --git a/source/test/iotest/Makefile.in b/source/test/iotest/Makefile.in
 index 16c510f..9eeff4b 100644
---- a/test/iotest/Makefile.in
-+++ b/test/iotest/Makefile.in
+--- a/source/test/iotest/Makefile.in
++++ b/source/test/iotest/Makefile.in
 @@ -39,7 +39,7 @@ CPPFLAGS += -DUNISTR_FROM_CHAR_EXPLICIT= -DUNISTR_FROM_STRING_EXPLICIT=
  ifdef QNX_TARGET
  DEFS += -D'U_TOPSRCDIR="/var/icu_tests"' -D'U_TOPBUILDDIR="/var/icu_tests/"'
@@ -66,10 +66,10 @@ index 16c510f..9eeff4b 100644
  endif
  LIBS = $(LIBCTESTFW) $(LIBICUTOOLUTIL) $(LIBICUIO) $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M)
  
-diff --git a/test/letest/Makefile.in b/test/letest/Makefile.in
+diff --git a/source/test/letest/Makefile.in b/source/test/letest/Makefile.in
 index 156c86f..555a820 100644
---- a/test/letest/Makefile.in
-+++ b/test/letest/Makefile.in
+--- a/source/test/letest/Makefile.in
++++ b/source/test/letest/Makefile.in
 @@ -30,7 +30,7 @@ BUILDDIR := $(BUILDDIR:test\\cintltst/../../=)
  BUILDDIR := $(BUILDDIR:TEST\\CINTLTST/../../=)
  
@@ -79,6 +79,3 @@ index 156c86f..555a820 100644
  LIBS = $(LIBICULX) $(LIBICUUC) $(LIBICUI18N) $(LIBCTESTFW) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) $(ICULEHB_LIBS)
  
  COMMONOBJECTS = SimpleFontInstance.o
--- 
-2.43.0
-
diff --git a/meta/recipes-support/icu/icu_78.1.bb b/meta/recipes-support/icu/icu_78.2.bb
similarity index 98%
rename from meta/recipes-support/icu/icu_78.1.bb
rename to meta/recipes-support/icu/icu_78.2.bb
index 8827f05f51..e12f313bb8 100644
--- a/meta/recipes-support/icu/icu_78.1.bb
+++ b/meta/recipes-support/icu/icu_78.2.bb
@@ -116,7 +116,7 @@ SRC_URI = "${BASE_SRC_URI};name=code \
 SRC_URI:append:class-target = "\
            file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[code.sha256sum] = "6217f58ca39b23127605cfc6c7e0d3475fe4b0d63157011383d716cb41617886"
+SRC_URI[code.sha256sum] = "3e99687b5c435d4b209630e2d2ebb79906c984685e78635078b672e03c89df35"
 SRC_URI[data.sha256sum] = "e7b652244f27194e0ea46a0d21cfc714ee8a818e1fd82d51a93bc91516fdcf65"
 
 UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)"
-- 
2.47.1

