From ce77ea78c856e6ab2ebeca12bc3d04ed1f4cfc9c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:04:57 +0200 Subject: [PATCH] [qpid-proton] update and don't build tests (#24227) * [qpid-proton] update and don't build tests * nicole CR Co-authored-by: nicole mazzuca --- ports/qpid-proton/fix-openssl3.patch | 22 ---------------------- ports/qpid-proton/portfile.cmake | 10 ++++++---- ports/qpid-proton/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/q-/qpid-proton.json | 5 +++++ 5 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 ports/qpid-proton/fix-openssl3.patch diff --git a/ports/qpid-proton/fix-openssl3.patch b/ports/qpid-proton/fix-openssl3.patch deleted file mode 100644 index bf33ee53d9..0000000000 --- a/ports/qpid-proton/fix-openssl3.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d75dfdb6..7089c406 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -177,7 +177,7 @@ if (CMAKE_COMPILER_IS_GNUCC) - endif (ENABLE_WARNING_ERROR) - set (COMPILE_WARNING_FLAGS "${WERROR} -Wall -pedantic-errors") - set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS}") -- set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wstrict-prototypes -Wvla -Wsign-compare -Wwrite-strings") -+ set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-deprecated-declarations -Wstrict-prototypes -Wvla -Wsign-compare -Wwrite-strings") - - if (ENABLE_UNDEFINED_ERROR) - set (CATCH_UNDEFINED "-Wl,--no-undefined") -@@ -202,7 +202,7 @@ if (CMAKE_C_COMPILER_ID MATCHES "Clang") - endif (ENABLE_WARNING_ERROR) - # TODO aconway 2016-01-06: we should be able to clean up the code and turn on - # some of these warnings. -- set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-float-equal -Wno-padded -Wno-sign-conversion -Wno-switch-enum -Wno-weak-vtables -Wno-exit-time-destructors -Wno-global-constructors -Wno-shorten-64-to-32 -Wno-documentation -Wno-documentation-unknown-command -Wno-old-style-cast -Wno-missing-noreturn") -+ set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-deprecated-declarations -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-float-equal -Wno-padded -Wno-sign-conversion -Wno-switch-enum -Wno-weak-vtables -Wno-exit-time-destructors -Wno-global-constructors -Wno-shorten-64-to-32 -Wno-documentation -Wno-documentation-unknown-command -Wno-old-style-cast -Wno-missing-noreturn") - endif() - - if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 7737f51118..388580f109 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -5,11 +5,9 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/qpid-proton - REF dc244b1f7e886883a2bb416407f42ba55d0f5f42 # 0.32.0 - SHA512 19f191dd206fd43a8f5b8db95f6ada57bd60b93eb907cf32f463c23cfe8c5f4914c6f4750ebde50c970387fb62baf4451279803eeb000bc8bb5c200692e5d1d7 + REF fee5e94afb83b92ffa60a6f815d5102a67915166 # 0.37.0 + SHA512 e9fbd02444dd073908186e6873b4e230e0a5971929e9b1a49758240d166f6da4e6c88d701c66d5e5539bea0beca380c763bffcef5b0e1ed5f9fc2691f5f86559 HEAD_REF next - PATCHES - fix-openssl3.patch ) vcpkg_cmake_configure( @@ -20,6 +18,10 @@ vcpkg_cmake_configure( -DENABLE_JSONCPP=ON -DENABLE_LINKTIME_OPTIMIZATION=OFF -DLIB_SUFFIX= + -DENABLE_WARNING_ERROR=OFF + -DENABLE_BENCHMARKS=OFF + -DENABLE_FUZZ_TESTING=OFF + -DBUILD_TESTING=OFF -DPYTHON_EXECUTABLE=${PYTHON3} ) diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index 5ff4eabf32..5285646cc3 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qpid-proton", - "version": "0.32.0", - "port-version": 5, + "version": "0.37.0", "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f5a47f2c47..c0967972e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5649,8 +5649,8 @@ "port-version": 2 }, "qpid-proton": { - "baseline": "0.32.0", - "port-version": 5 + "baseline": "0.37.0", + "port-version": 0 }, "qscintilla": { "baseline": "2.12.0", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index d4e5f16a97..a7a727c359 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "720cc65a7b408878662ce7c749211fa7edaf25fd", + "version": "0.37.0", + "port-version": 0 + }, { "git-tree": "bc437ca04548b4ca544af845a2e2327010aa3281", "version": "0.32.0",