From 9a10482f93ab08f4d3f3c4b31abfbd4c782adc58 Mon Sep 17 00:00:00 2001 From: Don Olmstead Date: Fri, 13 Dec 2024 13:40:34 -0800 Subject: [PATCH] Remove the libxslt port Use the canonical vcpkg port at https://github.com/microsoft/vcpkg/tree/master/ports/libxslt --- .github/workflows/build.yaml | 2 +- README.md | 1 - ...001-Remove-library-suffix-on-Windows.patch | 68 --------------- ...emove-config-requirement-for-libxml2.patch | 25 ------ ports/libxslt/portfile.cmake | 86 ------------------- ports/libxslt/vcpkg.json | 23 ----- 6 files changed, 1 insertion(+), 204 deletions(-) delete mode 100644 ports/libxslt/patches/0001-Remove-library-suffix-on-Windows.patch delete mode 100644 ports/libxslt/patches/0002-Remove-config-requirement-for-libxml2.patch delete mode 100644 ports/libxslt/portfile.cmake delete mode 100644 ports/libxslt/vcpkg.json diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 555a23fa..59fd8021 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -208,7 +208,7 @@ jobs: id: libxslt if: steps.libxml2.outcome == 'success' continue-on-error: true - run: ./vcpkg.exe install libxslt --overlay-ports ./WebKitRequirements/ports --triplet ${{ matrix.triplet }} + run: ./vcpkg.exe install libxslt --triplet ${{ matrix.triplet }} - name: Read libxslt config if: steps.libxslt.outcome == 'success' || steps.libxslt.outcome == 'failure' continue-on-error: true diff --git a/README.md b/README.md index c6ef3e85..833d11c9 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,5 @@ | [zlib](https://github.com/zlib-ng/zlib-ng) | 2.2.2 | 2024-09-17 | | [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 | | [sqlite](http://sqlite.org) | 3.47.0 | 2024-10-21 | | [cairo](https://gitlab.freedesktop.org/cairo/cairo) | 1.18.0 | 2023-09-23 | diff --git a/ports/libxslt/patches/0001-Remove-library-suffix-on-Windows.patch b/ports/libxslt/patches/0001-Remove-library-suffix-on-Windows.patch deleted file mode 100644 index 4721967a..00000000 --- a/ports/libxslt/patches/0001-Remove-library-suffix-on-Windows.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e97542a70ed23ce935465a051ae3a8c110b46722 Mon Sep 17 00:00:00 2001 -From: Don Olmstead -Date: Fri, 5 Jul 2024 10:50:51 -0700 -Subject: [PATCH 1/2] Remove library suffix on Windows - ---- - CMakeLists.txt | 38 -------------------------------------- - 1 file changed, 38 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb352475..0df2698e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -247,25 +247,6 @@ set_target_properties( - SOVERSION ${LIBXSLT_MAJOR_VERSION} - ) - --if(MSVC) -- if(BUILD_SHARED_LIBS) -- set_target_properties( -- LibXslt -- PROPERTIES -- DEBUG_POSTFIX d -- ) -- else() -- set_target_properties( -- LibXslt -- PROPERTIES -- DEBUG_POSTFIX sd -- MINSIZEREL_POSTFIX s -- RELEASE_POSTFIX s -- RELWITHDEBINFO_POSTFIX s -- ) -- endif() --endif() -- - install(FILES ${LIBXSLT_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxslt COMPONENT development) - - install( -@@ -340,25 +321,6 @@ set_target_properties( - SOVERSION ${LIBEXSLT_MAJOR_VERSION} - ) - --if(MSVC) -- if(BUILD_SHARED_LIBS) -- set_target_properties( -- LibExslt -- PROPERTIES -- DEBUG_POSTFIX d -- ) -- else() -- set_target_properties( -- LibExslt -- PROPERTIES -- DEBUG_POSTFIX sd -- MINSIZEREL_POSTFIX s -- RELEASE_POSTFIX s -- RELWITHDEBINFO_POSTFIX s -- ) -- endif() --endif() -- - install(FILES ${LIBEXSLT_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libexslt COMPONENT development) - - install( --- -2.45.2.windows.1 - diff --git a/ports/libxslt/patches/0002-Remove-config-requirement-for-libxml2.patch b/ports/libxslt/patches/0002-Remove-config-requirement-for-libxml2.patch deleted file mode 100644 index a8a9f2d0..00000000 --- a/ports/libxslt/patches/0002-Remove-config-requirement-for-libxml2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c14c71b3b84b07e80eb5e1c46067375711fe22d7 Mon Sep 17 00:00:00 2001 -From: Don Olmstead -Date: Fri, 22 Sep 2023 13:14:02 -0700 -Subject: [PATCH 2/2] Remove config requirement for libxml2 - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0df2698e..674b6e29 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,7 +34,7 @@ include(CMakePackageConfigHelpers) - include(GNUInstallDirs) - - if(NOT TARGET LibXml2) -- find_package(LibXml2 CONFIG REQUIRED) -+ find_package(LibXml2 REQUIRED) - endif() - - option(BUILD_SHARED_LIBS "Build shared libraries" ON) --- -2.45.2.windows.1 - diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake deleted file mode 100644 index d3f0875d..00000000 --- a/ports/libxslt/portfile.cmake +++ /dev/null @@ -1,86 +0,0 @@ -set(VERSION_MAJOR 1) -set(VERSION_MINOR 1) -set(VERSION_PATCH 42) -set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) - -set(FILENAME "libxslt-${VERSION}.tar.xz") -set(URLS "https://download.gnome.org/sources/libxslt/${VERSION_MAJOR}.${VERSION_MINOR}/${FILENAME}") - -# Get archive -vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - FILENAME ${FILENAME} - SHA512 02a2189b6cd65fa1fb929fc0e6868bc046bdd8827849f0048cdf9267ed9450745158cef0f2713a833e28fb520b312ff86dc5754dd423ce768c457bfd8812bdc7 -) - -# Patches -set(PATCHES - ${CMAKE_CURRENT_LIST_DIR}/patches/0001-Remove-library-suffix-on-Windows.patch - ${CMAKE_CURRENT_LIST_DIR}/patches/0002-Remove-config-requirement-for-libxml2.patch -) - -# Extract archive -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} - PATCHES ${PATCHES} -) - -# Run CMake build -set(BUILD_OPTIONS - # Options - -DLIBXSLT_WITH_CRYPTO=OFF - -DLIBXSLT_WITH_DEBUGGER=OFF - -DLIBXSLT_WITH_MODULES=OFF - -DLIBXSLT_WITH_PROFILER=OFF - -DLIBXSLT_WITH_PROGRAMS=OFF - -DLIBXSLT_WITH_PYTHON=OFF - -DLIBXSLT_WITH_TESTS=OFF - -DLIBXSLT_WITH_THREADS=OFF - -DLIBXSLT_WITH_TRIO=OFF - -DLIBXSLT_WITH_XSLT_DEBUG=OFF -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${BUILD_OPTIONS} -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libxslt-${VERSION}) -vcpkg_fixup_pkgconfig() - -# Fix the xslt-config -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libxslt) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/xslt-config ${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config) -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../.."; pwd -P)]]) - -if (NOT VCPKG_BUILD_TYPE) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libxslt/debug) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/xslt-config ${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../../../debug"; pwd -P)]]) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config [[${prefix}/include]] [[${prefix}/../include]]) -endif() - -# Modify headers for static builds -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h "ifdef LIBXSLT_STATIC" "if 1") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h "ifdef LIBEXSLT_STATIC" "if 1") -endif() - -# Prepare distribution -file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxslt RENAME copyright) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/libxslt/version ${VERSION}) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json deleted file mode 100644 index 2aa4d3a5..00000000 --- a/ports/libxslt/vcpkg.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "libxslt", - "version": "1.1.42", - "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", - "homepage": "http://xmlsoft.org/libxslt", - "license": "MIT", - "dependencies": [ - { - "name": "libxml2", - "features": [ - "xslt" - ] - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -}