|
|
|
|
diff -ruN qpid-proton-0.38.0.orig/CMakeLists.txt qpid-proton-0.38.0/CMakeLists.txt
|
|
|
|
|
--- qpid-proton-0.38.0.orig/CMakeLists.txt 2022-11-07 11:35:09.000000000 -0500
|
|
|
|
|
+++ qpid-proton-0.38.0/CMakeLists.txt 2022-11-23 10:19:17.963751717 -0500
|
|
|
|
|
@@ -42,7 +42,7 @@
|
|
|
|
|
if (NOT DEFINED Python_FIND_FRAMEWORK)
|
|
|
|
|
set(Python_FIND_FRAMEWORK "LAST")
|
|
|
|
|
endif ()
|
|
|
|
|
-find_package(Python 3.6
|
|
|
|
|
+find_package(Python 3.9
|
|
|
|
|
REQUIRED COMPONENTS Interpreter
|
|
|
|
|
OPTIONAL_COMPONENTS Development)
|
|
|
|
|
|
|
|
|
|
diff -ruN qpid-proton-0.38.0.orig/cpp/src/map_test.cpp qpid-proton-0.38.0/cpp/src/map_test.cpp
|
|
|
|
|
--- qpid-proton-0.38.0.orig/cpp/src/map_test.cpp 2022-11-07 11:35:09.000000000 -0500
|
|
|
|
|
+++ qpid-proton-0.38.0/cpp/src/map_test.cpp 2023-01-26 10:49:44.159634165 -0500
|
|
|
|
|
@@ -114,6 +114,20 @@
|
|
|
|
|
ASSERT_THROWS(conversion_error, m.value(bad));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+void test_copy_constructor() {
|
|
|
|
|
+ proton::map<string, scalar> m = std::map<string, scalar>{{"a", 2}, {"b", 3}};
|
|
|
|
|
+ ASSERT_EQUAL(scalar(2), m.get("a"));
|
|
|
|
|
+ ASSERT_EQUAL(scalar(3), m.get("b"));
|
|
|
|
|
+ ASSERT_EQUAL(2U, m.size());
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+void test_initializer_list_constructor() {
|
|
|
|
|
+ proton::map<string, scalar> m({{"a", 2}, {"b", 3}});
|
|
|
|
|
+ ASSERT_EQUAL(scalar(2), m.get("a"));
|
|
|
|
|
+ ASSERT_EQUAL(scalar(3), m.get("b"));
|
|
|
|
|
+ ASSERT_EQUAL(2U, m.size());
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int main(int, char**) {
|
|
|
|
|
@@ -122,5 +136,7 @@
|
|
|
|
|
RUN_TEST(failed, test_use());
|
|
|
|
|
RUN_TEST(failed, test_cppmap());
|
|
|
|
|
RUN_TEST(failed, test_value());
|
|
|
|
|
+ RUN_TEST(failed, test_copy_constructor());
|
|
|
|
|
+ RUN_TEST(failed, test_initializer_list_constructor());
|
|
|
|
|
return failed;
|
|
|
|
|
}
|
|
|
|
|
diff -ruN qpid-proton-0.38.0.orig/python/CMakeLists.txt qpid-proton-0.38.0/python/CMakeLists.txt
|
|
|
|
|
--- qpid-proton-0.38.0.orig/python/CMakeLists.txt 2022-11-07 11:35:09.000000000 -0500
|
|
|
|
|
+++ qpid-proton-0.38.0/python/CMakeLists.txt 2022-11-23 10:20:07.216991810 -0500
|
|
|
|
|
@@ -101,7 +101,7 @@
|
|
|
|
|
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")
|
|
|
|
|
+ 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"
|
