Skip to content

Commit 4fc6cb0

Browse files
authored
[harfbuzz] Various fixups (#51407)
1 parent bf15be4 commit 4fc6cb0

7 files changed

Lines changed: 29 additions & 44 deletions

File tree

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/src/gen-gpu-shader-artifacts.py b/src/gen-gpu-shader-artifacts.py
2+
index 6a7f7f903217ac7cd5d8937cc3a9dd48bee31c29..2f6999ef30ca9c86f73479d69edbaf960cf752a4 100755
3+
--- a/src/gen-gpu-shader-artifacts.py
4+
+++ b/src/gen-gpu-shader-artifacts.py
5+
@@ -38,6 +38,7 @@
6+
try:
7+
shutil.copyfile(OUTPUT, src_copy)
8+
except OSError:
9+
- import filecmp
10+
- if not filecmp.cmp(OUTPUT, src_copy, shallow=False):
11+
- sys.exit(f'{src_copy} is out of date; regenerate with a writable source tree')
12+
+ # Read as text to ignore line-ending changes
13+
+ with open(OUTPUT, 'r') as f1, open(src_copy, 'r') as f2:
14+
+ if f1.read() != f2.read():
15+
+ sys.exit(f'{src_copy} is out of date; regenerate with a writable source tree')

ports/harfbuzz/fix-win32-build.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

ports/harfbuzz/portfile.cmake

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ vcpkg_from_github(
55
SHA512 649521b69d5d7328245cabca8b769448f695b0b7e3bf16208ddb1635b29165dfd363a06b1b2831229f6ff722d0e8212fd82054e6b64992552a6a21af238c5cb3
66
HEAD_REF master
77
PATCHES
8-
fix-win32-build.patch
8+
fix-eol-mismatch.diff # https://github.com/harfbuzz/harfbuzz/commit/ab6aa4f449457be45e8e0218f7a8de271fb19967.diff?full_index=1
99
${ANDROID_LOCALECONV_L_PATCH}
1010
)
1111

@@ -88,8 +88,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
8888
endblock()
8989
endif()
9090

91+
set(LANGUAGES C CXX)
92+
if(VCPKG_TARGET_IS_APPLE)
93+
list(APPEND LANGUAGES OBJC OBJCXX)
94+
endif()
95+
9196
vcpkg_configure_meson(
9297
SOURCE_PATH "${SOURCE_PATH}"
98+
LANGUAGES ${LANGUAGES}
9399
OPTIONS
94100
${FEATURE_OPTIONS}
95101
-Ddocs=disabled # Generate documentation with gtk-doc
@@ -162,5 +168,3 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
162168
endif()
163169

164170
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
165-
166-
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

ports/harfbuzz/usage

Lines changed: 0 additions & 24 deletions
This file was deleted.

ports/harfbuzz/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "harfbuzz",
33
"version": "14.2.0",
4+
"port-version": 1,
45
"description": "HarfBuzz OpenType text shaping engine",
56
"homepage": "https://github.com/harfbuzz/harfbuzz",
67
"license": "MIT-Modern-Variant",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3722,7 +3722,7 @@
37223722
},
37233723
"harfbuzz": {
37243724
"baseline": "14.2.0",
3725-
"port-version": 0
3725+
"port-version": 1
37263726
},
37273727
"hash-library": {
37283728
"baseline": "8",

versions/h-/harfbuzz.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "1a0355d3c0f6be4f7e44747052609235a7377bda",
5+
"version": "14.2.0",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "f2d1eae0c76d7578d7d919decc6a25b09fd36042",
510
"version": "14.2.0",

0 commit comments

Comments
 (0)