aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mc <prince.chrismc@gmail.com>2021-03-25 12:33:34 -0400
committerGitHub <noreply@github.com>2021-03-25 09:33:34 -0700
commit63cc543890990be9e67aecd7bc5b37dc430bd531 (patch)
treedfd2184d9fb1924204e35911912303b02277a843
parent48b59daff4692bee24e35dba0e3c5d3d3a356f2b (diff)
downloadvcpkg-63cc543890990be9e67aecd7bc5b37dc430bd531.tar.gz
vcpkg-63cc543890990be9e67aecd7bc5b37dc430bd531.zip
[jwt-cpp] update to v0.5.0 (#16799)
* [jwt-cpp] update to v0.5.0 * Update CONTROL * Update portfile.cmake * Delete fix-warning.patch * Update and rename CONTROL to vcpkg.json * Update vcpkg.json * Update jwt-cpp.json * Update baseline.json * Update versions/j-/jwt-cpp.json * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/j-/jwt-cpp.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
-rw-r--r--ports/jwt-cpp/CONTROL5
-rw-r--r--ports/jwt-cpp/fix-warning.patch31
-rw-r--r--ports/jwt-cpp/portfile.cmake11
-rw-r--r--ports/jwt-cpp/vcpkg.json9
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/j-/jwt-cpp.json5
6 files changed, 18 insertions, 45 deletions
diff --git a/ports/jwt-cpp/CONTROL b/ports/jwt-cpp/CONTROL
deleted file mode 100644
index 7cc3d4496..000000000
--- a/ports/jwt-cpp/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: jwt-cpp
-Version: 0.4.0
-Homepage: https://github.com/Thalhammer/jwt-cpp
-Description: A header only library for creating and validating json web tokens in c++
-Build-Depends: picojson \ No newline at end of file
diff --git a/ports/jwt-cpp/fix-warning.patch b/ports/jwt-cpp/fix-warning.patch
deleted file mode 100644
index 4c2e166c3..000000000
--- a/ports/jwt-cpp/fix-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/include/jwt-cpp/base.h b/include/jwt-cpp/base.h
-index 375e0eb..4023709 100644
---- a/include/jwt-cpp/base.h
-+++ b/include/jwt-cpp/base.h
-@@ -2,6 +2,10 @@
- #include <string>
- #include <array>
-
-+#ifdef _MSC_VER
-+#pragma warning(disable : 4267)
-+#endif
-+
- #ifdef __has_cpp_attribute
- #if __has_cpp_attribute(fallthrough)
- #define JWT_FALLTHROUGH [[fallthrough]]
-diff --git a/include/jwt-cpp/jwt.h b/include/jwt-cpp/jwt.h
-index 6e55729..4579310 100644
---- a/include/jwt-cpp/jwt.h
-+++ b/include/jwt-cpp/jwt.h
-@@ -12,6 +12,11 @@
- #include <openssl/ec.h>
- #include <openssl/err.h>
-
-+#ifdef _MSC_VER
-+#pragma warning(disable : 4267)
-+#pragma warning(disable : 4067)
-+#endif
-+
- //If openssl version less than 1.1
- #if OPENSSL_VERSION_NUMBER < 0x10100000L
- #define OPENSSL10
diff --git a/ports/jwt-cpp/portfile.cmake b/ports/jwt-cpp/portfile.cmake
index 00c4496c9..f9390ee3d 100644
--- a/ports/jwt-cpp/portfile.cmake
+++ b/ports/jwt-cpp/portfile.cmake
@@ -1,17 +1,12 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Thalhammer/jwt-cpp
- REF 34bb0644ea613cfcbc09c148db9de8aa6c5612b5 # v0.4.0
- SHA512 773007fc7a73a831e292451d7a38feb9434f7c11c653d43b9f3679c564f64805a1cbd1baab6b13107c42cc06549ad7cd08aebd6658d8ee0022f5b8d601fa94cc
+ REF b45bc9994d8087c5ba7aa1f1588302f04ae84c83 # v0.5.0
+ SHA512 d2c6e2174cd86c27b8866f6ea50a379a321788e91f97a0548e694d11469c05d93b0713e0c38b37a8f14a0aded4fc4635599dcfb50142e4496fb3c8b9f7e5f8cd
HEAD_REF master
- PATCHES
- fix-warning.patch
)
# Copy the header files
file(GLOB HEADER_FILES ${SOURCE_PATH}/include/jwt-cpp/*)
-file(COPY ${HEADER_FILES}
- DESTINATION ${CURRENT_PACKAGES_DIR}/include/jwt-cpp
- REGEX "\.(gitattributes|gitignore|picojson.h)$" EXCLUDE)
-
+file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/jwt-cpp)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/jwt-cpp/vcpkg.json b/ports/jwt-cpp/vcpkg.json
new file mode 100644
index 000000000..47533b72f
--- /dev/null
+++ b/ports/jwt-cpp/vcpkg.json
@@ -0,0 +1,9 @@
+{
+ "name": "jwt-cpp",
+ "version-semver": "0.5.0",
+ "description": "A header only library for creating and validating json web tokens in c++",
+ "homepage": "https://github.com/Thalhammer/jwt-cpp",
+ "dependencies": [
+ "picojson"
+ ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 4a5572ae9..a9af41b75 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2709,7 +2709,7 @@
"port-version": 2
},
"jwt-cpp": {
- "baseline": "0.4.0",
+ "baseline": "0.5.0",
"port-version": 0
},
"jxrlib": {
diff --git a/versions/j-/jwt-cpp.json b/versions/j-/jwt-cpp.json
index 7289529f0..43cbb1bc6 100644
--- a/versions/j-/jwt-cpp.json
+++ b/versions/j-/jwt-cpp.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "1205d0b1c1db271b04b84e075b21f7b6359effb5",
+ "version-semver": "0.5.0",
+ "port-version": 0
+ },
+ {
"git-tree": "1e179b3f53863faa8b91a74f95cdc1c7526de2c7",
"version-string": "0.4.0",
"port-version": 0