diff options
| author | Rémy Tassoux <contact@rt2.fr> | 2021-06-11 17:59:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 08:59:54 -0700 |
| commit | b7644f0546ade9265d5e91d085bd93744954a303 (patch) | |
| tree | 1dd64449e649b1a41d16628ace66bf925a8f52b8 | |
| parent | 6ece598d973839f78f127056493b992d9f6befd7 (diff) | |
| download | vcpkg-b7644f0546ade9265d5e91d085bd93744954a303.tar.gz vcpkg-b7644f0546ade9265d5e91d085bd93744954a303.zip | |
[utfcpp] Update to 3.2.1 version (#18299)
* [utfcpp] Update to 3.2.1 version
* [utfcpp] Update version files
Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com>
| -rw-r--r-- | ports/utfcpp/CONTROL | 5 | ||||
| -rw-r--r-- | ports/utfcpp/fix-test.patch | 36 | ||||
| -rw-r--r-- | ports/utfcpp/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/utfcpp/vcpkg.json | 6 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/u-/utfcpp.json | 5 |
6 files changed, 15 insertions, 46 deletions
diff --git a/ports/utfcpp/CONTROL b/ports/utfcpp/CONTROL deleted file mode 100644 index 11be1813c..000000000 --- a/ports/utfcpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: utfcpp
-Version: 3.1.2
-Port-Version: 1
-Homepage: https://github.com/nemtrif/utfcpp
-Description: UTF-8 with C++ in a Portable Way
\ No newline at end of file diff --git a/ports/utfcpp/fix-test.patch b/ports/utfcpp/fix-test.patch deleted file mode 100644 index 43799c922..000000000 --- a/ports/utfcpp/fix-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8ac1646..c081d3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,6 +38,6 @@ endif() - - if(UTF8_TESTS) - enable_testing() -- add_subdirectory(extern/gtest) -+ find_package(GTest CONFIG REQUIRED) - add_subdirectory(tests) - endif() -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 06e0d7e..4ee6dd8 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -15,16 +15,16 @@ add_executable(noexceptionstests - target_link_libraries(negative PRIVATE utf8::cpp) - target_link_libraries(cpp11 PRIVATE - utf8::cpp -- gtest_main -+ GTest::gtest_main - ) - target_link_libraries(apitests PRIVATE - utf8::cpp -- gtest_main -+ GTest::gtest_main - ) - - target_link_libraries(noexceptionstests PRIVATE - utf8::cpp -- gtest_main -+ GTest::gtest_main - ) - target_compile_options(noexceptionstests PUBLIC -fno-exceptions) - diff --git a/ports/utfcpp/portfile.cmake b/ports/utfcpp/portfile.cmake index 9dddfb1d0..7eb0f6242 100644 --- a/ports/utfcpp/portfile.cmake +++ b/ports/utfcpp/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemtrif/utfcpp - REF v3.1.2 - SHA512 d43df19d9e8652291f1301a326ec0d592bad43d6ecf9086947037f0ae0c1e70c2d96082c48066639e2b7c57c0ea0e4782d6b215d017cf96a4c73ff3a15feec75 + REF v3.2.1 + SHA512 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d HEAD_REF master - PATCHES fix-test.patch ) vcpkg_configure_cmake( diff --git a/ports/utfcpp/vcpkg.json b/ports/utfcpp/vcpkg.json new file mode 100644 index 000000000..d7f0c4639 --- /dev/null +++ b/ports/utfcpp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "utfcpp", + "version": "3.2.1", + "description": "UTF-8 with C++ in a Portable Way", + "homepage": "https://github.com/nemtrif/utfcpp" +} diff --git a/versions/baseline.json b/versions/baseline.json index 0b78f80cb..129391b94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6433,8 +6433,8 @@ "port-version": 0 }, "utfcpp": { - "baseline": "3.1.2", - "port-version": 1 + "baseline": "3.2.1", + "port-version": 0 }, "utfz": { "baseline": "1.2-1", diff --git a/versions/u-/utfcpp.json b/versions/u-/utfcpp.json index ff117c4c6..dc7b6b2ef 100644 --- a/versions/u-/utfcpp.json +++ b/versions/u-/utfcpp.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "27a1e587de353ed0d9559d5e4627ed2811960c07", + "version": "3.2.1", + "port-version": 0 + }, + { "git-tree": "1af9d7ac0523916f6119657b78719d84939215d5", "version-string": "3.1.2", "port-version": 1 |