aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchausner <15180557+chausner@users.noreply.github.com>2021-10-06 01:16:05 +0200
committerGitHub <noreply@github.com>2021-10-05 16:16:05 -0700
commitd91e4ed055652518be0e836a9420f8f80b392ff5 (patch)
tree261389b32e88c77d9d71979bf198e7118d9e4ebb
parent6397f38354fbfade95bd63a9c9a72a977f01598f (diff)
downloadvcpkg-d91e4ed055652518be0e836a9420f8f80b392ff5.tar.gz
vcpkg-d91e4ed055652518be0e836a9420f8f80b392ff5.zip
[date] Update to 3.0.1 (#20481)
* Update date to 3.0.1 * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
-rw-r--r--ports/date/0002-fix-cmake-3.14.patch8
-rw-r--r--ports/date/0003-find-dependency-pthread.patch15
-rw-r--r--ports/date/portfile.cmake23
-rw-r--r--ports/date/vcpkg.json13
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/d-/date.json5
6 files changed, 33 insertions, 35 deletions
diff --git a/ports/date/0002-fix-cmake-3.14.patch b/ports/date/0002-fix-cmake-3.14.patch
index 9d117231c..4fece8fa8 100644
--- a/ports/date/0002-fix-cmake-3.14.patch
+++ b/ports/date/0002-fix-cmake-3.14.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad74900..42d55af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -72,7 +72,7 @@ target_sources( date INTERFACE
+@@ -73,7 +73,7 @@ target_sources( date INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/date/iso_week.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/date/julian.h>
)
@@ -11,15 +11,15 @@ index ad74900..42d55af 100644
# public headers will get installed:
set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h )
endif ()
-@@ -115,7 +115,6 @@ if( BUILD_TZ_LIB )
+@@ -144,7 +144,6 @@ if( BUILD_TZ_LIB )
endif( )
set_target_properties( date-tz PROPERTIES
POSITION_INDEPENDENT_CODE ON
- PUBLIC_HEADER "${TZ_HEADERS}"
VERSION "${PROJECT_VERSION}"
- SOVERSION "${PROJECT_VERSION}" )
+ SOVERSION "${ABI_VERSION}" )
if( NOT MSVC )
-@@ -140,8 +139,8 @@ write_basic_package_version_file( "${version_config}"
+@@ -169,8 +169,8 @@ write_basic_package_version_file( "${version_config}"
COMPATIBILITY SameMajorVersion )
install( TARGETS date
diff --git a/ports/date/0003-find-dependency-pthread.patch b/ports/date/0003-find-dependency-pthread.patch
deleted file mode 100644
index 72c6c765a..000000000
--- a/ports/date/0003-find-dependency-pthread.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/dateConfig.cmake b/cmake/dateConfig.cmake
-index 20f86e8..2198ad1 100644
---- a/cmake/dateConfig.cmake
-+++ b/cmake/dateConfig.cmake
-@@ -1,8 +1,8 @@
- include( CMakeFindDependencyMacro )
- include( "${CMAKE_CURRENT_LIST_DIR}/dateTargets.cmake" )
--if( NOT MSVC AND TARGET date::tz )
-+if( NOT MSVC AND TARGET date::date-tz )
- find_dependency( Threads REQUIRED)
-- get_target_property( _tzill date::tz INTERFACE_LINK_LIBRARIES )
-+ get_target_property( _tzill date::date-tz INTERFACE_LINK_LIBRARIES )
- if( _tzill AND "${_tzill}" MATCHES "libcurl" )
- find_dependency( CURL )
- endif( )
diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake
index 215f1ef2a..b06d29f92 100644
--- a/ports/date/portfile.cmake
+++ b/ports/date/portfile.cmake
@@ -8,37 +8,36 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO HowardHinnant/date
- REF cac99da8dc88be719a728dc1b597b0ac307c1800 #3.0.0
- SHA512 07bac40c9d92ed92f05ab71b07c203fc341cd35999f1eab16d584bf77ff69e2cdc106931b2faf0dcfc5a311ee55e8445a81fd97c62f4672957b6aac1b24a08fd
+ REF v3.0.1
+ SHA512 6BDC7CBA821D66E17A559250CC0CE0095808E9DB81CEC9E16EAA4C31ABDFA705299C67B72016D9B06B302BC306D063E83A374EB00728071B83A5AD650D59034F
HEAD_REF master
PATCHES
0001-fix-uwp.patch
0002-fix-cmake-3.14.patch
- 0003-find-dependency-pthread.patch
)
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
INVERTED_FEATURES
remote-api USE_SYSTEM_TZ_DB
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
- ${FEATURE_OPTIONS}
+ ${FEATURE_OPTIONS}
-DBUILD_TZ_LIB=ON
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
if(VCPKG_TARGET_IS_WINDOWS)
- vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/date)
+ vcpkg_cmake_config_fixup(CONFIG_PATH CMake)
else()
- vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/date TARGET_PATH share/date)
+ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/date)
endif()
vcpkg_copy_pdbs()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/date RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/date/vcpkg.json b/ports/date/vcpkg.json
index cbca5d9b0..46e059b5e 100644
--- a/ports/date/vcpkg.json
+++ b/ports/date/vcpkg.json
@@ -1,9 +1,18 @@
{
"name": "date",
- "version-string": "3.0.0",
- "port-version": 3,
+ "version": "3.0.1",
"description": "A date and time library based on the C++17 <chrono> header",
"homepage": "https://github.com/HowardHinnant/date",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ],
"features": {
"remote-api": {
"description": "support automatic download of tz data",
diff --git a/versions/baseline.json b/versions/baseline.json
index 9c822f790..3adb9d9bd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1717,8 +1717,8 @@
"port-version": 1
},
"date": {
- "baseline": "3.0.0",
- "port-version": 3
+ "baseline": "3.0.1",
+ "port-version": 0
},
"dav1d": {
"baseline": "0.8.2",
diff --git a/versions/d-/date.json b/versions/d-/date.json
index 05e4bbc9c..c5d967f1b 100644
--- a/versions/d-/date.json
+++ b/versions/d-/date.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "8d9a771765181237930138b7c4809babbd814cfb",
+ "version": "3.0.1",
+ "port-version": 0
+ },
+ {
"git-tree": "6dc2054fe09235f06cd75f4acaf570145672a86a",
"version-string": "3.0.0",
"port-version": 3