!10 Upgrade to support Yoga

From: @huangtianhua 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2022-07-14 07:13:11 +00:00 committed by Gitee
commit 89d28aadd3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 8 additions and 61 deletions

Binary file not shown.

BIN
0.36.0.tar.gz Normal file

Binary file not shown.

View File

@ -1,43 +0,0 @@
From 7d07d0587ba62ffb44112fbde8ccd189542f0099 Mon Sep 17 00:00:00 2001
From: wang_yue111 <648774160@qq.com>
Date: Tue, 10 Aug 2021 11:26:13 +0800
Subject: [PATCH] Patch for non-constant SIGSTKSZ
---
tests/include/catch.hpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/include/catch.hpp b/tests/include/catch.hpp
index f619f23..9b342ec 100644
--- a/tests/include/catch.hpp
+++ b/tests/include/catch.hpp
@@ -6540,7 +6540,7 @@ namespace Catch {
static bool isSet;
static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
static stack_t oldSigStack;
- static char altStackMem[SIGSTKSZ];
+ static char altStackMem[32768];
static void handleSignal( int sig ) {
std::string name = "<unknown signal>";
@@ -6560,7 +6560,7 @@ namespace Catch {
isSet = true;
stack_t sigStack;
sigStack.ss_sp = altStackMem;
- sigStack.ss_size = SIGSTKSZ;
+ sigStack.ss_size = 32768;
sigStack.ss_flags = 0;
sigaltstack(&sigStack, &oldSigStack);
struct sigaction sa = { 0 };
@@ -6591,7 +6591,7 @@ namespace Catch {
bool FatalConditionHandler::isSet = false;
struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
stack_t FatalConditionHandler::oldSigStack = {};
- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
+ char FatalConditionHandler::altStackMem[32768] = {};
} // namespace Catch
--
2.23.0

View File

@ -1,26 +1,13 @@
From e5522e87e2597ee9898cd9699c8c27bc6f8b12b1 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvdr@localhost.localdomain>
Date: Tue, 10 Dec 2019 10:56:30 -0500
Subject: [PATCH] Changed Sphinx invocation from sphinx to sphinx-build for
RHEL7
---
python/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 87057d8..9176ba5 100644
index 06caf61..f8735fd 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -127,7 +127,7 @@ else ()
@@ -124,7 +124,7 @@ else ()
COMMAND ${PN_ENV_SCRIPT} --
PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}
LD_LIBRARY_PATH="${CMAKE_CURRENT_BINARY_DIR}/c"
- ${PYTHON_EXECUTABLE} -m sphinx "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_BINARY_DIR}/docs")
- ${Python_EXECUTABLE} -m sphinx "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_BINARY_DIR}/docs")
+ sphinx-build "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_BINARY_DIR}/docs")
add_dependencies(docs docs-py)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docs/"
DESTINATION "${PROTON_SHARE}/docs/api-py"
--
1.8.3.1

View File

@ -10,14 +10,14 @@
%global proton_licensedir %{_datadir}/proton}
Name: qpid-proton
Version: 0.33.0
Version: 0.36.0
Release: 1
Summary: A high performance and lightweight library for messaging applications
License: ASL 2.0
URL: http://qpid.apache.org/proton/
Source0: https://github.com/apache/qpid-proton/archive/%{version}.tar.gz
Patch0000: proton.patch
Patch0001: for-non-constant-SIGSTKSZ.patch
#Patch0001: for-non-constant-SIGSTKSZ.patch
BuildRequires: gcc gcc-c++ cmake swig pkgconfig doxygen libuuid-devel openssl-devel
BuildRequires: python3-devel python3-sphinx glibc-headers cyrus-sasl-devel jsoncpp-devel
@ -175,6 +175,9 @@ done
%doc %{_datadir}/proton/tests
%changelog
* Thu Jul 14 2022 huangtianhua <huangtianhua@huawei.com> - 0.36.0-1
- Update to 0.36.0 to support OpenStack Yoga
* Tue Jul 13 2021 huangtianhua <huangtianhua@huawei.com> - 0.33.0-1
- Update to 0.33.0