From 8b38aa84c9c6264986ec494f2c9be0750162ac43 Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 06:56:05 +0000 Subject: [PATCH 1/4] update ft_flutter.spec. Signed-off-by: zxstty --- ft_flutter.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ft_flutter.spec b/ft_flutter.spec index 3ded6f7..90bb66c 100644 --- a/ft_flutter.spec +++ b/ft_flutter.spec @@ -22,15 +22,26 @@ Source0: https://gitee.com/openeuler/ft_flutter/repository/archive/ft_flu BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build BuildRequires: compiler-rt llvm-devel libdrm-devel systemd-devel harfbuzz-devel jsoncpp-devel expat-devel -BuildRequires: distributed-utils distributed-build 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: 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 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: 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 This repository provides glfw, skia modules for ft_engine. From 6c36f1ede8ee30a9e407fa0528f289568b151971 Mon Sep 17 00:00:00 2001 From: zxstty Date: Thu, 14 Dec 2023 08:07:48 +0000 Subject: [PATCH 2/4] update ft_flutter.spec. Signed-off-by: zxstty --- ft_flutter.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ft_flutter.spec b/ft_flutter.spec index 90bb66c..bdff687 100644 --- a/ft_flutter.spec +++ b/ft_flutter.spec @@ -25,7 +25,7 @@ BuildRequires: compiler-rt llvm-devel libdrm-devel systemd-devel harfbuzz-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: distributed-build distributed-beget +BuildRequires: distributed-build distributed-beget distributedhardware_device_manager BuildRequires: commonlibrary_c_utils BuildRequires: notification_eventhandler BuildRequires: communication_ipc communication_dsoftbus @@ -36,7 +36,7 @@ Requires: compiler-rt llvm-devel python3 libdrm-devel systemd-devel harfbu 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: distributed-beget +Requires: distributed-beget distributedhardware_device_manager Requires: commonlibrary_c_utils Requires: notification_eventhandler Requires: communication_ipc communication_dsoftbus From 6252652261efad3dea15a7543c6bf8f804b968ed Mon Sep 17 00:00:00 2001 From: heppen Date: Thu, 14 Dec 2023 17:32:50 +0800 Subject: [PATCH 3/4] Update config system deps --- 0001-update-system-deps.patch | 35 +++++++++++++++++++++++++++++++++++ ft_flutter.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..7df649b --- /dev/null +++ b/0001-update-system-deps.patch @@ -0,0 +1,35 @@ +From b50984ca839d72df07331a9c6a9e28a32aefbc77 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Thu, 14 Dec 2023 17:28:26 +0800 +Subject: [PATCH] update system deps + +--- + project_build/configs/system_deps.toml | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/project_build/configs/system_deps.toml b/project_build/configs/system_deps.toml +index 385894cb..3702cff5 100755 +--- a/project_build/configs/system_deps.toml ++++ b/project_build/configs/system_deps.toml +@@ -33,6 +33,17 @@ package_deps = [ + "harfbuzz-devel", + "jsoncpp-devel", + "expat-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_flutter.spec b/ft_flutter.spec index bdff687..1b205b7 100644 --- a/ft_flutter.spec +++ b/ft_flutter.spec @@ -13,12 +13,13 @@ Name: ft_flutter Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: This repository provides glfw, skia modules for ft_engine. License: Apache-2.0 URL: https://gitee.com/openeuler/ft_flutter Source0: https://gitee.com/openeuler/ft_flutter/repository/archive/ft_flutter-1.0.0.tar.gz +Patch0: 0001-update-system-deps.patch BuildRequires: clang python3 python3-pip python-toml tar cmake ninja-build BuildRequires: compiler-rt llvm-devel libdrm-devel systemd-devel harfbuzz-devel jsoncpp-devel expat-devel @@ -660,5 +661,8 @@ rm -rf %{buildroot} #/usr/local/include/* %changelog +* Thu Nov 14 2023 Peng He - 1.0.0-2 +- Update requires + * Tue Oct 10 2023 xieyijun3 - 1.0.0-1 - From b162478540cc55d3a29a0bf5f26b92f8d19ab57e Mon Sep 17 00:00:00 2001 From: zxstty Date: Fri, 15 Dec 2023 02:12:10 +0000 Subject: [PATCH 4/4] update ft_flutter.spec. Signed-off-by: zxstty --- ft_flutter.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ft_flutter.spec b/ft_flutter.spec index 1b205b7..01c7ce2 100644 --- a/ft_flutter.spec +++ b/ft_flutter.spec @@ -661,8 +661,8 @@ rm -rf %{buildroot} #/usr/local/include/* %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 -