diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cf0d571f..558003b0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -130,7 +130,7 @@ jobs: id: nghttp3 if: steps.vcpkg.outcome == 'success' continue-on-error: true - run: ./vcpkg.exe install nghttp3 --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }} + run: ./vcpkg.exe install nghttp3 --triplet ${{ matrix.triplet }} - name: Read nghttp3 config if: steps.nghttp3.outcome == 'success' || steps.nghttp3.outcome == 'failure' continue-on-error: true diff --git a/README.md b/README.md index dfb00c3a..35900c78 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ |---|:---:|:---:| | [icu](http://site.icu-project.org) | 76.1 | 2024-10-24 | | [zlib](https://github.com/zlib-ng/zlib-ng) | 2.2.2 | 2024-09-17 | -| [nghttp3](https://github.com/ngtcp2/nghttp3) | 1.6.0 | 2024-10-05 | | [curl](https://curl.se) | 8.11.0 | 2024-11-05 | | [libxml2](http://xmlsoft.org) | 2.13.5 | 2024-11-12 | | [libxslt](http://xmlsoft.org/libxslt) | 1.1.42 | 2024-07-04 | diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake deleted file mode 100644 index 08474886..00000000 --- a/ports/nghttp3/portfile.cmake +++ /dev/null @@ -1,55 +0,0 @@ -set(VERSION 1.6.0) - -set(FILENAME "nghttp3-${VERSION}.tar.xz") -set(URLS "https://github.com/ngtcp2/nghttp3/releases/download/v${VERSION}/${FILENAME}") - -# Get archive -vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - FILENAME ${FILENAME} - SHA512 d0f585cf388a48d391f803897b0998c12c39e118ca380ecc48c4d3dfd3ff4588a5e456dc89a96f2f5ffd5afc261a2d60a71fd4d8ebb82af35bfe6668737538d8 -) - -# Extract archive -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} - PATCHES ${PATCHES} -) - -# Run CMake build -set(BUILD_OPTIONS - # ENABLE options - -DENABLE_LIB_ONLY=ON -) - -if (VCPKG_LIBRARY_LINKAGE MATCHES static) - set(NGHTTP3_SHARED_LIB OFF) - set(NGHTTP3_STATIC_LIB ON) -else () - set(NGHTTP3_SHARED_LIB ON) - set(NGHTTP3_STATIC_LIB OFF) -endif () - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - ${BUILD_OPTIONS} - -DBUILD_TESTING=OFF - -DENABLE_SHARED_LIB=${NGHTTP3_SHARED_LIB} - -DENABLE_STATIC_LIB=${NGHTTP3_STATIC_LIB} -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nghttp3) -vcpkg_fixup_pkgconfig() - -# Prepare distribution -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/nghttp3 RENAME copyright) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/nghttp3/version ${VERSION}) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json deleted file mode 100644 index 3900271b..00000000 --- a/ports/nghttp3/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "nghttp3", - "version": "1.6.0", - "description": "An implementation of HTTP/3 mapping over QUIC and QPACK in C.", - "homepage": "https://github.com/ngtcp2/nghttp3", - "license": "MIT", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -}