diff --git a/0005-fix-distributeddatafwk_public_config-visibility.patch b/0005-fix-distributeddatafwk_public_config-visibility.patch new file mode 100644 index 0000000..584deaa --- /dev/null +++ b/0005-fix-distributeddatafwk_public_config-visibility.patch @@ -0,0 +1,25 @@ +From d2a6f6d24cfb19998ec00046184fc49b6c400b5e Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Mon, 2 Sep 2024 17:25:23 +0800 +Subject: [PATCH 1/2] fix distributeddatafwk_public_config visibility + +--- + interfaces/innerkits/distributeddata/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/interfaces/innerkits/distributeddata/BUILD.gn b/interfaces/innerkits/distributeddata/BUILD.gn +index b7fde21..ea0d04a 100644 +--- a/interfaces/innerkits/distributeddata/BUILD.gn ++++ b/interfaces/innerkits/distributeddata/BUILD.gn +@@ -44,7 +44,7 @@ config("distributeddatafwk_config") { + } + + config("distributeddatafwk_public_config") { +- visibility = [ "//foundation/distributeddatamgr/kv_store:*" ] ++ visibility = [ ":*" ] + + include_dirs = [ + "include", +-- +2.45.2.windows.1 + diff --git a/0006-feat-for-embedded-fix-TaskExecutor-attribute-error.patch b/0006-feat-for-embedded-fix-TaskExecutor-attribute-error.patch new file mode 100644 index 0000000..fc41295 --- /dev/null +++ b/0006-feat-for-embedded-fix-TaskExecutor-attribute-error.patch @@ -0,0 +1,25 @@ +From 97c6885df28d613ba85c7d1fa62975c884e0dbee Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Thu, 27 Jun 2024 15:39:42 +0800 +Subject: [PATCH 2/2] feat for embedded fix TaskExecutor attribute error + +--- + interfaces/innerkits/distributeddata/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/interfaces/innerkits/distributeddata/BUILD.gn b/interfaces/innerkits/distributeddata/BUILD.gn +index ea0d04a..416a5ff 100644 +--- a/interfaces/innerkits/distributeddata/BUILD.gn ++++ b/interfaces/innerkits/distributeddata/BUILD.gn +@@ -20,7 +20,7 @@ group("build_module") { + config("distributeddatafwk_config") { + visibility = [ ":*" ] + +- cflags = [ "-Wno-multichar" ] ++ cflags = [ "-Wno-multichar", "-Wno-attributes" ] + + include_dirs = [ + "include", +-- +2.45.2.windows.1 + diff --git a/distributeddatamgr_kv_store.spec b/distributeddatamgr_kv_store.spec index 6a84f1d..23ae5bb 100644 --- a/distributeddatamgr_kv_store.spec +++ b/distributeddatamgr_kv_store.spec @@ -6,7 +6,7 @@ Name: distributeddatamgr_kv_store Version: 1.0.0 -Release: 4 +Release: 5 Summary: Supports distributed key-value data management License: Apache-2.0 Url: https://gitee.com/openharmony/distributeddatamgr_kv_store @@ -18,6 +18,8 @@ Patch1: 0001-remove-useless-dependency-datashare.patch Patch2: 0002-remove-useless-dependency-hitrace-hisysevent.patch Patch3: 0003-remove-useless-dependency-compile.patch Patch4: 0004-establish-kvstore-dependence-on-boundscheck.patch +Patch5: 0005-fix-distributeddatafwk_public_config-visibility.patch +Patch6: 0006-feat-for-embedded-fix-TaskExecutor-attribute-error.patch BuildRequires: libboundscheck, zlib, zlib-devel, jsoncpp, jsoncpp-devel, compat-openssl11-devel BuildRequires: distributed-build, distributed-beget, hilog, commonlibrary_c_utils @@ -55,6 +57,8 @@ mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/kv_store %patch -P2 -p1 -d %{distributeddata_dir}/kv_store %patch -P3 -p1 -d %{distributeddata_dir}/kv_store %patch -P4 -p1 -d %{distributeddata_dir}/kv_store +%patch -P5 -p1 -d %{distributeddata_dir}/kv_store +%patch -P6 -p1 -d %{distributeddata_dir}/kv_store %build %ifarch x86_64 @@ -114,6 +118,9 @@ popd /system/* %changelog +* Mon Sep 2 2024 s_c_c - 1.0.0-5 +- Fix distributeddatafwk_public_config visibility for gn and attribute error. + * Tue Nov 21 2023 Peng He - 1.0.0-4 - Update build requires and requires.