3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

xalan-c: Remove use of obsolete unary_ and binary_function for C++17 compatibility (#4575)

Browse Source 
* xalan-c: Remove use of obsolete unary_ and binary_function for C++17 compatibility

* [xerces-c] Improve port stability by adding control over ICU dependency
This commit is contained in:
Roger Leigh 2018-12-12 20:47:57 +00:00 committed by Robert Schumacher
parent 4347bc7e45
commit e04b4ed5b5
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/xalan-c/CONTROL
View File

@ -1,4 +1,4 @@
Source: xalan-c Source: xalan-c
Version: 1.11-4 Version: 1.11-5
Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types
Build-Depends: xerces-c Build-Depends: xerces-c

14
ports/xalan-c/portfile.cmake
View File

@ -10,6 +10,18 @@ vcpkg_download_distfile(ARCHIVE
SHA512 2e79a2c8f755c9660ffc94b26b6bd4b140685e05a88d8e5abb19a2f271383a3f2f398b173ef403f65dc33af75206214bd21ac012c39b4c0051b3a9f61f642fe6 SHA512 2e79a2c8f755c9660ffc94b26b6bd4b140685e05a88d8e5abb19a2f271383a3f2f398b173ef403f65dc33af75206214bd21ac012c39b4c0051b3a9f61f642fe6
) )
vcpkg_download_distfile(XALAN_PATCH8
URLS "https://github.com/rleigh-codelibre/vcpkg-patches/raw/ca09d69280469ce8f787c67b48f86e46a463ef5d/xalan-c/0008-remove-unary-binary-function.patch"
FILENAME "0008-remove-unary-binary-function.patch"
SHA512 059d9a39b29125ae770369e4c44ab7804ae16d4ff5c90e35f25b7990dc987161bf1187ceb2dcbab181ffb72490a9d9f45e30ab5928644734e7627cb74b03e201
)
vcpkg_download_distfile(XALAN_PATCH9
URLS "https://raw.githubusercontent.com/rleigh-codelibre/vcpkg-patches/ca09d69280469ce8f787c67b48f86e46a463ef5d/xalan-c/0009-remove-select-workaround.patch"
FILENAME "0009-remove-select-workaround.patch"
SHA512 73730736cd1f1809ebcc35562017402d606cbfd5a64665d104a21d89d679ab3274f6f5685ab63305c57fffab74e62084c0e18c76d19eb5f9c2e36be6679fd4d3
)
vcpkg_extract_source_archive_ex( vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE} ARCHIVE ${ARCHIVE}
@ -22,6 +34,8 @@ vcpkg_extract_source_archive_ex(
0005-fix-ftbfs-ld-as-needed.patch 0005-fix-ftbfs-ld-as-needed.patch
0006-fix-testxslt-segfault.patch 0006-fix-testxslt-segfault.patch
0007-fix-readme-typos.patch 0007-fix-readme-typos.patch
${XALAN_PATCH8}
${XALAN_PATCH9}
) )
if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")

6
ports/xerces-c/CONTROL
View File

@ -1,3 +1,7 @@
Source: xerces-c Source: xerces-c
Version: 3.2.2-5 Version: 3.2.2-6
Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.
Feature: icu
Description: ICU support
Build-Depends: icu

6
ports/xerces-c/portfile.cmake
View File

@ -9,6 +9,11 @@ vcpkg_from_github(
PATCHES disable-tests.patch PATCHES disable-tests.patch
) )
set(DISABLE_ICU ON)
if("icu" IN_LIST FEATURES)
set(DISABLE_ICU OFF)
endif()
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA
@ -16,6 +21,7 @@ vcpkg_configure_cmake(
-DDISABLE_TESTS=ON -DDISABLE_TESTS=ON
-DDISABLE_DOC=ON -DDISABLE_DOC=ON
-DDISABLE_SAMPLES=ON -DDISABLE_SAMPLES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_ICU=${DISABLE_ICU}
) )
vcpkg_install_cmake() vcpkg_install_cmake()