diff options
Diffstat (limited to 'meta/recipes-graphics/harfbuzz')
| -rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb (renamed from meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb) | 19 |
2 files changed, 10 insertions, 36 deletions
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch b/meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch deleted file mode 100644 index 029ca2bfff..0000000000 --- a/meta/recipes-graphics/harfbuzz/harfbuzz/0001-fix-signedness-of-char-in-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1bd3884bc0544ffbb6545ed2391f0932bb8d7d91 Mon Sep 17 00:00:00 2001 -From: psykose <alice@ayaya.dev> -Date: Mon, 1 Aug 2022 07:45:25 +0000 -Subject: [PATCH] fix signedness of char in tests - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - src/test-repacker.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/test-repacker.cc b/src/test-repacker.cc -index 053c0c6..1b7e1f0 100644 ---- a/src/test-repacker.cc -+++ b/src/test-repacker.cc -@@ -112,9 +112,9 @@ static void start_lookup (int8_t type, - hb_serialize_context_t* c) - { - char lookup[] = { -- 0, type, // type -+ 0, (char)type, // type - 0, 0, // flag -- 0, num_subtables, // num subtables -+ 0, (char)num_subtables, // num subtables - }; - - start_object (lookup, 6, c); diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb index 4905e8e2ad..fc6951d9ed 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_8.4.0.bb @@ -4,14 +4,14 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \ +LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \ file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \ " -SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz \ - file://0001-fix-signedness-of-char-in-tests.patch \ - " -SRC_URI[sha256sum] = "2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05" +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e" + +DEPENDS += "glib-2.0-native" inherit meson pkgconfig lib_package gtk-doc gobject-introspection github-releases @@ -22,9 +22,10 @@ GTKDOC_MESON_DISABLE_FLAG = 'disabled' PACKAGECONFIG ??= "cairo freetype glib icu" PACKAGECONFIG[cairo] = "-Dcairo=enabled,-Dcairo=disabled,cairo" +PACKAGECONFIG[chafa] = "-Dchafa=enabled,-Dchafa=disabled,chafa" PACKAGECONFIG[freetype] = "-Dfreetype=enabled,-Dfreetype=disabled,freetype" PACKAGECONFIG[glib] = "-Dglib=enabled,-Dglib=disabled,glib-2.0" -PACKAGECONFIG[graphite] = "-Dgraphite=enabled,-Dgraphite=disabled,graphite2" +PACKAGECONFIG[graphite] = "-Dgraphite2=enabled,-Dgraphite2=disabled,graphite2" PACKAGECONFIG[icu] = "-Dicu=enabled,-Dicu=disabled,icu" PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" @@ -32,9 +33,9 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" LEAD_SONAME = "libharfbuzz.so" do_install:append() { - # If no tools are installed due to PACKAGECONFIG then this directory is - #still installed, so remove it to stop packaging wanings. - rmdir --ignore-fail-on-non-empty ${D}${bindir} + # If no tools are installed due to PACKAGECONFIG then this directory might + # still be installed, so remove it to stop packaging warnings. + [ ! -d ${D}${bindir} ] || rmdir --ignore-fail-on-non-empty ${D}${bindir} } FILES:${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" |