Skip to content

Commit 8a65cfa

Browse files
committed
Update harfbuzz to v8.4.0
1 parent 3a2436b commit 8a65cfa

6 files changed

+33
-8
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ the requirements.
6868
| [sqlite](http://sqlite.org) | 3.45.2 | 2024-03-12 |
6969
| [woff2](https://github.com/google/woff2) | 1.0.2 | 2017-11-13 |
7070
| [freetype](https://www.freetype.org) | 2.13.2 | 2023-08-25 |
71-
| [harfbuzz](https://github.com/harfbuzz/harfbuzz) | 8.3.1 | 2024-03-16 |
71+
| [harfbuzz](https://github.com/harfbuzz/harfbuzz) | 8.4.0 | 2024-03-29 |
7272
| [pixman](http://www.pixman.org) | 0.42.2 | 2022-11-02 |
7373
| [cairo](https://gitlab.freedesktop.org/cairo/cairo) | 1.18.0 | 2023-09-23 |
7474
| [libpsl](https://github.com/rockdaboot/libpsl) | 0.21.5 | 2024-01-13 |

ports/harfbuzz/patches/0001-Use-find_package-for-ICU.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 90f13e3f8a0cc7343f898ab163f2e2751ea6596e Mon Sep 17 00:00:00 2001
1+
From 6aabb252cd150a2c331df665680c5f6b5d62377d Mon Sep 17 00:00:00 2001
22
From: Don <don.j.olmstead@gmail.com>
33
Date: Tue, 5 Nov 2019 16:56:34 -0800
4-
Subject: [PATCH 1/2] Use find_package for ICU
4+
Subject: [PATCH 1/3] Use find_package for ICU
55

66
---
77
CMakeLists.txt | 7 +------

ports/harfbuzz/patches/0002-Adjust-CMake-for-vcpkg.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From c6153302b58f3735fdf56879b5bf973a2c46aadc Mon Sep 17 00:00:00 2001
1+
From 298ee6c729bd69fa668da1e3488492e78be8b039 Mon Sep 17 00:00:00 2001
22
From: Don <don.j.olmstead@gmail.com>
33
Date: Tue, 5 Nov 2019 16:57:32 -0800
4-
Subject: [PATCH 2/2] Adjust CMake for vcpkg
4+
Subject: [PATCH 2/3] Adjust CMake for vcpkg
55

66
---
77
CMakeLists.txt | 2 +-
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From a855d6148c05a4616bed66c81504a721a60bf03a Mon Sep 17 00:00:00 2001
2+
From: Don <don.j.olmstead@gmail.com>
3+
Date: Sat, 24 Sep 2022 18:57:06 -0700
4+
Subject: [PATCH 3/3] Remove icu-uc from pkgconfig
5+
6+
The icu build doesn't output a pkgconfig so vcpkg will fail to fix up harfbuzz's pkgconfig.
7+
---
8+
src/harfbuzz-icu.pc.in | 1 -
9+
1 file changed, 1 deletion(-)
10+
11+
diff --git a/src/harfbuzz-icu.pc.in b/src/harfbuzz-icu.pc.in
12+
index 949869a35..5be5b2686 100644
13+
--- a/src/harfbuzz-icu.pc.in
14+
+++ b/src/harfbuzz-icu.pc.in
15+
@@ -8,6 +8,5 @@ Description: HarfBuzz text shaping library ICU integration
16+
Version: %VERSION%
17+
18+
Requires: harfbuzz
19+
-Requires.private: icu-uc
20+
Libs: -L${libdir} -lharfbuzz-icu
21+
Cflags: -I${includedir}/harfbuzz
22+
--
23+
2.44.0.windows.1
24+

ports/harfbuzz/portfile.cmake

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
set(VERSION 8.3.1)
1+
set(VERSION 8.4.0)
22

33
# Get archive
44
vcpkg_download_distfile(ARCHIVE
55
URLS "https://github.com/harfbuzz/harfbuzz/releases/download/${VERSION}/harfbuzz-${VERSION}.tar.xz"
66
FILENAME "harfbuzz-${VERSION}.tar.xz"
7-
SHA512 47bb8150faf215d317a434f78c3029261924aae5ff479fbd3a5d62dbbbfce159460fcbc6f53c3c8ec85b09fad5ae0c9d591d67a0ca70424f43ed5b7849eef4ea
7+
SHA512 9d79ea86f7642f2f1a8726e12a48363eb395162c9b50524e7651b63ad3bb458a69fc82427dbcbfe2550231138f7e454b2c12097a51890f63c645fa3dc668f542
88
)
99

1010
# Patches
1111
set(PATCHES
1212
${CMAKE_CURRENT_LIST_DIR}/patches/0001-Use-find_package-for-ICU.patch
1313
${CMAKE_CURRENT_LIST_DIR}/patches/0002-Adjust-CMake-for-vcpkg.patch
14+
${CMAKE_CURRENT_LIST_DIR}/patches/0003-Remove-icu-uc-from-pkgconfig.patch
1415
)
1516

1617
# Extract archive

ports/harfbuzz/vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "harfbuzz",
3-
"version": "8.3.1",
3+
"version": "8.4.0",
44
"description": "HarfBuzz OpenType text shaping engine",
55
"homepage": "https://github.com/harfbuzz/harfbuzz",
66
"license": "MIT-Modern-Variant",

0 commit comments

Comments
 (0)