diff options
| author | LarryIII <33021067+LarryIII@users.noreply.github.com> | 2019-04-03 22:16:09 -0700 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-04-03 22:16:09 -0700 |
| commit | e33ffb6f905fb6c7446003ce15028bc1f5606cf7 (patch) | |
| tree | 35d24e51590b46cf1fb75e3b500929c68ddaf419 | |
| parent | 4d224838df2da68def51540e328b8b692ae5607f (diff) | |
| download | vcpkg-e33ffb6f905fb6c7446003ce15028bc1f5606cf7.tar.gz vcpkg-e33ffb6f905fb6c7446003ce15028bc1f5606cf7.zip | |
[date] Fix failures in UWP with latest commit (#5932)
| -rw-r--r-- | ports/date/CONTROL | 2 | ||||
| -rw-r--r-- | ports/date/fix-date.patch | 36 | ||||
| -rw-r--r-- | ports/date/portfile.cmake | 9 |
3 files changed, 3 insertions, 44 deletions
diff --git a/ports/date/CONTROL b/ports/date/CONTROL index f9a86d671..99d514b8d 100644 --- a/ports/date/CONTROL +++ b/ports/date/CONTROL @@ -1,5 +1,5 @@ Source: date -Version: 2.4.1 +Version: 9dc96fd Description: A date and time library based on the C++11/14/17 <chrono> header Feature: remote-api diff --git a/ports/date/fix-date.patch b/ports/date/fix-date.patch deleted file mode 100644 index bf4c05b38..000000000 --- a/ports/date/fix-date.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/include/date/tz.h b/include/date/tz.h -index 280a598..f9b5a35 100644 ---- a/include/date/tz.h -+++ b/include/date/tz.h -@@ -1963,7 +1963,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, - bool is_60_sec = fds.tod.seconds() == seconds{60}; - if (is_60_sec) - fds.tod.seconds() -= seconds{1}; -- auto tmp = to_utc_time(sys_days(fds.ymd) - *offptr + fds.tod.to_duration()); -+ auto tmp = utc_clock::from_sys(sys_days(fds.ymd) - *offptr + fds.tod.to_duration()); - if (is_60_sec) - tmp += seconds{1}; - if (is_60_sec != is_leap_second(tmp).first || !fds.tod.in_conventional_range()) -@@ -2197,7 +2197,7 @@ from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, - return is; - } - --#if !defined(_MSC_VER) || _MSC_VER > 1912 -+#if !defined(_MSC_VER) || _MSC_VER > 1913 - - // clock_time_conversion - -@@ -2471,7 +2471,7 @@ clock_cast(const std::chrono::time_point<SrcClock, Duration>& tp) - return clock_cast_detail::cc_impl<DstClock>(tp, &tp); - } - --#endif // !defined(_MSC_VER) || _MSC_VER > 1912 -+#endif // !defined(_MSC_VER) || _MSC_VER > 1913 - - // Deprecated API - -@@ -2579,3 +2579,4 @@ to_gps_time(const tai_time<Duration>& t) - } // namespace date - - #endif // TZ_H -+ diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index 749c0c5f0..5eedde942 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -10,16 +10,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HowardHinnant/date - REF v2.4.1 - SHA512 ce7d1c4518558d3690b3a33cd3da1066b43a5f641282c331c60be73e9b010227d4998bca5f34694215ae52f6514a2f5eccd6b0a5ee3dcf8cef2f2d1644c8beee + REF 9dc96fd9b5e4e1e7885aa80dc24a3ceb407c3730 + SHA512 1acb78f1ae7f5b1278a9e034fa5ccbb64643ad381ef9bd76bf42fb04d714c6742f2129b6892024cd98bb925e1a6136337fccb636e3f991b428be1ed05ab8901e HEAD_REF master ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-date.patch -) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) set(HAS_REMOTE_API 0) |