mirror of https://gitee.com/cxasm/notepad--.git
cmake-patch: 更新补丁采用项目中完整的 Linux 资源文件安装
This commit is contained in:
zinface
parent
cc90eef3c3
commit
aef7477ffa
|
|
@ -1,7 +1,7 @@
|
|||
From 89bf9397dd2cb22ab130154bb178aeb02b6a56b9 Mon Sep 17 00:00:00 2001
|
||||
From cc06baf3b21851b8addc0f691a31541ca436d395 Mon Sep 17 00:00:00 2001
|
||||
From: coconil <coconil@foxmail.com>
|
||||
Date: Tue, 31 Jan 2023 22:17:32 +0800
|
||||
Subject: [PATCH 01/12] add cmake support
|
||||
Subject: [PATCH 01/13] add cmake support
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
|
|
@ -44,10 +44,10 @@ index b114614..f132dc6 100644
|
|||
2.20.1
|
||||
|
||||
|
||||
From 9fb717fbc4762011e6e9af3b9c5ec2d4a9235d3a Mon Sep 17 00:00:00 2001
|
||||
From 7466475538da85ba7eb24024e34b5fde8babe5f9 Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Wed, 1 Feb 2023 20:04:05 +0800
|
||||
Subject: [PATCH 02/12] =?UTF-8?q?repo:=20=E5=BC=95=E5=85=A5=20Spark=20?=
|
||||
Subject: [PATCH 02/13] =?UTF-8?q?repo:=20=E5=BC=95=E5=85=A5=20Spark=20?=
|
||||
=?UTF-8?q?=E6=9E=84=E5=BB=BA=EF=BC=8C=E6=94=AF=E6=8C=81=E6=9E=84=E5=BB=BA?=
|
||||
=?UTF-8?q?=20deb?=
|
||||
MIME-Version: 1.0
|
||||
|
|
@ -937,10 +937,10 @@ index 0000000..e7c3b18
|
|||
2.20.1
|
||||
|
||||
|
||||
From 24b61f0bab5a3f4f1221b11966993505a665a297 Mon Sep 17 00:00:00 2001
|
||||
From 684ced155e1c749b06e76449177c95db9392c0fc Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Wed, 1 Feb 2023 20:09:49 +0800
|
||||
Subject: [PATCH 03/12] =?UTF-8?q?repo:=20=E5=BC=95=E5=85=A5=20Spark=20?=
|
||||
Subject: [PATCH 03/13] =?UTF-8?q?repo:=20=E5=BC=95=E5=85=A5=20Spark=20?=
|
||||
=?UTF-8?q?=E6=9E=84=E5=BB=BA=EF=BC=8C=E6=94=AF=E6=8C=81=E6=9E=84=E5=BB=BA?=
|
||||
=?UTF-8?q?=20Appimage?=
|
||||
MIME-Version: 1.0
|
||||
|
|
@ -1171,10 +1171,10 @@ index 0000000..0ca2577
|
|||
2.20.1
|
||||
|
||||
|
||||
From b4f833acb4cbc009e961f35fcd85aeaf6733cb98 Mon Sep 17 00:00:00 2001
|
||||
From c241f19bbcec29d7a1ed8fe8e1f0d6e36a957b69 Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Thu, 2 Feb 2023 13:58:29 +0800
|
||||
Subject: [PATCH 04/12] =?UTF-8?q?desktop:=20=E4=B8=BA=20desktop=20?=
|
||||
Subject: [PATCH 04/13] =?UTF-8?q?desktop:=20=E4=B8=BA=20desktop=20?=
|
||||
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E6=9C=AC=E6=96=87=E4=BB=B6=E7=9A=84?=
|
||||
=?UTF-8?q?=E7=9B=B8=E5=85=B3=20MimeType?=
|
||||
MIME-Version: 1.0
|
||||
|
|
@ -1213,10 +1213,10 @@ index e7c3b18..e33c74e 100644
|
|||
2.20.1
|
||||
|
||||
|
||||
From 365d0971a551a9355b6e086eafa62bb2a8fc8eac Mon Sep 17 00:00:00 2001
|
||||
From 4a74a60af053dfa4680918ceac8a78974d481d53 Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Thu, 2 Feb 2023 14:00:54 +0800
|
||||
Subject: [PATCH 05/12] =?UTF-8?q?repo:=20=E5=AF=B9=20desktop=20=E6=96=87?=
|
||||
Subject: [PATCH 05/13] =?UTF-8?q?repo:=20=E5=AF=B9=20desktop=20=E6=96=87?=
|
||||
=?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=20%F=20=E5=8F=82=E6=95=B0=EF=BC=8C?=
|
||||
=?UTF-8?q?=E4=BB=A5=E4=BF=9D=E8=AF=81=E5=8F=AF=E6=AD=A3=E7=A1=AE=E4=BC=A0?=
|
||||
=?UTF-8?q?=E5=85=A5=E5=8F=82=E6=95=B0?=
|
||||
|
|
@ -1246,10 +1246,10 @@ index a8f27aa..63e878c 100644
|
|||
2.20.1
|
||||
|
||||
|
||||
From 604823b6745436f4c05de2167df8f36e26c91098 Mon Sep 17 00:00:00 2001
|
||||
From b7f8abc6c6631ea598216c3606d0f61a9b653474 Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Thu, 2 Feb 2023 14:47:56 +0800
|
||||
Subject: [PATCH 06/12] =?UTF-8?q?cmake-version:=20=E5=B0=86=E7=89=88?=
|
||||
Subject: [PATCH 06/13] =?UTF-8?q?cmake-version:=20=E5=B0=86=E7=89=88?=
|
||||
=?UTF-8?q?=E6=9C=AC=E9=99=8D=E5=88=B0=203.22=20=E4=BB=A5=E9=80=82?=
|
||||
=?UTF-8?q?=E7=94=A8=E4=BA=8E=20cmake=20=E6=9E=84=E5=BB=BA?=
|
||||
MIME-Version: 1.0
|
||||
|
|
@ -1285,10 +1285,10 @@ index f132dc6..77f02f2 100644
|
|||
2.20.1
|
||||
|
||||
|
||||
From 49746538100d7dd4da0aa3107fccdefffd58892e Mon Sep 17 00:00:00 2001
|
||||
From 8661b20c61ad6f70f645e69e89da46e2b945bf7d Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Sun, 5 Feb 2023 12:55:38 +0800
|
||||
Subject: [PATCH 07/12] =?UTF-8?q?repo:=20=E5=BC=95=E5=85=A5=20Spark=20?=
|
||||
Subject: [PATCH 07/13] =?UTF-8?q?repo:=20=E5=BC=95=E5=85=A5=20Spark=20?=
|
||||
=?UTF-8?q?=E7=8E=B0=E6=9C=89=E5=AE=8C=E6=95=B4=E6=9E=84=E5=BB=BA=E6=A8=A1?=
|
||||
=?UTF-8?q?=E5=9D=97?=
|
||||
MIME-Version: 1.0
|
||||
|
|
@ -2034,10 +2034,10 @@ index 0000000..bd15f0d
|
|||
2.20.1
|
||||
|
||||
|
||||
From b611c25abc6445a93287f58d3920ff8b3ea22bc8 Mon Sep 17 00:00:00 2001
|
||||
From ba6310f45bd803ed6ac60b9851cecc14445cc942 Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Sun, 5 Feb 2023 13:00:22 +0800
|
||||
Subject: [PATCH 08/12] =?UTF-8?q?repo:=20=E5=B0=86=E7=8E=B0=E6=9C=89?=
|
||||
Subject: [PATCH 08/13] =?UTF-8?q?repo:=20=E5=B0=86=E7=8E=B0=E6=9C=89?=
|
||||
=?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=BD=AC=E4=B8=BA=20spark=20=E5=8C=96?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
|
|
@ -2182,10 +2182,10 @@ index 60e9171..d990b1d 100644
|
|||
2.20.1
|
||||
|
||||
|
||||
From fcab235ce53e400e6da96f57fb682a913cf79e53 Mon Sep 17 00:00:00 2001
|
||||
From 28e63cf37d6e4b41b4a0720ee7a321d484487eb5 Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Sun, 5 Feb 2023 16:58:53 +0800
|
||||
Subject: [PATCH 09/12] =?UTF-8?q?repo:=20=E9=A2=84=E7=95=99=E9=85=8D?=
|
||||
Subject: [PATCH 09/13] =?UTF-8?q?repo:=20=E9=A2=84=E7=95=99=E9=85=8D?=
|
||||
=?UTF-8?q?=E7=BD=AE=E4=B8=BA=E6=8F=92=E4=BB=B6=E7=9B=B8=E5=85=B3=E6=94=AF?=
|
||||
=?UTF-8?q?=E6=8C=81=E9=83=A8=E5=88=86?=
|
||||
MIME-Version: 1.0
|
||||
|
|
@ -2221,10 +2221,10 @@ index d990b1d..c18417f 100644
|
|||
2.20.1
|
||||
|
||||
|
||||
From 4dce41dee6d30dc1804fbf0967bc23628f2b3066 Mon Sep 17 00:00:00 2001
|
||||
From 481a7f7b39fe4b67bec6a3cab24e59a4e06b39f0 Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Mon, 6 Feb 2023 01:10:42 +0800
|
||||
Subject: [PATCH 10/12] =?UTF-8?q?linux/plugin-support:=20=E6=B7=BB?=
|
||||
Subject: [PATCH 10/13] =?UTF-8?q?linux/plugin-support:=20=E6=B7=BB?=
|
||||
=?UTF-8?q?=E5=8A=A0=20Notepad--=20=E6=8F=92=E4=BB=B6=E6=9E=84=E5=BB=BA?=
|
||||
=?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=94=AF=E6=8C=81?=
|
||||
MIME-Version: 1.0
|
||||
|
|
@ -2453,10 +2453,10 @@ index 1f8939b..204d16a 100644
|
|||
2.20.1
|
||||
|
||||
|
||||
From 8cefa82cf1339dcc0230be955047fab350de2685 Mon Sep 17 00:00:00 2001
|
||||
From 7e215f5fe65a9962bf29588a0e566d239b734d25 Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Mon, 6 Feb 2023 01:11:26 +0800
|
||||
Subject: [PATCH 11/12] =?UTF-8?q?linux/plugin-doc:=20=E6=B7=BB=E5=8A=A0=20?=
|
||||
Subject: [PATCH 11/13] =?UTF-8?q?linux/plugin-doc:=20=E6=B7=BB=E5=8A=A0=20?=
|
||||
=?UTF-8?q?Notepad--=20=E6=8F=92=E4=BB=B6=E6=9E=84=E5=BB=BA=E6=8F=8F?=
|
||||
=?UTF-8?q?=E8=BF=B0=E6=96=87=E6=A1=A3?=
|
||||
MIME-Version: 1.0
|
||||
|
|
@ -2643,10 +2643,10 @@ index 0000000..c642fc7
|
|||
2.20.1
|
||||
|
||||
|
||||
From 7026d476770c9d35dd3d06721805b83b3b554a73 Mon Sep 17 00:00:00 2001
|
||||
From 8c582a774e8cb0a3c347de5a574ecfd91f7522d2 Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Mon, 6 Feb 2023 01:37:46 +0800
|
||||
Subject: [PATCH 12/12] =?UTF-8?q?fix-plugin-cmake:=20=E4=BF=AE=E5=A4=8D?=
|
||||
Subject: [PATCH 12/13] =?UTF-8?q?fix-plugin-cmake:=20=E4=BF=AE=E5=A4=8D?=
|
||||
=?UTF-8?q?=E6=8F=92=E4=BB=B6=20CMake=20=E9=83=A8=E5=88=86=E5=AE=9A?=
|
||||
=?UTF-8?q?=E4=B9=89=E7=9A=84=E9=94=99=E8=AF=AF?=
|
||||
MIME-Version: 1.0
|
||||
|
|
@ -2714,3 +2714,46 @@ index 58e0bd7..37ad692 100644
|
|||
--
|
||||
2.20.1
|
||||
|
||||
|
||||
From e9fed613d3f0fe2593f2d163df3d611bf3cd3c2a Mon Sep 17 00:00:00 2001
|
||||
From: zinface <zinface@163.com>
|
||||
Date: Mon, 6 Feb 2023 10:31:30 +0800
|
||||
Subject: [PATCH 13/13] =?UTF-8?q?repo:=20=E9=87=87=E7=94=A8=E9=A1=B9?=
|
||||
=?UTF-8?q?=E7=9B=AE=E4=B8=AD=E5=AE=8C=E6=95=B4=E7=9A=84=20Linux=20?=
|
||||
=?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6=E5=AE=89=E8=A3=85?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
---
|
||||
CMakeLists.txt | 14 ++++++++------
|
||||
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 28b3007..b8f5fa7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -100,12 +100,14 @@ if(CMAKE_HOST_UNIX)
|
||||
# 应用分类: Category=
|
||||
"Development"
|
||||
)
|
||||
- spark_install_file(/usr/share/applications/ ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop)
|
||||
- spark_install_file(/usr/share/notepad--/icons/ assets/spark.png)
|
||||
- spark_install_target(/usr/bin/ ${PROJECT_NAME})
|
||||
-
|
||||
- # TODO：如果主线已经将 linux/destkop 的PR合入，即可移除此部分以上部分，而使用以下部分
|
||||
- # spark_install_directory(/usr src/linux/usr/*) # 完整的 Linux 资源文件
|
||||
+ # spark_install_file(/usr/share/applications/ ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop)
|
||||
+ # spark_install_file(/usr/share/notepad--/icons/ assets/spark.png)
|
||||
+ # spark_install_target(/usr/bin/ ${PROJECT_NAME})
|
||||
+
|
||||
+ # 完成：如果主线已经将 linux/destkop 的PR合入，即可移除此部分以上部分，而使用以下部分
|
||||
+ # 但 spark_desktop_macros 不能移除，因为它被 Appimage 构建部分依赖
|
||||
+ # Appimage 构建部分，要求(使用来自 Spark 构建的 Desktop 构建中配置的信息(必须要求 spark-desktop))
|
||||
+ spark_install_directory(/usr src/linux/usr/*) # 完整的 Linux 资源文件
|
||||
|
||||
# ------------------ INSTALL PLUGIN CONFIG ------------------ #
|
||||
# ------------------ INSTALL PLUGIN CONFIG ------------------ #
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue