From 828b25dd17cd148ff0c1f852d6581359e5b6ee20 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 27 May 2024 20:12:08 +0200 Subject: [PATCH] icu: upgrade 74-2 -> 75-1 License-update: copyright years Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb | 3 +++ meta/recipes-support/icu/{icu_74-2.bb => icu_75-1.bb} | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) rename meta/recipes-support/icu/{icu_74-2.bb => icu_75-1.bb} (95%) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb index 97efc56c646..6b0eb120461 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb @@ -32,6 +32,9 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" LEAD_SONAME = "libharfbuzz.so" +# Remove when https://github.com/harfbuzz/harfbuzz/issues/4671 is resolved +EXTRA_OEMESON += "-Dcpp_std=c++17" + do_install:append() { # If no tools are installed due to PACKAGECONFIG then this directory might # still be installed, so remove it to stop packaging warnings. diff --git a/meta/recipes-support/icu/icu_74-2.bb b/meta/recipes-support/icu/icu_75-1.bb similarity index 95% rename from meta/recipes-support/icu/icu_74-2.bb rename to meta/recipes-support/icu/icu_75-1.bb index 8352bf2a5b4..14fbf31de57 100644 --- a/meta/recipes-support/icu/icu_74-2.bb +++ b/meta/recipes-support/icu/icu_75-1.bb @@ -78,7 +78,7 @@ FILES:libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" -LIC_FILES_CHKSUM = "file://../LICENSE;md5=08dc3852df8fffa807301902ad899ff8" +LIC_FILES_CHKSUM = "file://../LICENSE;md5=9cf7c317c3f2a0962437465a9022dbe9" def icu_download_version(d): pvsplit = d.getVar('PV').split('-') @@ -111,8 +111,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ SRC_URI:append:class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[code.sha256sum] = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c" -SRC_URI[data.sha256sum] = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6" +SRC_URI[code.sha256sum] = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef" +SRC_URI[data.sha256sum] = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1" UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P(?!.+rc).+)" GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" -- 2.47.3