From 48fdc602cf8398fff4932db7ef89daa817ef0d9c Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 07:01:45 +0000 Subject: [PATCH 1/4] update ft_wl_fwk.spec. Signed-off-by: zxstty --- ft_wl_fwk.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/ft_wl_fwk.spec b/ft_wl_fwk.spec index c8af6ce..8c84054 100644 --- a/ft_wl_fwk.spec +++ b/ft_wl_fwk.spec @@ -24,10 +24,23 @@ Source0: https://gitee.com/openeuler/ft_wl_fwk/repository/archive/ft_wl_f BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build compiler-rt BuildRequires: llvm-devel wayland-devel -BuildRequires: distributed-utils ft_engine-devel ft_surface-devel ft_mmi-devel ft_flutter-devel ft_multimedia-devel -BuildRequires: distributed-build mesa-libEGL mesa-libEGL-devel +BuildRequires: ft_engine-devel ft_surface-devel ft_mmi-devel ft_flutter-devel ft_multimedia-devel +BuildRequires: mesa-libEGL mesa-libEGL-devel +BuildRequires: distributed-build distributed-beget +BuildRequires: commonlibrary_c_utils +BuildRequires: notification_eventhandler +BuildRequires: communication_ipc communication_dsoftbus +BuildRequires: security_device_auth security_huks security_device_security_level security_dataclassification +BuildRequires: systemabilitymgr_safwk systemabilitymgr_samgr + Requires: compiler-rt llvm-devel python3 -Requires: distributed-utils ft_engine ft_surface ft_mmi ft_flutter ft_multimedia mesa-libEGL mesa-libEGL-devel +Requires: ft_engine ft_surface ft_mmi ft_flutter ft_multimedia mesa-libEGL mesa-libEGL-devel +Requires: distributed-beget +Requires: commonlibrary_c_utils +Requires: notification_eventhandler +Requires: communication_ipc communication_dsoftbus +Requires: security_device_auth security_huks security_device_security_level security_dataclassification +Requires: systemabilitymgr_safwk systemabilitymgr_samgr %description ft_wl_fwk is implementation of wayland-protocol. The implementation is based on FangTian. From 719b646c30877b1cb43098d7b3c82dbafdbfbee8 Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 08:06:51 +0000 Subject: [PATCH 2/4] update ft_wl_fwk.spec. Signed-off-by: zxstty --- ft_wl_fwk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ft_wl_fwk.spec b/ft_wl_fwk.spec index 8c84054..466ecb2 100644 --- a/ft_wl_fwk.spec +++ b/ft_wl_fwk.spec @@ -26,7 +26,7 @@ BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build comp BuildRequires: llvm-devel wayland-devel BuildRequires: ft_engine-devel ft_surface-devel ft_mmi-devel ft_flutter-devel ft_multimedia-devel BuildRequires: mesa-libEGL mesa-libEGL-devel -BuildRequires: distributed-build distributed-beget +BuildRequires: distributed-build distributed-beget distributedhardware_device_manager BuildRequires: commonlibrary_c_utils BuildRequires: notification_eventhandler BuildRequires: communication_ipc communication_dsoftbus @@ -35,7 +35,7 @@ BuildRequires: systemabilitymgr_safwk systemabilitymgr_samgr Requires: compiler-rt llvm-devel python3 Requires: ft_engine ft_surface ft_mmi ft_flutter ft_multimedia mesa-libEGL mesa-libEGL-devel -Requires: distributed-beget +Requires: distributed-beget distributedhardware_device_manager Requires: commonlibrary_c_utils Requires: notification_eventhandler Requires: communication_ipc communication_dsoftbus From 7f70ead50b7107b0094674cdaba9f822f16b92a8 Mon Sep 17 00:00:00 2001 From: heppen Date: Thu, 14 Dec 2023 22:21:58 +0800 Subject: [PATCH 3/4] change deps --- 0001-change-deps.patch | 36 ++++++++++++++++++++++++++++++++++++ ft_wl_fwk.spec | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-change-deps.patch diff --git a/0001-change-deps.patch b/0001-change-deps.patch new file mode 100644 index 0000000..2abd0ed --- /dev/null +++ b/0001-change-deps.patch @@ -0,0 +1,36 @@ +From 27dd6b8cc8ab09421ea4c073aaecaec32fe78049 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Thu, 14 Dec 2023 22:18:27 +0800 +Subject: [PATCH] change deps + +--- + build/configs/system_deps.toml | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/build/configs/system_deps.toml b/build/configs/system_deps.toml +index b5c7cbd..bb9c693 100755 +--- a/build/configs/system_deps.toml ++++ b/build/configs/system_deps.toml +@@ -29,7 +29,18 @@ package_deps = [ + "cmake", + "wayland-devel", + "ft_engine-devel", +- "distributed-utils", + "distributed-build", ++ "distributed-beget", ++ "commonlibrary_c_utils", ++ "notification_eventhandler", ++ "communication_ipc", ++ "communication_dsoftbus", ++ "security_device_auth", ++ "security_huks", ++ "security_device_security_level", ++ "security_dataclassification", ++ "systemabilitymgr_safwk", ++ "systemabilitymgr_samgr", ++ "distributedhardware_device_manager", + "mesa-libEGL-devel", + ] +-- +2.33.0 + diff --git a/ft_wl_fwk.spec b/ft_wl_fwk.spec index 466ecb2..2985fde 100644 --- a/ft_wl_fwk.spec +++ b/ft_wl_fwk.spec @@ -41,7 +41,7 @@ Requires: notification_eventhandler Requires: communication_ipc communication_dsoftbus Requires: security_device_auth security_huks security_device_security_level security_dataclassification Requires: systemabilitymgr_safwk systemabilitymgr_samgr - +Patch0: 0001-change-deps.patch %description ft_wl_fwk is implementation of wayland-protocol. The implementation is based on FangTian. From 903e0842dd9de9009a0878a5daaf64a5c311b1d2 Mon Sep 17 00:00:00 2001 From: zxstty Date: Fri, 15 Dec 2023 02:09:39 +0000 Subject: [PATCH 4/4] update ft_wl_fwk.spec. Signed-off-by: zxstty --- ft_wl_fwk.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ft_wl_fwk.spec b/ft_wl_fwk.spec index 2985fde..a8309a1 100644 --- a/ft_wl_fwk.spec +++ b/ft_wl_fwk.spec @@ -15,7 +15,7 @@ Name: ft_wl_fwk Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Implementation of wayland-protocol License: Apache-2.0 @@ -73,6 +73,8 @@ rm -rf %{buildroot} /system/profile/ft/* %changelog +* Fri Dec 15 2023 Jiaqi Zhao - 1.0.0-2 +- Delete distributed-utils requires and update deps * Mon Nov 6 2023 abc12133 - 1.0.0-1 -