P35124786
/
notepad--
mirror of https://gitee.com/cxasm/notepad--.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmake-patchs: 更新补丁补充 desktop 文件的 MimeType 与 %F 参数

This commit is contained in:
zinface 2023-02-02 14:24:57 +08:00
parent ed5adfc592
commit 05a4a78f78
1 changed files with 238 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
patchs/coconil-cmake-spark-deb-appimage.patch
View File

@ -1,20 +1,20 @@
From 0940320b6009c3a1a59395e774a204e70d8ae033 Mon Sep 17 00:00:00 2001 From d8b90bb4d709d643c7490ce8a79534769185e24e Mon Sep 17 00:00:00 2001
From: coconil <coconil@foxmail.com> From: coconil <coconil@foxmail.com>
Date: Tue, 31 Jan 2023 22:17:32 +0800 Date: Tue, 31 Jan 2023 22:17:32 +0800
Subject: [PATCH 1/4] add cmake support Subject: [PATCH 1/6] add cmake support
--- ---
CMakeLists.txt | 31 +++++++++++++++++++++++++++++++ CMakeLists.txt | 31 +++++++++++++++++++++++++++++++
src/findcmpwin.h | 4 ++++ src/findcmpwin.h | 24 ++++++++++++++----------
src/findwin.h | 5 ++++- src/findwin.h | 29 ++++++++++++++++-------------
src/qscint/CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++++ src/qscint/CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++++
4 files changed, 74 insertions(+), 1 deletion(-) 4 files changed, 96 insertions(+), 23 deletions(-)
create mode 100644 CMakeLists.txt create mode 100644 CMakeLists.txt
create mode 100644 src/qscint/CMakeLists.txt create mode 100644 src/qscint/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..09769f8 index 0000000..4dd3768
--- /dev/null --- /dev/null
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
@ -51,49 +51,83 @@ index 0000000..09769f8
+target_link_libraries(${PROJECT_NAME} qscint Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent Qt5::Network Qt5::PrintSupport Qt5::XmlPatterns) +target_link_libraries(${PROJECT_NAME} qscint Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent Qt5::Network Qt5::PrintSupport Qt5::XmlPatterns)
\ No newline at end of file \ No newline at end of file
diff --git a/src/findcmpwin.h b/src/findcmpwin.h diff --git a/src/findcmpwin.h b/src/findcmpwin.h
index 4432e85..4f53fca 100755 index 4432e85..70deee3 100755
--- a/src/findcmpwin.h --- a/src/findcmpwin.h
+++ b/src/findcmpwin.h +++ b/src/findcmpwin.h
@@ -7,10 +7,14 @@ @@ -4,16 +4,20 @@
#include "ui_findcmpwin.h" #include <QTabWidget>
#include "rcglobal.h" #include <QVector>
-#include "ui_findcmpwin.h"
-#include "rcglobal.h"
-
-enum FindTabIndex {
- FIND_TAB,
- REPLACE_TAB,
-};
-class ScintillaEditView;
-
-//struct FindCmpRecord {
+#include "ui_findcmpwin.h"
+#include "rcglobal.h"
+
+#ifndef DEF_FIND_TAB_INDEX +#ifndef DEF_FIND_TAB_INDEX
+#define DEF_FIND_TAB_INDEX +#define DEF_FIND_TAB_INDEX
+ +
enum FindTabIndex { +enum FindTabIndex {
FIND_TAB, + FIND_TAB,
REPLACE_TAB, + REPLACE_TAB,
}; +};
+#endif +#endif
class ScintillaEditView; +class ScintillaEditView;
+
//struct FindCmpRecord { +//struct FindCmpRecord {
// int lineNum;
// int pos;
// QString lineContents;
diff --git a/src/findwin.h b/src/findwin.h diff --git a/src/findwin.h b/src/findwin.h
index c32a7d4..8633ce6 100755 index c32a7d4..be82deb 100755
--- a/src/findwin.h --- a/src/findwin.h
+++ b/src/findwin.h +++ b/src/findwin.h
@@ -6,13 +6,16 @@ @@ -3,19 +3,22 @@
#include <QMainWindow>
#include <QTabWidget>
#include "ui_findwin.h" #include <QVector>
- -
-
-#include "ui_findwin.h"
-
-enum FindTabIndex {
- FIND_TAB =0,
- REPLACE_TAB,
- DIR_FIND_TAB,
- MARK_TAB,
-};
-class ScintillaEditView;
-class QsciScintilla;
-
+
+
+#include "ui_findwin.h"
+#ifndef DEF_FIND_TAB_INDEX +#ifndef DEF_FIND_TAB_INDEX
+#define DEF_FIND_TAB_INDEX +#define DEF_FIND_TAB_INDEX
enum FindTabIndex { +enum FindTabIndex {
FIND_TAB =0, + FIND_TAB =0,
REPLACE_TAB, + REPLACE_TAB,
DIR_FIND_TAB, + DIR_FIND_TAB,
MARK_TAB, + MARK_TAB,
}; +};
+#endif +#endif
+ +
class ScintillaEditView; +class ScintillaEditView;
class QsciScintilla; +class QsciScintilla;
+
struct FindRecord {
int lineNum;
int lineStartPos; //行开始位置
diff --git a/src/qscint/CMakeLists.txt b/src/qscint/CMakeLists.txt diff --git a/src/qscint/CMakeLists.txt b/src/qscint/CMakeLists.txt
new file mode 100644 new file mode 100644
index 0000000..6987a2f index 0000000..f132dc6
--- /dev/null --- /dev/null
+++ b/src/qscint/CMakeLists.txt +++ b/src/qscint/CMakeLists.txt
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
@ -136,10 +170,10 @@ index 0000000..6987a2f
2.20.1 2.20.1
From c41bc435255a1e56615e7d8ab608c84d7e9772a2 Mon Sep 17 00:00:00 2001 From af0785b1f7060ac535900f159173153d2028d1a7 Mon Sep 17 00:00:00 2001
From: coconil <coconil@foxmail.com> From: coconil <coconil@foxmail.com>
Date: Tue, 31 Jan 2023 22:49:55 +0800 Date: Tue, 31 Jan 2023 22:49:55 +0800
Subject: [PATCH 2/4] add cmake build doc Subject: [PATCH 2/6] add cmake build doc
--- ---
cmake.md | 8 ++++++++ cmake.md | 8 ++++++++
@ -148,7 +182,7 @@ Subject: [PATCH 2/4] add cmake build doc
diff --git a/cmake.md b/cmake.md diff --git a/cmake.md b/cmake.md
new file mode 100644 new file mode 100644
index 0000000..8e9b440 index 0000000..b5f9785
--- /dev/null --- /dev/null
+++ b/cmake.md +++ b/cmake.md
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
@ -165,10 +199,10 @@ index 0000000..8e9b440
2.20.1 2.20.1
From 6115c0a6d3addc6e22504b2a71db67b412c8ef97 Mon Sep 17 00:00:00 2001 From 44ef7d609c77688c46a0334bc08d863114b46998 Mon Sep 17 00:00:00 2001
From: zinface <zinface@163.com> From: zinface <zinface@163.com>
Date: Wed, 1 Feb 2023 20:04:05 +0800 Date: Wed, 1 Feb 2023 20:04:05 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=20repo:=20=E5=BC=95=E5=85=A5=20Spark=20?= Subject: [PATCH 3/6] =?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?=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?= =?UTF-8?q?=20deb?=
MIME-Version: 1.0 MIME-Version: 1.0
@ -176,16 +210,16 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
--- ---
.gitignore | 30 +++ .gitignore | 36 ++-
CMakeLists.txt | 34 ++- CMakeLists.txt | 34 ++-
Makefile | 61 +++++ Makefile | 61 +++++
assets/spark.png | Bin 0 -> 4959 bytes assets/spark.png | Bin 0 -> 4959 bytes
cmake/DebPackageConfig.cmake | 323 +++++++++++++++++++++++++++ cmake/DebPackageConfig.cmake | 323 +++++++++++++++++++++++++++
cmake/SparkDesktopMacros.cmake | 35 +++ cmake/SparkDesktopMacros.cmake | 35 +++
cmake/SparkInstallMacrosConfig.cmake | 131 +++++++++++ cmake/SparkInstallMacrosConfig.cmake | 131 +++++++++++
cmake/package-deb.descript | 46 ++++ cmake/package-deb.descript | 45 ++++
cmake/spark-desktop.desktop.in | 12 + cmake/spark-desktop.desktop.in | 12 +
9 files changed, 670 insertions(+), 2 deletions(-) 9 files changed, 672 insertions(+), 5 deletions(-)
create mode 100644 Makefile create mode 100644 Makefile
create mode 100644 assets/spark.png create mode 100644 assets/spark.png
create mode 100644 cmake/DebPackageConfig.cmake create mode 100644 cmake/DebPackageConfig.cmake
@ -195,13 +229,19 @@ Content-Transfer-Encoding: 8bit
create mode 100644 cmake/spark-desktop.desktop.in create mode 100644 cmake/spark-desktop.desktop.in
diff --git a/.gitignore b/.gitignore diff --git a/.gitignore b/.gitignore
index 8d723bc..7adfee2 100644 index 8d723bc..30bcfd5 100644
--- a/.gitignore --- a/.gitignore
+++ b/.gitignore +++ b/.gitignore
@@ -396,3 +396,33 @@ FodyWeavers.xsd @@ -393,6 +393,36 @@ FodyWeavers.xsd
*.msix
# JetBrains Rider *.msm
*.sln.iml *.msp
-
-# JetBrains Rider
-*.sln.iml
+
+# JetBrains Rider
+*.sln.iml
+ +
+ +
+ +
@ -233,7 +273,7 @@ index 8d723bc..7adfee2 100644
+# End of https://www.toptal.com/developers/gitignore/api/cmake +# End of https://www.toptal.com/developers/gitignore/api/cmake
+!/Makefile +!/Makefile
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09769f8..52efcf6 100644 index 4dd3768..a48badb 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
@ -282,7 +322,7 @@ index 09769f8..52efcf6 100644
+endif(CMAKE_HOST_UNIX) +endif(CMAKE_HOST_UNIX)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
new file mode 100644 new file mode 100644
index 0000000..c652e21 index 0000000..43e849f
--- /dev/null --- /dev/null
+++ b/Makefile +++ b/Makefile
@@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
@ -453,7 +493,7 @@ HcmV?d00001
diff --git a/cmake/DebPackageConfig.cmake b/cmake/DebPackageConfig.cmake diff --git a/cmake/DebPackageConfig.cmake b/cmake/DebPackageConfig.cmake
new file mode 100644 new file mode 100644
index 0000000..59950ec index 0000000..cfba051
--- /dev/null --- /dev/null
+++ b/cmake/DebPackageConfig.cmake +++ b/cmake/DebPackageConfig.cmake
@@ -0,0 +1,323 @@ @@ -0,0 +1,323 @@
@ -824,7 +864,7 @@ index 0000000..223ac6b
\ No newline at end of file \ No newline at end of file
diff --git a/cmake/SparkInstallMacrosConfig.cmake b/cmake/SparkInstallMacrosConfig.cmake diff --git a/cmake/SparkInstallMacrosConfig.cmake b/cmake/SparkInstallMacrosConfig.cmake
new file mode 100644 new file mode 100644
index 0000000..52d9664 index 0000000..1f8939b
--- /dev/null --- /dev/null
+++ b/cmake/SparkInstallMacrosConfig.cmake +++ b/cmake/SparkInstallMacrosConfig.cmake
@@ -0,0 +1,131 @@ @@ -0,0 +1,131 @@
@ -961,10 +1001,10 @@ index 0000000..52d9664
+endmacro(spark_install_changelog CHANGE_LOG_FILE) +endmacro(spark_install_changelog CHANGE_LOG_FILE)
diff --git a/cmake/package-deb.descript b/cmake/package-deb.descript diff --git a/cmake/package-deb.descript b/cmake/package-deb.descript
new file mode 100644 new file mode 100644
index 0000000..cfd1e7c index 0000000..be0fa83
--- /dev/null --- /dev/null
+++ b/cmake/package-deb.descript +++ b/cmake/package-deb.descript
@@ -0,0 +1,46 @@ @@ -0,0 +1,45 @@
+# 注释行(使用方式) +# 注释行(使用方式)
+# find_package(DebPackage PATHS ${CMAKE_SOURCE_DIR}) +# find_package(DebPackage PATHS ${CMAKE_SOURCE_DIR})
+# add_package_descript(cmake/package-deb.descript) +# add_package_descript(cmake/package-deb.descript)
@ -1010,7 +1050,6 @@ index 0000000..cfd1e7c
+Descrition: Notepad--是一个国产跨平台、简单的文本编辑器。 +Descrition: Notepad--是一个国产跨平台、简单的文本编辑器。
+ Notepad--是一个国产跨平台、简单的文本编辑器，是替换notepad++的一种选择。 + Notepad--是一个国产跨平台、简单的文本编辑器，是替换notepad++的一种选择。
+ 其内置强大的代码对比功能，让你丢掉付费的beyond compare。 + 其内置强大的代码对比功能，让你丢掉付费的beyond compare。
+
diff --git a/cmake/spark-desktop.desktop.in b/cmake/spark-desktop.desktop.in diff --git a/cmake/spark-desktop.desktop.in b/cmake/spark-desktop.desktop.in
new file mode 100644 new file mode 100644
index 0000000..e7c3b18 index 0000000..e7c3b18
@ -1034,10 +1073,10 @@ index 0000000..e7c3b18
2.20.1 2.20.1
From 8dd955e0995e22d1c9cec7a8127cc9d08f593941 Mon Sep 17 00:00:00 2001 From b2c247073dfaf9539af26cb5372f8ba16c297cdc Mon Sep 17 00:00:00 2001
From: zinface <zinface@163.com> From: zinface <zinface@163.com>
Date: Wed, 1 Feb 2023 20:09:49 +0800 Date: Wed, 1 Feb 2023 20:09:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?repo:=20=E5=BC=95=E5=85=A5=20Spark=20?= Subject: [PATCH 4/6] =?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?=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?= =?UTF-8?q?=20Appimage?=
MIME-Version: 1.0 MIME-Version: 1.0
@ -1054,7 +1093,7 @@ Content-Transfer-Encoding: 8bit
create mode 100644 cmake/spark-appimage.desktop.in create mode 100644 cmake/spark-appimage.desktop.in
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52efcf6..c1d2c59 100644 index a48badb..364adaa 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -54,6 +54,14 @@ if(CMAKE_HOST_UNIX) @@ -54,6 +54,14 @@ if(CMAKE_HOST_UNIX)
@ -1073,7 +1112,7 @@ index 52efcf6..c1d2c59 100644
find_package(DebPackage PATHS ${CMAKE_SOURCE_DIR}) find_package(DebPackage PATHS ${CMAKE_SOURCE_DIR})
add_package_descript(cmake/package-deb.descript) add_package_descript(cmake/package-deb.descript)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index c652e21..35bf326 100644 index 43e849f..b71b27f 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -59,3 +59,26 @@ enter-qdebug-mode: @@ -59,3 +59,26 @@ enter-qdebug-mode:
@ -1105,7 +1144,7 @@ index c652e21..35bf326 100644
+ cd build && make appimage + cd build && make appimage
diff --git a/cmake/SparkAppimageConfig.cmake b/cmake/SparkAppimageConfig.cmake diff --git a/cmake/SparkAppimageConfig.cmake b/cmake/SparkAppimageConfig.cmake
new file mode 100644 new file mode 100644
index 0000000..99fc9d6 index 0000000..7463a48
--- /dev/null --- /dev/null
+++ b/cmake/SparkAppimageConfig.cmake +++ b/cmake/SparkAppimageConfig.cmake
@@ -0,0 +1,139 @@ @@ -0,0 +1,139 @@
@ -1267,3 +1306,78 @@ index 0000000..0ca2577
-- --
2.20.1 2.20.1
From bee93666ed61aa5f605ccf98aa79585708ea098a Mon Sep 17 00:00:00 2001
From: zinface <zinface@163.com>
Date: Thu, 2 Feb 2023 13:58:29 +0800
Subject: [PATCH 5/6] =?UTF-8?q?desktop:=20=E4=B8=BA=20desktop=20=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E6=96=87=E6=9C=AC=E6=96=87=E4=BB=B6=E7=9A=84=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=20MimeType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
cmake/spark-appimage.desktop.in | 2 +-
cmake/spark-desktop.desktop.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/spark-appimage.desktop.in b/cmake/spark-appimage.desktop.in
index 0ca2577..70fc6b9 100644
--- a/cmake/spark-appimage.desktop.in
+++ b/cmake/spark-appimage.desktop.in
@@ -7,4 +7,4 @@ Comment=@APP_COMMENT@
Terminal=true
Type=Application
Categories=@APP_CATEGORIES@
-MimeType=text/plain
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-patch;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-patch;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl;application/x-php;text/vnd.wap.wml;text/x-python;application/x-ruby;text/sgml;application/xml;model/vrml;image/svg+xml;application/json;
diff --git a/cmake/spark-desktop.desktop.in b/cmake/spark-desktop.desktop.in
index e7c3b18..e33c74e 100644
--- a/cmake/spark-desktop.desktop.in
+++ b/cmake/spark-desktop.desktop.in
@@ -7,6 +7,6 @@ Type=@APP_TYPE@
Exec=@APP_EXECUTE_PATH@
Icon=@APP_EXECUTE_ICON_PATH@
Categories=@APP_CATEGORIES@
-MimeType=text/plain
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-patch;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-patch;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl;application/x-php;text/vnd.wap.wml;text/x-python;application/x-ruby;text/sgml;application/xml;model/vrml;image/svg+xml;application/json;
# Generated from the DesktopGenerater component of the z-Tools toolkit
\ No newline at end of file
--
2.20.1
From d4d07795f09d33b4995e34c1f86a03c678025f96 Mon Sep 17 00:00:00 2001
From: zinface <zinface@163.com>
Date: Thu, 2 Feb 2023 14:00:54 +0800
Subject: [PATCH 6/6] =?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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 364adaa..fed2a51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,8 @@ if(CMAKE_HOST_UNIX)
# 应用类型: Type=
"Application"
# 执行程序: Exec=
- "notepad--"
+ # 有关此 %F 参数可查看: https://gitee.com/zinface/z-tools/blob/desktop-dev/src/DesktopGenerater/desktopexecparamdialog.cpp
+ "notepad-- %F"
# 图标路径: Icon=
"/usr/share/notepad--/icons/spark.png"
# 应用分类: Category=
--
2.20.1