From 2d4073866fed374ab5b5dc2b25e91ca185740ebe Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Fri, 6 Mar 2020 21:21:09 +0100 Subject: [PATCH] upgrading package: libwebsockets 3.2.2 -> 4.0.0 --- libwebsockets/libwebsockets.patch | 16 ++++++++-------- libwebsockets/libwebsockets.spec | 5 ++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/libwebsockets/libwebsockets.patch b/libwebsockets/libwebsockets.patch index 33a865da76..25355791c9 100644 --- a/libwebsockets/libwebsockets.patch +++ b/libwebsockets/libwebsockets.patch @@ -1,19 +1,19 @@ Index: CMakeLists.txt ---- CMakeLists.txt.orig 2019-12-18 15:45:31.000000000 +0100 -+++ CMakeLists.txt 2019-12-19 20:10:15.572693000 +0100 -@@ -1482,9 +1482,9 @@ +--- CMakeLists.txt.orig 2020-03-06 11:18:46.000000000 +0100 ++++ CMakeLists.txt 2020-03-06 21:19:25.058087000 +0100 +@@ -1743,9 +1743,9 @@ endif() - if (UNIX AND NOT LWS_WITH_ESP32) -- set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized -Werror ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) -+ set(CMAKE_C_FLAGS "${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) + if (UNIX AND NOT LWS_PLAT_FREERTOS) +- set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wstrict-aliasing -Wuninitialized -Werror ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) ++ set(CMAKE_C_FLAGS "${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) else() - set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wuninitialized -Werror ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" ) + set(CMAKE_C_FLAGS "${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" ) endif() endif () -@@ -2430,7 +2430,7 @@ +@@ -2792,7 +2792,7 @@ Description: Websockets server and client library Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} @@ -22,7 +22,7 @@ Index: CMakeLists.txt Cflags: -I\${includedir}" ) -@@ -2476,8 +2476,6 @@ +@@ -2838,8 +2838,6 @@ FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake") endif() diff --git a/libwebsockets/libwebsockets.spec b/libwebsockets/libwebsockets.spec index a095c31bcd..c0cd491d6f 100644 --- a/libwebsockets/libwebsockets.spec +++ b/libwebsockets/libwebsockets.spec @@ -31,8 +31,8 @@ Distribution: OpenPKG Community Class: EVAL Group: Networking License: LGPL -Version: 3.2.2 -Release: 20200118 +Version: 4.0.0 +Release: 20200306 # list of sources Source0: https://github.com/warmcat/libwebsockets/archive/v%{version}.tar.gz @@ -50,7 +50,6 @@ PreReq: openssl, zlib %track prog libwebsockets = { - comment = "mosquitto required <3.1.0 || >=3.2.1" version = %{version} url = https://github.com/warmcat/libwebsockets/releases regex = v(__VER__)\.tar\.gz