diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d46b1050..4a563ad9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -369,6 +369,28 @@ jobs: continue-on-error: true run: Get-Content ./buildtrees/woff2/install-${{ matrix.triplet }}-rel-out.log + - name: Build harfbuzz + id: harfbuzz + if: steps.icu.outcome == 'success' + continue-on-error: true + run: ./vcpkg.exe install harfbuzz[core,icu,directwrite] --triplet ${{ matrix.triplet }} + - name: Read harfbuzz debug config + if: steps.harfbuzz.outcome == 'success' || steps.harfbuzz.outcome == 'failure' + continue-on-error: true + run: Get-Content ./buildtrees/harfbuzz/config-${{ matrix.triplet }}-dbg-out.log + - name: Read harfbuzz debug build log + if: steps.harfbuzz.outcome == 'success' || steps.harfbuzz.outcome == 'failure' + continue-on-error: true + run: Get-Content ./buildtrees/harfbuzz/package-${{ matrix.triplet }}-dbg-out.log + - name: Read harfbuzz release config + if: steps.harfbuzz.outcome == 'success' || steps.harfbuzz.outcome == 'failure' + continue-on-error: true + run: Get-Content ./buildtrees/harfbuzz/config-${{ matrix.triplet }}-rel-out.log + - name: Read harfbuzz release build log + if: steps.harfbuzz.outcome == 'success' || steps.harfbuzz.outcome == 'failure' + continue-on-error: true + run: Get-Content ./buildtrees/harfbuzz/package-${{ matrix.triplet }}-rel-out.log + - name: Build pixman id: pixman if: steps.vcpkg.outcome == 'success' diff --git a/README.md b/README.md index 02ab0a6c..d2c4bf82 100644 --- a/README.md +++ b/README.md @@ -31,5 +31,4 @@ | [libwebp](https://github.com/webmproject/libwebp) | 1.4.0 | 2024-04-12 | | [libjxl](https://github.com/libjxl/libjxl) | 0.11.0 | 2024-09-13 | | [sqlite](http://sqlite.org) | 3.47.0 | 2024-10-21 | -| [harfbuzz](https://github.com/harfbuzz/harfbuzz) | 10.1.0 | 2024-11-04 | | [cairo](https://gitlab.freedesktop.org/cairo/cairo) | 1.18.0 | 2023-09-23 | diff --git a/ports/harfbuzz/patches/0001-Remove-icu-uc-from-pkgconfig.patch b/ports/harfbuzz/patches/0001-Remove-icu-uc-from-pkgconfig.patch deleted file mode 100644 index c1a2700f..00000000 --- a/ports/harfbuzz/patches/0001-Remove-icu-uc-from-pkgconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 65464b145fe54fe5009f19a3cfec20a082045b14 Mon Sep 17 00:00:00 2001 -From: Don -Date: Sat, 24 Sep 2022 18:57:06 -0700 -Subject: [PATCH] Remove icu-uc from pkgconfig - -The icu build doesn't output a pkgconfig so vcpkg will fail to fix up harfbuzz's pkgconfig. ---- - src/harfbuzz-icu.pc.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/harfbuzz-icu.pc.in b/src/harfbuzz-icu.pc.in -index 949869a35..5be5b2686 100644 ---- a/src/harfbuzz-icu.pc.in -+++ b/src/harfbuzz-icu.pc.in -@@ -8,6 +8,5 @@ Description: HarfBuzz text shaping library ICU integration - Version: %VERSION% - - Requires: harfbuzz --Requires.private: icu-uc - Libs: -L${libdir} -lharfbuzz-icu - Cflags: -I${includedir}/harfbuzz --- -2.46.1.windows.1 - diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake deleted file mode 100644 index 52d0b569..00000000 --- a/ports/harfbuzz/portfile.cmake +++ /dev/null @@ -1,46 +0,0 @@ -set(VERSION 10.1.0) - -set(FILENAME "harfbuzz-${VERSION}.tar.xz") -set(URLS "https://github.com/harfbuzz/harfbuzz/releases/download/${VERSION}/${FILENAME}") - -# Get archive -vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - FILENAME ${FILENAME} - SHA512 14b0e8fd417af9c78f36e532e3737c163902b85837be1028a8fd569508639b87afeb56f70a2313ba2f0f6d4b72bb6cee0bf50fb333dfc503c713e4d9cd86e9c3 -) - -# Patches -set(PATCHES - ${CMAKE_CURRENT_LIST_DIR}/patches/0001-Remove-icu-uc-from-pkgconfig.patch -) - -# Extract archive -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} - PATCHES ${PATCHES} -) - -# Run CMake build -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DHB_HAVE_FREETYPE=ON - -DHB_HAVE_ICU=ON - -DHB_BUILD_UTILS=OFF - -DHB_BUILD_SUBSET=OFF - OPTIONS_DEBUG - -DSKIP_INSTALL_HEADERS=ON -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/harfbuzz) -vcpkg_fixup_pkgconfig() - -# Prepare distribution -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz RENAME copyright) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/harfbuzz/version ${VERSION}) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json deleted file mode 100644 index 1add4452..00000000 --- a/ports/harfbuzz/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "harfbuzz", - "version": "10.1.0", - "description": "HarfBuzz OpenType text shaping engine", - "homepage": "https://github.com/harfbuzz/harfbuzz", - "license": "MIT-Modern-Variant", - "dependencies": [ - "freetype", - { - "name": "icu", - "platform": "!linux" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -}