diff --git a/patchs/zinface-community-cmake-build-system.patch b/patchs/zinface-community-cmake-build-system.patch index e90a5b1..4a9c2c0 100644 --- a/patchs/zinface-community-cmake-build-system.patch +++ b/patchs/zinface-community-cmake-build-system.patch @@ -1,7 +1,7 @@ -From a6d1e45b659059bec26c8becb1c6b9116110ed35 Mon Sep 17 00:00:00 2001 +From 8e13ffee97dc4ec1f9b6af8e7d712050ddc6d79a Mon Sep 17 00:00:00 2001 From: zinface <zinface@163.com> Date: Sun, 11 Dec 2022 22:27:23 +0800 -Subject: [PATCH 1/3] =?UTF-8?q?repo:=20=E4=B8=80=E6=AC=A1=E6=80=A7?= +Subject: [PATCH 1/4] =?UTF-8?q?repo:=20=E4=B8=80=E6=AC=A1=E6=80=A7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=20spark=20=E9=AA=A8=E6=9E=B6=E4=BB=A5?= =?UTF-8?q?=E5=8F=98=E4=B8=BA=20cmake=20=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 @@ -9,6 +9,7 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: 需处理 deb 安装脚本的问题 +Signed-off-by: zinface <zinface@163.com> --- .gitignore | 34 +++ CMakeLists.txt | 93 ++++++++ @@ -1788,10 +1789,10 @@ index 0000000..0fa070b 2.20.1 -From ecb9f9f8f4889beef6a6ff4fab8f3d8cb03d0e22 Mon Sep 17 00:00:00 2001 +From f59d5f82b2ae22b538b84afbab1961b6bc03f826 Mon Sep 17 00:00:00 2001 From: zinface <zinface@163.com> Date: Sun, 11 Dec 2022 22:37:26 +0800 -Subject: [PATCH 2/3] =?UTF-8?q?repo:=20=E5=A4=84=E7=90=86=20deb=20?= +Subject: [PATCH 2/4] =?UTF-8?q?repo:=20=E5=A4=84=E7=90=86=20deb=20?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90=20cmake=20=E5=8C=96=E6=9E=84?= =?UTF-8?q?=E5=BB=BA?= @@ -1799,6 +1800,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Signed-off-by: zinface <zinface@163.com> --- Makefile | 16 +++++++++++++++- cmake/DebPackageConfig.cmake | 8 ++++---- @@ -1854,16 +1856,17 @@ index 2ab24e7..38ad2d7 100644 2.20.1 -From 4ebfbbf4ab673947008ed08b00bfb064132b7210 Mon Sep 17 00:00:00 2001 +From 0ca1321e26e08819a89bc8c1b0abfccd8c6084c1 Mon Sep 17 00:00:00 2001 From: zinface <zinface@163.com> Date: Mon, 12 Dec 2022 00:50:01 +0800 -Subject: [PATCH 3/3] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=20Spark=20?= +Subject: [PATCH 3/4] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=20Spark=20?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=20=E4=B8=8E=20CMake=20=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=A2=84=E8=A7=88=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +Signed-off-by: zinface <zinface@163.com> --- DOCS/spark-cmake-build-system.md | 301 +++++++++++++++++++++++++++++++ 1 file changed, 301 insertions(+) @@ -2180,3 +2183,55 @@ index 0000000..a807009 -- 2.20.1 + +From ed6cee35b0d8d0a30f44c67f8fa7f4eee926477d Mon Sep 17 00:00:00 2001 +From: zinface <zinface@163.com> +Date: Thu, 15 Dec 2022 19:59:46 +0800 +Subject: [PATCH 4/4] =?UTF-8?q?repo:=20=E6=9B=B4=E6=96=B0=E7=94=A8?= + =?UTF-8?q?=E4=BA=8E=20Qt5=20Svg=20=E4=BE=9D=E8=B5=96=E7=9A=84=E6=9E=84?= + =?UTF-8?q?=E5=BB=BA=E5=86=85=E5=AE=B9?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + CMakeLists.txt | 1 + + cmake/SparkFindQt5Config.cmake | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5864b54..14530e1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,6 +32,7 @@ spark_add_library_realpaths( + target_link_qt5_dbus(dbus) + target_link_qt5_Concurrent(common) + target_link_qt5_Concurrent(backend) ++target_link_qt5_Svg(common) + target_link_qt5_WebEngineWidgets(common) + + spark_add_executable_path(${PROJECT_NAME} src +diff --git a/cmake/SparkFindQt5Config.cmake b/cmake/SparkFindQt5Config.cmake +index b56399f..67e29b6 100644 +--- a/cmake/SparkFindQt5Config.cmake ++++ b/cmake/SparkFindQt5Config.cmake +@@ -1,6 +1,6 @@ + cmake_minimum_required(VERSION 3.5.1) + +-find_package(Qt5 COMPONENTS Core Widgets Network Concurrent WebEngineWidgets Sql WebSockets REQUIRED) ++find_package(Qt5 COMPONENTS Core Widgets Network Concurrent WebEngineWidgets REQUIRED) + + # function(target_link_qt5 NAME) + # target_link_libraries(${NAME} +@@ -132,7 +132,7 @@ spark_add_links_qt5( + # SerialPort + # ServiceSupport + # Sql +- # Svg ++ Svg + # Test + # ThemeSupport + # UiPlugin +-- +2.20.1 +