From 1b91400c790c985821765e3166e58211606bb212 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 13 Oct 2021 21:59:50 +0200 Subject: [PATCH] - up to 0.35.0 - don't use Werror when using deprecated openssl APIs --- no-Werror.patch | 13 +++++++++++++ qpid-proton-format.patch | 11 ----------- qpid-proton.spec | 6 +++--- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 no-Werror.patch delete mode 100644 qpid-proton-format.patch diff --git a/no-Werror.patch b/no-Werror.patch new file mode 100644 index 0000000..a9dcb7c --- /dev/null +++ b/no-Werror.patch @@ -0,0 +1,13 @@ +--- qpid-proton-0.35.0/CMakeLists.txt~ 2021-06-25 15:42:55.000000000 +0200 ++++ qpid-proton-0.35.0/CMakeLists.txt 2021-10-13 21:57:43.540058477 +0200 +@@ -176,10 +176,6 @@ + set (LINK_LTO_Clang "-flto=thin") + set (LINK_LTO_MSVC "/LTCG") + +-set (WERROR_GNU "-Werror") +-set (WERROR_Clang "-Werror") +-set (WERROR_MSVC "") +- + set (COMMON_WARNING_GNU "-Wall -pedantic-errors") + set (COMMON_WARNING_Clang "-Wall -pedantic") + set (COMMON_WARNING_MSVC "") diff --git a/qpid-proton-format.patch b/qpid-proton-format.patch deleted file mode 100644 index 7746cae..0000000 --- a/qpid-proton-format.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qpid-proton-0.32.0/c/tests/threaderciser.c.orig 2020-10-13 19:03:31.807418794 +0200 -+++ qpid-proton-0.32.0/c/tests/threaderciser.c 2020-10-13 19:03:34.654070039 +0200 -@@ -94,7 +94,7 @@ - char msg[256]; - char *i = msg; - char *end = i + sizeof(msg); -- i += assert_no_err(snprintf(i, end-i, "(%lx) ", (uintptr_t) pthread_self())); -+ i += assert_no_err(snprintf(i, end-i, "(%tx) ", (uintptr_t) pthread_self())); - if (i < end) { - va_list ap; - va_start(ap, fmt); diff --git a/qpid-proton.spec b/qpid-proton.spec index 7ba9a22..f2910f7 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -9,13 +9,13 @@ Summary: Qpid Proton - AMQP messaging toolkit Summary(pl.UTF-8): Qpid Proton - narzędzia do komunikacji AMQP Name: qpid-proton -Version: 0.32.0 +Version: 0.35.0 Release: 1 License: Apache v2.0 Group: Libraries Source0: https://downloads.apache.org/qpid/proton/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 5bb5cc9a50f53c76fe281d5e3d5e5342 -Patch0: %{name}-format.patch +# Source0-md5: 568c956964bbdb9dd92af7be2ab6ca8f +Patch0: no-Werror.patch URL: http://qpid.apache.org/proton/ BuildRequires: cmake >= 2.8.12 BuildRequires: cyrus-sasl-devel -- 2.43.0