From 02fd8871164c7c274318ba375a12aa8c0a61e0cd Mon Sep 17 00:00:00 2001 From: zinface Date: Mon, 19 Dec 2022 03:00:25 +0800 Subject: [PATCH] =?UTF-8?q?cmake-patch:=20=E6=9B=B4=E6=96=B0=E8=A1=A5?= =?UTF-8?q?=E4=B8=81=E7=94=A8=E4=BA=8E=E6=94=AF=E6=8C=81=20BaseWidgetOpaci?= =?UTF-8?q?ty=20=E5=9F=BA=E7=A1=80=E7=B1=BB=E7=9A=84=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 此补丁包含以下内容: .gitignore | 34 ++++ CMakeLists.txt | 93 ++++++++++ Makefile | 60 ++++++ assets/spark.png | Bin cmake/DebPackageConfig.cmake | 327 ++++++++++++++++++++++++++++++++++ cmake/SparkAppimageConfig.cmake | 133 ++++++++++++++ cmake/SparkBuildGraphviz.cmake | 8 + cmake/SparkDesktopMacros.cmake | 35 ++++ cmake/SparkEnvConfig.cmake | 8 + cmake/SparkFindDtkConfig.cmake | 11 + cmake/SparkFindLibraries.cmake | 7 + cmake/SparkFindQt5Config.cmake | 154 ++++++++++++++++ cmake/SparkFindQt6Config.cmake | 24 ++ cmake/SparkInstallMacrosConfig.cmake | 132 ++++++++++++++ cmake/SparkMacrosConfig.cmake | 129 +++++++++++++ cmake/SparkMacrosExtendConfig.cmake | 197 ++++++++++++++++++++ cmake/SparkTranslatorConfig.cmake | 27 +++ cmake/linuxdeployqt-help | 48 +++++ cmake/package-deb.descript | 45 +++++ cmake/spark-appimage.desktop.in | 9 + cmake/spark-desktop.desktop.in | 11 + Makefile | 16 ++ cmake/DebPackageConfig.cmake | 8 - DOCS/spark-cmake-build-system.md | 301 +++++++++++++++++++++++++++++++ CMakeLists.txt | 1 cmake/SparkFindQt5Config.cmake | 4 CMakeLists.txt | 4 27 files changed, 1818 insertions(+), 8 deletions(-) --- ...zinface-community-cmake-build-system.patch | 63 ++++++++++++++++--- 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/patchs/zinface-community-cmake-build-system.patch b/patchs/zinface-community-cmake-build-system.patch index 4a9c2c0..adc5e3a 100644 --- a/patchs/zinface-community-cmake-build-system.patch +++ b/patchs/zinface-community-cmake-build-system.patch @@ -1,7 +1,7 @@ -From 8e13ffee97dc4ec1f9b6af8e7d712050ddc6d79a Mon Sep 17 00:00:00 2001 +From 9d1714ec7ceb3748bd151af059389ed10d37e676 Mon Sep 17 00:00:00 2001 From: zinface Date: Sun, 11 Dec 2022 22:27:23 +0800 -Subject: [PATCH 1/4] =?UTF-8?q?repo:=20=E4=B8=80=E6=AC=A1=E6=80=A7?= +Subject: [PATCH 1/5] =?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 @@ -1789,10 +1789,10 @@ index 0000000..0fa070b 2.20.1 -From f59d5f82b2ae22b538b84afbab1961b6bc03f826 Mon Sep 17 00:00:00 2001 +From 1e1cb19995536d74626960ae863bf4c5cd9e3a4b Mon Sep 17 00:00:00 2001 From: zinface Date: Sun, 11 Dec 2022 22:37:26 +0800 -Subject: [PATCH 2/4] =?UTF-8?q?repo:=20=E5=A4=84=E7=90=86=20deb=20?= +Subject: [PATCH 2/5] =?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?= @@ -1856,10 +1856,10 @@ index 2ab24e7..38ad2d7 100644 2.20.1 -From 0ca1321e26e08819a89bc8c1b0abfccd8c6084c1 Mon Sep 17 00:00:00 2001 +From 4f07b34bc268bc3c49ef1c51c524d50ccbbf6d07 Mon Sep 17 00:00:00 2001 From: zinface Date: Mon, 12 Dec 2022 00:50:01 +0800 -Subject: [PATCH 3/4] =?UTF-8?q?docs:=20=E6=B7=BB=E5=8A=A0=20Spark=20?= +Subject: [PATCH 3/5] =?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 @@ -2184,10 +2184,10 @@ index 0000000..a807009 2.20.1 -From ed6cee35b0d8d0a30f44c67f8fa7f4eee926477d Mon Sep 17 00:00:00 2001 +From cb59139fcfd74b530a14f2a987aa38d28d403225 Mon Sep 17 00:00:00 2001 From: zinface 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?= +Subject: [PATCH 4/5] =?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 @@ -2235,3 +2235,50 @@ index b56399f..67e29b6 100644 -- 2.20.1 + +From 72e5ca47cef718cdbd4ea45134d574874fb43ba9 Mon Sep 17 00:00:00 2001 +From: zinface +Date: Mon, 19 Dec 2022 02:58:17 +0800 +Subject: [PATCH 5/5] =?UTF-8?q?repo:=20=E6=9B=B4=E6=96=B0=E7=94=A8?= + =?UTF-8?q?=E4=BA=8E=E6=94=AF=E6=8C=81=20BaseWidgetOpacity=20=E5=9F=BA?= + =?UTF-8?q?=E7=A1=80=E7=B1=BB=E7=9A=84=E6=9E=84=E5=BB=BA?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14530e1..b5e32d8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,11 +24,13 @@ spark_add_library_realpaths( + src/dbus + src/utils+dbus + src/backend+utils ++ src/widgets/base + src/widgets/common+backend + src/widgets+common + src/pages+widgets + ) + ++target_link_dtk(base) + target_link_qt5_dbus(dbus) + target_link_qt5_Concurrent(common) + target_link_qt5_Concurrent(backend) +@@ -38,9 +40,9 @@ target_link_qt5_WebEngineWidgets(common) + spark_add_executable_path(${PROJECT_NAME} src + ${QRC_SOURCES} ${SPARK_QM_TRANSLATIONS} + ) ++target_link_base(${PROJECT_NAME}) + target_link_dbus(${PROJECT_NAME}) + target_link_pages(${PROJECT_NAME}) +-target_link_dtk(${PROJECT_NAME}) + + + spark_add_executable_path(spark-dstore-patch src/spark-dstore-patch) +-- +2.20.1 +