From 5e758df35d0372e5e14c38f0aa0ae8db127104b9 Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 03:44:34 +0000 Subject: [PATCH 1/4] update ft_engine.spec. Signed-off-by: zxstty --- ft_engine.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/ft_engine.spec b/ft_engine.spec index 84a52fc..fe6a53f 100644 --- a/ft_engine.spec +++ b/ft_engine.spec @@ -24,18 +24,30 @@ Source0: https://gitee.com/openeuler/ft_engine/repository/archive/ft_engi BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build compiler-rt BuildRequires: llvm-devel gtest-devel harfbuzz-devel libxml2-devel libpng-devel libicu wayland-devel libdrm-devel systemd-pam systemd-devel libexif-devel cjson-devel -BuildRequires: distributed-utils ft_surface-devel ft_mmi-devel ft_flutter-devel ft_multimedia-devel +BuildRequires: ft_surface-devel ft_mmi-devel ft_flutter-devel ft_multimedia-devel BuildRequires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers BuildRequires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm BuildRequires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers -BuildRequires: libjpeg-devel distributed-build +BuildRequires: libjpeg-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 libdrm-devel systemd-devel harfbuzz-devel jsoncpp-devel expat-devel -Requires: distributed-utils ft_surface ft_mmi ft_flutter ft_multimedia +Requires: ft_surface ft_mmi ft_flutter ft_multimedia Requires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvnd-gles libglvnd-glx libglvnd-opengl mesa-dri-drivers Requires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm Requires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers Requires: libjpeg-turbo - +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_engine consists of window display and window management, providing the core capabilities of the Windows engine. From c5663f81a521b53f06a2bde181f9ce9e8c712945 Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 08:08:30 +0000 Subject: [PATCH 2/4] update ft_engine.spec. Signed-off-by: zxstty --- ft_engine.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ft_engine.spec b/ft_engine.spec index fe6a53f..af6e7b7 100644 --- a/ft_engine.spec +++ b/ft_engine.spec @@ -29,7 +29,7 @@ BuildRequires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvn BuildRequires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm BuildRequires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers BuildRequires: libjpeg-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 @@ -42,7 +42,7 @@ Requires: libglvnd libglvnd-core-devel libglvnd-devel libglvnd-egl libglvn Requires: mesa-filesystem mesa-libEGL mesa-libEGL-devel mesa-libGL mesa-libGL-devel mesa-libOSMesa mesa-libOSMesa-devel mesa-libgbm Requires: mesa-libgbm-devel mesa-libglapi mesa-libxatracker mesa-libxatracker-devel mesa-vdpau-drivers vulkan-devel mesa-vulkan-drivers Requires: libjpeg-turbo -Requires: distributed-beget +Requires: distributed-beget distributedhardware_device_manager Requires: commonlibrary_c_utils Requires: notification_eventhandler Requires: communication_ipc communication_dsoftbus From a7234e954f67166932554f2841a0591dd921174f Mon Sep 17 00:00:00 2001 From: heppen Date: Thu, 14 Dec 2023 17:32:35 +0800 Subject: [PATCH 3/4] Update config system deps --- 0001-update-system-deps.patch | 35 +++++++++++++++++++++++++++++++++++ ft_engine.spec | 6 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-update-system-deps.patch diff --git a/0001-update-system-deps.patch b/0001-update-system-deps.patch new file mode 100644 index 0000000..63b5279 --- /dev/null +++ b/0001-update-system-deps.patch @@ -0,0 +1,35 @@ +From a3610b0a3aaedc3e80373f6fd76b1b71b9b77982 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Thu, 14 Dec 2023 17:18:17 +0800 +Subject: [PATCH] update system 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 02c834b..18aba2b 100755 +--- a/build/configs/system_deps.toml ++++ b/build/configs/system_deps.toml +@@ -43,6 +43,17 @@ package_deps = [ + "cjson-devel", + # GPU render + "openssl-devel", +- "distributed-utils", ++ "distributed-beget", ++ "distributedhardware_device_manager", ++ "commonlibrary_c_utils", ++ "notification_eventhandler", ++ "communication_ipc", ++ "communication_dsoftbus", ++ "security_device_auth", ++ "security_huks", ++ "security_device_security_level", ++ "security_dataclassification", ++ "systemabilitymgr_safwk", ++ "systemabilitymgr_samgr", + "distributed-build", + ] +-- +2.33.0 + diff --git a/ft_engine.spec b/ft_engine.spec index af6e7b7..68e67e0 100644 --- a/ft_engine.spec +++ b/ft_engine.spec @@ -15,12 +15,13 @@ Name: ft_engine Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ft_engine consists of window display and window management, providing the core capabilities of the Windows engine. License: Apache-2.0 URL: https://gitee.com/openeuler/ft_engine Source0: https://gitee.com/openeuler/ft_engine/repository/archive/ft_engine-1.0.0.tar.gz +Patch0: 0001-update-system-deps.patch BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build compiler-rt BuildRequires: llvm-devel gtest-devel harfbuzz-devel libxml2-devel libpng-devel libicu wayland-devel libdrm-devel systemd-pam systemd-devel libexif-devel cjson-devel @@ -376,5 +377,8 @@ rm -rf %{buildroot} %{_includedir}/* %changelog +* Thu Nov 14 2023 Peng He - 1.0.0-2 +- Update requires + * Tue Oct 10 2023 xieyijun3 - 1.0.0-1 - From 202e7e902c03df7790f95ceca05006515583b9bb Mon Sep 17 00:00:00 2001 From: zxstty Date: Fri, 15 Dec 2023 02:12:43 +0000 Subject: [PATCH 4/4] update ft_engine.spec. Signed-off-by: zxstty --- ft_engine.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ft_engine.spec b/ft_engine.spec index 68e67e0..8af85b9 100644 --- a/ft_engine.spec +++ b/ft_engine.spec @@ -377,8 +377,8 @@ rm -rf %{buildroot} %{_includedir}/* %changelog -* Thu Nov 14 2023 Peng He - 1.0.0-2 -- Update requires +* Fri Dec 15 2023 Jiaqi Zhao - 1.0.0-2 +- Delete distributed-utils requires and update deps * Tue Oct 10 2023 xieyijun3 - 1.0.0-1 -