From ee08e9ee2ae9d6df1d939cc10b3944a1dda154e9 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 4 Jun 2025 16:44:55 +0800 Subject: [PATCH] harfbuzz: upgrade 11.2.0 -> 11.2.1 0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch refreshed for 11.2.1 Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...se-Os-to-compile-hb-subset-plan-layout.cc.patch | 14 +++++++------- .../{harfbuzz_11.2.0.bb => harfbuzz_11.2.1.bb} | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename meta/recipes-graphics/harfbuzz/{harfbuzz_11.2.0.bb => harfbuzz_11.2.1.bb} (95%) 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 299843797be..38ff58fce5e 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 @@ -From 8d876ea19579ee6b687668921c17be423cf7d6c2 Mon Sep 17 00:00:00 2001 +From a4325b6f6ddbebf3ecaee8f3825a2f03096adb6d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 27 Apr 2025 15:26:09 -0700 Subject: [PATCH] Use -Os to compile hb-subset-plan-layout.cc @@ -17,10 +17,10 @@ Signed-off-by: Khem Raj 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/meson.build b/src/meson.build -index 3d1c00d..fded728 100644 +index cbe5d9e..d7fc764 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -393,7 +393,6 @@ hb_subset_sources = files( +@@ -398,7 +398,6 @@ hb_subset_sources = files( 'hb-subset-instancer-solver.hh', 'hb-subset-instancer-solver.cc', 'hb-subset-plan.cc', @@ -28,7 +28,7 @@ index 3d1c00d..fded728 100644 'hb-subset-plan-var.cc', 'hb-subset-plan.hh', 'hb-subset-plan-member-list.hh', -@@ -410,6 +409,10 @@ hb_subset_sources = files( +@@ -415,6 +414,10 @@ hb_subset_sources = files( 'hb-subset.hh', ) @@ -39,7 +39,7 @@ index 3d1c00d..fded728 100644 hb_subset_headers = files( 'hb-subset.h', 'hb-subset-serialize.h' -@@ -618,6 +621,12 @@ endif +@@ -629,6 +632,12 @@ endif darwin_versions = [hb_version_int, '@0@.0.0'.format(hb_version_int)] @@ -52,7 +52,7 @@ index 3d1c00d..fded728 100644 libharfbuzz = library('harfbuzz', hb_sources, include_directories: incconfig, dependencies: harfbuzz_deps, -@@ -645,7 +654,7 @@ defs_list += [harfbuzz_subset_def] +@@ -656,7 +665,7 @@ defs_list += [harfbuzz_subset_def] libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, include_directories: incconfig, dependencies: [m_dep], @@ -61,7 +61,7 @@ index 3d1c00d..fded728 100644 cpp_args: cpp_args + extra_hb_cpp_args, soversion: hb_so_version, version: version, -@@ -657,7 +666,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, +@@ -668,7 +677,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, custom_target('harfbuzz-subset.cc', build_by_default: true, 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 similarity index 95% rename from meta/recipes-graphics/harfbuzz/harfbuzz_11.2.0.bb rename to meta/recipes-graphics/harfbuzz/harfbuzz_11.2.1.bb index db5a04486c9..71eada7f284 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 \ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" SRC_URI += "file://0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch" -SRC_URI[sha256sum] = "50f7d0a208367e606dbf6eecc5cfbecc01a47be6ee837ae7aff2787e24b09b45" +SRC_URI[sha256sum] = "093714c8548a285094685f0bdc999e202d666b59eeb3df2ff921ab68b8336a49" DEPENDS += "glib-2.0-native" -- 2.47.3