diff options
author | Alexander Kanavin <alex@linutronix.de> | 2024-05-27 20:12:08 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-30 09:04:14 +0100 |
commit | 0a5d7ba4a0973d4e712aba6586b9613cef858fc6 (patch) | |
tree | 0e4e34f562f121fcf097fc129e40b32b9025b248 /meta | |
parent | 79f67e4b8f300964d6793b6ad5f34f84dbabe5ef (diff) | |
download | poky-0a5d7ba4a0973d4e712aba6586b9613cef858fc6.tar.gz |
icu: upgrade 74-2 -> 75-1
License-update: copyright years
(From OE-Core rev: 828b25dd17cd148ff0c1f852d6581359e5b6ee20)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb | 3 | ||||
-rw-r--r-- | meta/recipes-support/icu/icu_75-1.bb (renamed from meta/recipes-support/icu/icu_74-2.bb) | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb index 97efc56c64..6b0eb12046 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" | |||
32 | 32 | ||
33 | LEAD_SONAME = "libharfbuzz.so" | 33 | LEAD_SONAME = "libharfbuzz.so" |
34 | 34 | ||
35 | # Remove when https://github.com/harfbuzz/harfbuzz/issues/4671 is resolved | ||
36 | EXTRA_OEMESON += "-Dcpp_std=c++17" | ||
37 | |||
35 | do_install:append() { | 38 | do_install:append() { |
36 | # If no tools are installed due to PACKAGECONFIG then this directory might | 39 | # If no tools are installed due to PACKAGECONFIG then this directory might |
37 | # still be installed, so remove it to stop packaging warnings. | 40 | # 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 index 8352bf2a5b..14fbf31de5 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.*" | |||
78 | 78 | ||
79 | BBCLASSEXTEND = "native nativesdk" | 79 | BBCLASSEXTEND = "native nativesdk" |
80 | 80 | ||
81 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=08dc3852df8fffa807301902ad899ff8" | 81 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=9cf7c317c3f2a0962437465a9022dbe9" |
82 | 82 | ||
83 | def icu_download_version(d): | 83 | def icu_download_version(d): |
84 | pvsplit = d.getVar('PV').split('-') | 84 | pvsplit = d.getVar('PV').split('-') |
@@ -111,8 +111,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ | |||
111 | SRC_URI:append:class-target = "\ | 111 | SRC_URI:append:class-target = "\ |
112 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | 112 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ |
113 | " | 113 | " |
114 | SRC_URI[code.sha256sum] = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c" | 114 | SRC_URI[code.sha256sum] = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef" |
115 | SRC_URI[data.sha256sum] = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6" | 115 | SRC_URI[data.sha256sum] = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1" |
116 | 116 | ||
117 | UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" | 117 | UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" |
118 | GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" | 118 | GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" |