Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mosquitto] update version to 2.0.20 #43256

Merged
merged 2 commits into from
Jan 15, 2025
+11 −29
Merged

[mosquitto] update version to 2.0.20 #43256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68a299b
[mosquitto] update to 2.0.20
Jan 14, 2025
f8fcb35
update version
Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions ports/mosquitto/0005-websocket-shared-lib-name.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62ce99e..61f941e 100644
index e76cc2b..61f941e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -194,13 +194,13 @@ endif (WIN32)
@@ -194,7 +194,7 @@ endif (WIN32)

if (WITH_WEBSOCKETS)
if (STATIC_WEBSOCKETS)
Expand All @@ -11,10 +11,3 @@ index 62ce99e..61f941e 100644
if (WIN32)
set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi)
link_directories(${mosquitto_SOURCE_DIR})
endif (WIN32)
else (STATIC_WEBSOCKETS)
- set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
+ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
endif (STATIC_WEBSOCKETS)
endif (WITH_WEBSOCKETS)

15 changes: 0 additions & 15 deletions ports/mosquitto/0006-pthreads-for-windows.patch
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ports/mosquitto/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ vcpkg_from_github(
REPO eclipse/mosquitto
HEAD_REF master
REF "v${VERSION}"
SHA512 667216f3e60f9916d5de200d3a205fb5a5c798564c96e44939af6c8e3af85fffa36a63eba47db009b432d14f43883dbca5b92547a458215dd269e91f6bcfb7fa
SHA512 92994ec34cebc56dd9aba1a5c3e082117157b42dc5a4c418a9e57a741ad0f2d909226e432082d21b4c9836d2f13fc37d39a1a77f0122a349d1ba6d50974e5190
PATCHES
0003-add-find_package-libwebsockets.patch
0004-support-static-build.patch
0005-websocket-shared-lib-name.patch
0006-pthreads-for-windows.patch
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest version does not require this patch.

)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE)
Expand Down Expand Up @@ -73,4 +72,4 @@ endif()
configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)

file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
2 changes: 1 addition & 1 deletion ports/mosquitto/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mosquitto",
"version": "2.0.18",
"version": "2.0.20",
"description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino",
"homepage": "https://mosquitto.org/",
"license": "EPL-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6085,7 +6085,7 @@
"port-version": 3
},
"mosquitto": {
"baseline": "2.0.18",
"baseline": "2.0.20",
"port-version": 0
},
"mozjpeg": {
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mosquitto.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ee450abba4fe411781a8bb412bd4b74a0e45892c",
"version": "2.0.20",
"port-version": 0
},
{
"git-tree": "6fbbe753533949d40d9ff4307bab2bb61432a117",
"version": "2.0.18",
Expand Down