aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Leigh <rleigh@codelibre.net>2020-04-17 22:10:35 +0100
committerGitHub <noreply@github.com>2020-04-17 14:10:35 -0700
commit5f77f3e92b93f849bb73afeff77127a4f47f089e (patch)
tree766898f43a9974528d1755c8a2d887531eb736c6
parent7d2f838ea7c5615e5da0c82007cbfef080146867 (diff)
downloadvcpkg-5f77f3e92b93f849bb73afeff77127a4f47f089e.tar.gz
vcpkg-5f77f3e92b93f849bb73afeff77127a4f47f089e.zip
[xerces-c] Update to version 3.2.3 (#10779)
* [xerces-c] Update to version 3.2.3 Drop patch no-symlinks-in-static-build.patch (fixed upstream) * [xerces-c] Correct version number * [xerces-c] Remove no-symlinks-in-static-build.patch
-rw-r--r--ports/xerces-c/CONTROL2
-rw-r--r--ports/xerces-c/no-symlinks-in-static-build.patch31
-rw-r--r--ports/xerces-c/portfile.cmake5
3 files changed, 3 insertions, 35 deletions
diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL
index c5f379cac..064c61a50 100644
--- a/ports/xerces-c/CONTROL
+++ b/ports/xerces-c/CONTROL
@@ -1,5 +1,5 @@
Source: xerces-c
-Version: 3.2.2-13
+Version: 3.2.3
Homepage: https://github.com/apache/xerces-c
Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.
diff --git a/ports/xerces-c/no-symlinks-in-static-build.patch b/ports/xerces-c/no-symlinks-in-static-build.patch
deleted file mode 100644
index 34bd732d3..000000000
--- a/ports/xerces-c/no-symlinks-in-static-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c29aa25..3106d77 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1285,15 +1285,17 @@ if(MSVC)
- set_target_properties(xerces-c PROPERTIES RUNTIME_OUTPUT_NAME "xerces-c_${INTERFACE_VERSION_U}")
- set_target_properties(xerces-c PROPERTIES DEBUG_POSTFIX "D")
- elseif(UNIX)
-- # For strict libtool compatibility on Unix. It's a horrible hack to
-- # set the version in the filename, and create the symlink at install
-- # time. Note: could be dropped when the SONAME is updated and
-- # libtool compatibility is no longer required.
-- set_target_properties(xerces-c PROPERTIES OUTPUT_NAME "xerces-c-${INTERFACE_VERSION_D}")
-- file(GENERATE
-- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/InstallLibrarySymlink.cmake"
-- CONTENT "execute_process(COMMAND ln -sf \"$<TARGET_FILE_NAME:xerces-c>\" \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/libxerces-c.so\")")
-- install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/InstallLibrarySymlink.cmake")
-+ if(BUILD_SHARED_LIBS)
-+ # For strict libtool compatibility on Unix. It's a horrible hack to
-+ # set the version in the filename, and create the symlink at install
-+ # time. Note: could be dropped when the SONAME is updated and
-+ # libtool compatibility is no longer required.
-+ set_target_properties(xerces-c PROPERTIES OUTPUT_NAME "xerces-c-${INTERFACE_VERSION_D}")
-+ file(GENERATE
-+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/InstallLibrarySymlink.cmake"
-+ CONTENT "execute_process(COMMAND ln -sf \"$<TARGET_FILE_NAME:xerces-c>\" \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LIBDIR}/libxerces-c.so\")")
-+ install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/InstallLibrarySymlink.cmake")
-+ endif()
- else()
- # Not used for the common cases, though this would be the default if
- # not for libtool compatibility.
diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake
index 1f24b672a..57414f7b5 100644
--- a/ports/xerces-c/portfile.cmake
+++ b/ports/xerces-c/portfile.cmake
@@ -1,13 +1,12 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/xerces-c
- REF v3.2.2
- SHA512 e4b2d3499fb4d1d1bcaf991ee858f352112683084b9cc7855c0e52e7fc8cc982a8e3cd548fa30718af6a6dee40e460d82ffcd3480a50f7e7516b462b2c2080c6
+ REF v3.2.3
+ SHA512 aaafe2de4ea156d94e71e3631c79bd66660badf17bf2a19587a0ca34011f70bd1584a0beef909409a3ff05eecea9d37ffee6dbb267625f59217fd86705d2cd28
HEAD_REF master
PATCHES
disable-tests.patch
remove-dll-export-macro.patch
- no-symlinks-in-static-build.patch
)
set(DISABLE_ICU ON)