From 5f67642705ab2025214bdd00e01e6e99174b0c6c Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Fri, 25 Jun 2021 19:43:24 +0800 Subject: [PATCH 1/4] [socket-io-client] update to 3.0.0 --- ports/socket-io-client/CONTROL | 4 --- ports/socket-io-client/fix-error-C3321.patch | 13 +++++++ .../socket-io-client/fix-file-not-found.patch | 35 +++++++++++++++++++ ports/socket-io-client/fix-install.patch | 22 ------------ ports/socket-io-client/portfile.cmake | 13 ++++--- ports/socket-io-client/vcpkg.json | 12 +++++++ 6 files changed, 68 insertions(+), 31 deletions(-) delete mode 100644 ports/socket-io-client/CONTROL create mode 100644 ports/socket-io-client/fix-error-C3321.patch create mode 100644 ports/socket-io-client/fix-file-not-found.patch delete mode 100644 ports/socket-io-client/fix-install.patch create mode 100644 ports/socket-io-client/vcpkg.json diff --git a/ports/socket-io-client/CONTROL b/ports/socket-io-client/CONTROL deleted file mode 100644 index bd7b036a8d09e9..00000000000000 --- a/ports/socket-io-client/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: socket-io-client -Version: 1.6.1-1 -Description: C++11 implementation of Socket.IO client -Build-Depends: boost, rapidjson, websocketpp diff --git a/ports/socket-io-client/fix-error-C3321.patch b/ports/socket-io-client/fix-error-C3321.patch new file mode 100644 index 00000000000000..6a36e9d979f87d --- /dev/null +++ b/ports/socket-io-client/fix-error-C3321.patch @@ -0,0 +1,13 @@ +diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp +index f78aea4..6780e26 100644 +--- a/src/internal/sio_client_impl.cpp ++++ b/src/internal/sio_client_impl.cpp +@@ -286,7 +286,7 @@ namespace sio + if(ec || m_con.expired()) + { + if (ec != asio::error::operation_aborted) +- LOG("ping exit,con is expired?"< Date: Fri, 25 Jun 2021 19:44:12 +0800 Subject: [PATCH 2/4] update version --- versions/baseline.json | 6 +++--- versions/s-/socket-io-client.json | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 407e8569deacc6..308f114c836d91 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3539,8 +3539,8 @@ "libsigcpp-3": { "baseline": "3.0.3", "port-version": 1 - }, - "libsmb2": { + }, + "libsmb2": { "baseline": "2021-04-29", "port-version": 0 }, @@ -5833,7 +5833,7 @@ "port-version": 3 }, "socket-io-client": { - "baseline": "1.6.1-1", + "baseline": "3.0.0", "port-version": 0 }, "sockpp": { diff --git a/versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json index 478d1ca54a033e..4582bbb97c8b33 100644 --- a/versions/s-/socket-io-client.json +++ b/versions/s-/socket-io-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5747e737cb058f7a99fe31563e09e2d1068acc0e", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "72d40d2e1c52ff3be1a8ac23f9f45baeed8cbe58", "version-string": "1.6.1-1", From 556d0c97200d6da44fc3e419cc8d32ca42758f8e Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Tue, 29 Jun 2021 16:42:15 +0800 Subject: [PATCH 3/4] update patch file --- .../socket-io-client/fix-file-not-found.patch | 15 +++++++----- ports/socket-io-client/vcpkg.json | 23 +++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/ports/socket-io-client/fix-file-not-found.patch b/ports/socket-io-client/fix-file-not-found.patch index e863685cfdf0b2..a7fbdb1e3a48c9 100644 --- a/ports/socket-io-client/fix-file-not-found.patch +++ b/ports/socket-io-client/fix-file-not-found.patch @@ -1,34 +1,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 19c5e54..307f078 100644 +index 19c5e54..ca8a00d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,16 +31,18 @@ add_definitions( +@@ -31,16 +31,20 @@ add_definitions( -D_WEBSOCKETPP_CPP11_FUNCTIONAL_ ) +find_package(websocketpp CONFIG REQUIRED) +find_package(asio CONFIG REQUIRED) ++find_package(RapidJSON CONFIG REQUIRED) + add_library(sioclient ${ALL_SRC}) target_include_directories(sioclient PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src - ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp - ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include +- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include - ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include ) set_property(TARGET sioclient PROPERTY CXX_STANDARD 11) set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON) -+ target_link_libraries(sioclient PRIVATE websocketpp::websocketpp) ++target_link_libraries(sioclient PRIVATE websocketpp::websocketpp) ++target_link_libraries(sioclient PRIVATE asio asio::asio) ++target_link_libraries(sioclient PRIVATE rapidjson) if(BUILD_SHARED_LIBS) set_target_properties(sioclient -@@ -56,9 +58,7 @@ if(OPENSSL_FOUND) +@@ -56,9 +60,6 @@ if(OPENSSL_FOUND) add_library(sioclient_tls ${ALL_SRC}) target_include_directories(sioclient_tls PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src - ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp - ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include +- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include - ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include ${OPENSSL_INCLUDE_DIR} ) diff --git a/ports/socket-io-client/vcpkg.json b/ports/socket-io-client/vcpkg.json index 3104980e09a419..6ecf8b90b43fd5 100644 --- a/ports/socket-io-client/vcpkg.json +++ b/ports/socket-io-client/vcpkg.json @@ -1,12 +1,11 @@ -{ - "name": "socket-io-client", - "version": "3.0.0", - "description": "C++11 implementation of Socket.IO client", - "homepage": "https://github.com/socketio/socket.io-client-cpp", - "dependencies": [ - "boost", - "rapidjson", - "websocketpp", - "asio" - ] -} \ No newline at end of file +{ + "name": "socket-io-client", + "version": "3.0.0", + "description": "C++11 implementation of Socket.IO client", + "homepage": "https://github.com/socketio/socket.io-client-cpp", + "dependencies": [ + "asio", + "rapidjson", + "websocketpp" + ] +} From 9eeb2b5c9281ede01394a5914091bd2d3d7a3b95 Mon Sep 17 00:00:00 2001 From: Jonliu1993 <13720414433@163.com> Date: Tue, 29 Jun 2021 16:43:52 +0800 Subject: [PATCH 4/4] update version --- versions/s-/socket-io-client.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json index 4582bbb97c8b33..d81657ab177c61 100644 --- a/versions/s-/socket-io-client.json +++ b/versions/s-/socket-io-client.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5747e737cb058f7a99fe31563e09e2d1068acc0e", + "git-tree": "a84a0e4ab231050bf881b44603070de5da27ae05", "version": "3.0.0", "port-version": 0 },