summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2025-06-04 16:44:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-06-05 11:02:22 +0100
commit317efba1a97c89c9c99723ed9d54ef6b9fadc0a0 (patch)
tree4f58b3f3ac96fa21910e50d457f64677b3c42cbf
parent4a913de4d939b0805e5c85bc5d87e7a9796c1e6b (diff)
downloadpoky-317efba1a97c89c9c99723ed9d54ef6b9fadc0a0.tar.gz
harfbuzz: upgrade 11.2.0 -> 11.2.1
0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch refreshed for 11.2.1 (From OE-Core rev: ee08e9ee2ae9d6df1d939cc10b3944a1dda154e9) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz/0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch14
-rw-r--r--meta/recipes-graphics/harfbuzz/harfbuzz_11.2.1.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_11.2.0.bb)2
2 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch
index 299843797b..38ff58fce5 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch
@@ -1,4 +1,4 @@
1From 8d876ea19579ee6b687668921c17be423cf7d6c2 Mon Sep 17 00:00:00 2001 1From a4325b6f6ddbebf3ecaee8f3825a2f03096adb6d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 27 Apr 2025 15:26:09 -0700 3Date: Sun, 27 Apr 2025 15:26:09 -0700
4Subject: [PATCH] Use -Os to compile hb-subset-plan-layout.cc 4Subject: [PATCH] Use -Os to compile hb-subset-plan-layout.cc
@@ -17,10 +17,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17 1 file changed, 12 insertions(+), 3 deletions(-) 17 1 file changed, 12 insertions(+), 3 deletions(-)
18 18
19diff --git a/src/meson.build b/src/meson.build 19diff --git a/src/meson.build b/src/meson.build
20index 3d1c00d..fded728 100644 20index cbe5d9e..d7fc764 100644
21--- a/src/meson.build 21--- a/src/meson.build
22+++ b/src/meson.build 22+++ b/src/meson.build
23@@ -393,7 +393,6 @@ hb_subset_sources = files( 23@@ -398,7 +398,6 @@ hb_subset_sources = files(
24 'hb-subset-instancer-solver.hh', 24 'hb-subset-instancer-solver.hh',
25 'hb-subset-instancer-solver.cc', 25 'hb-subset-instancer-solver.cc',
26 'hb-subset-plan.cc', 26 'hb-subset-plan.cc',
@@ -28,7 +28,7 @@ index 3d1c00d..fded728 100644
28 'hb-subset-plan-var.cc', 28 'hb-subset-plan-var.cc',
29 'hb-subset-plan.hh', 29 'hb-subset-plan.hh',
30 'hb-subset-plan-member-list.hh', 30 'hb-subset-plan-member-list.hh',
31@@ -410,6 +409,10 @@ hb_subset_sources = files( 31@@ -415,6 +414,10 @@ hb_subset_sources = files(
32 'hb-subset.hh', 32 'hb-subset.hh',
33 ) 33 )
34 34
@@ -39,7 +39,7 @@ index 3d1c00d..fded728 100644
39 hb_subset_headers = files( 39 hb_subset_headers = files(
40 'hb-subset.h', 40 'hb-subset.h',
41 'hb-subset-serialize.h' 41 'hb-subset-serialize.h'
42@@ -618,6 +621,12 @@ endif 42@@ -629,6 +632,12 @@ endif
43 43
44 darwin_versions = [hb_version_int, '@0@.0.0'.format(hb_version_int)] 44 darwin_versions = [hb_version_int, '@0@.0.0'.format(hb_version_int)]
45 45
@@ -52,7 +52,7 @@ index 3d1c00d..fded728 100644
52 libharfbuzz = library('harfbuzz', hb_sources, 52 libharfbuzz = library('harfbuzz', hb_sources,
53 include_directories: incconfig, 53 include_directories: incconfig,
54 dependencies: harfbuzz_deps, 54 dependencies: harfbuzz_deps,
55@@ -645,7 +654,7 @@ defs_list += [harfbuzz_subset_def] 55@@ -656,7 +665,7 @@ defs_list += [harfbuzz_subset_def]
56 libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, 56 libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
57 include_directories: incconfig, 57 include_directories: incconfig,
58 dependencies: [m_dep], 58 dependencies: [m_dep],
@@ -61,7 +61,7 @@ index 3d1c00d..fded728 100644
61 cpp_args: cpp_args + extra_hb_cpp_args, 61 cpp_args: cpp_args + extra_hb_cpp_args,
62 soversion: hb_so_version, 62 soversion: hb_so_version,
63 version: version, 63 version: version,
64@@ -657,7 +666,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, 64@@ -668,7 +677,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
65 custom_target('harfbuzz-subset.cc', 65 custom_target('harfbuzz-subset.cc',
66 build_by_default: true, 66 build_by_default: true,
67 output: 'harfbuzz-subset.cc', 67 output: 'harfbuzz-subset.cc',
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_11.2.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_11.2.1.bb
index db5a04486c..71eada7f28 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_11.2.0.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_11.2.1.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \
10 10
11SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" 11SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz"
12SRC_URI += "file://0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch" 12SRC_URI += "file://0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch"
13SRC_URI[sha256sum] = "50f7d0a208367e606dbf6eecc5cfbecc01a47be6ee837ae7aff2787e24b09b45" 13SRC_URI[sha256sum] = "093714c8548a285094685f0bdc999e202d666b59eeb3df2ff921ab68b8336a49"
14 14
15DEPENDS += "glib-2.0-native" 15DEPENDS += "glib-2.0-native"
16 16