From 83d89a924be7f41e1fb4ff8ef494fc995e08736a Mon Sep 17 00:00:00 2001 From: yanansong Date: Fri, 27 Oct 2023 10:15:28 +0800 Subject: [PATCH 1/2] bugfix --- 0014-fixbug-metaDescriptor-for-ipc.patch | 15 +++++++++++++++ distributed-utils.spec | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 0014-fixbug-metaDescriptor-for-ipc.patch diff --git a/0014-fixbug-metaDescriptor-for-ipc.patch b/0014-fixbug-metaDescriptor-for-ipc.patch new file mode 100644 index 0000000..0e54cf3 --- /dev/null +++ b/0014-fixbug-metaDescriptor-for-ipc.patch @@ -0,0 +1,15 @@ +diff --git a/interfaces/innerkits/ipc_core/include/iremote_broker.h b/interfaces/innerkits/ipc_core/include/iremote_broker.h +index 7105ff7..692f4b0 100644 +--- a/interfaces/innerkits/ipc_core/include/iremote_broker.h ++++ b/interfaces/innerkits/ipc_core/include/iremote_broker.h +@@ -50,8 +50,8 @@ public: + }; + + #define DECLARE_INTERFACE_DESCRIPTOR(DESCRIPTOR) \ +- static inline const std::u16string metaDescriptor_ = { DESCRIPTOR }; \ +- static inline const std::u16string &GetDescriptor() \ ++ static constexpr const char16_t *metaDescriptor_ = { DESCRIPTOR }; \ ++ static inline const std::u16string GetDescriptor() \ + { \ + return metaDescriptor_; \ + } diff --git a/distributed-utils.spec b/distributed-utils.spec index 81073fc..167ef4a 100644 --- a/distributed-utils.spec +++ b/distributed-utils.spec @@ -59,6 +59,7 @@ Patch10: 0010-adapt-for-build-mbedtls.patch Patch11: 0011-remove-dependency-and-adapt-for-build-device_manager.patch Patch12: 0012-remove-dependency-and-adapt-for-build-device_security_level.patch Patch13: 0013-increase-the-pthread-stack-size-of-x86-and-other-env-dsoftbus.patch +Patch14: 0014-fixbug-metaDescriptor-for-ipc.patch BuildRequires: python3-jinja2 python3-pyyaml cjson cjson-devel BuildRequires: libatomic libicu-devel libxml2-devel openssl-devel @@ -115,6 +116,7 @@ rm -rf %{_builddir}/third_party/mbedtls/* %patch11 -p1 -d %{device_manager_dir} %patch12 -p1 -d %{device_security_level_dir} %patch13 -p1 -d %{dsoftbus_dir} +%patch14 -p1 -d %{ipc_dir} # build all components with build.sh %build @@ -213,6 +215,9 @@ cp -rvf single_include/nlohmann %{buildroot}/%{_includedir}/nlohmann_json/single /usr/bin/* %changelog +* Fri Oct 27 2023 yanansong - 1.0.0-5 +- fixbug metaDescriptor initialization. + * Wed Jul 26 2023 Ge Wang - 1.0.0-4 - add deficient component. -- Gitee From 7fd2f91624a79a37de130b8db66225224650fc75 Mon Sep 17 00:00:00 2001 From: yanansong Date: Fri, 27 Oct 2023 02:48:16 +0000 Subject: [PATCH 2/2] release 1.0.0-5 Signed-off-by: yanansong --- distributed-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributed-utils.spec b/distributed-utils.spec index 167ef4a..21f3b17 100644 --- a/distributed-utils.spec +++ b/distributed-utils.spec @@ -23,7 +23,7 @@ Name: distributed-utils Version: 1.0.0 -Release: 4 +Release: 5 Summary: Distributed middleware used components. License: Apache-2.0 and MIT Url: https://gitee.com/openharmony/ -- Gitee