diff --git a/0001-modify-compile-error-of-None.patch b/0001-modify-compile-error-of-None.patch new file mode 100644 index 0000000..248249d --- /dev/null +++ b/0001-modify-compile-error-of-None.patch @@ -0,0 +1,27 @@ +From 62908f315fbc92fbebc930992cf186dcdb3bf550 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Wed, 1 Jun 2022 17:18:15 +0800 +Subject: [PATCH] modify compile error of None + +--- + src/guide-widget.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/guide-widget.cpp b/src/guide-widget.cpp +index 8441a13..58b8d47 100644 +--- a/src/guide-widget.cpp ++++ b/src/guide-widget.cpp +@@ -30,9 +30,9 @@ + #include + #include + #include ++#include "guide-widget.h" + #include + +-#include "guide-widget.h" + #include "common-tool/comm_func.h" + #include "xatom-helper.h" + +-- +2.33.0 + diff --git a/0002-Fix-kylin-user-guide-version-is-empty.patch b/0002-Fix-kylin-user-guide-version-is-empty.patch new file mode 100644 index 0000000..fca3461 --- /dev/null +++ b/0002-Fix-kylin-user-guide-version-is-empty.patch @@ -0,0 +1,50 @@ +From 6433e34bc3e113a11aa2d56b8eec8607f43a1927 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Thu, 9 Jun 2022 14:12:37 +0800 +Subject: [PATCH] Fix kylin-user-guide version is empty + +--- + src/main.cpp | 25 +++++++++++++++++-------- + 1 file changed, 17 insertions(+), 8 deletions(-) + +diff --git a/src/main.cpp b/src/main.cpp +index 68e5c11..2d3b270 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -78,16 +78,25 @@ static void crashHandler(int sig) + } + + QString getAppVersion(){ ++ QString m_appVersion; ++ QStringList options; + QProcess process; +- QString cmd = "dpkg-parsechangelog"; +- QStringList arg; +- arg.clear(); +- arg << "-l" << CHANGELOG_PATH << "--show-field" << "Version"; +- process.start(cmd,arg); ++ options << "-qa" << "|" << "grep" << "kylin-user-guide"; ++ process.start("rpm", options); + process.waitForFinished(); +- QByteArray result = process.readAllStandardOutput(); +- result = result.left(result.length()-1); +- return result; ++ QString dpkgInfo = process.readAll(); ++ QStringList infoList = dpkgInfo.split("\n"); ++ for (int n = 0; n < infoList.size(); n++) { ++ QString strInfoLine = infoList[n]; ++ if (strInfoLine.contains("kylin-user-guide")) { ++ QStringList lineInfoList = strInfoLine.split(QRegExp("-")); ++ if (lineInfoList.size() >= 3) { ++ m_appVersion = lineInfoList[3]; ++ } ++ break; ++ } ++ } ++ return m_appVersion; + } + + int main(int argc, char *argv[]) +-- +2.33.0 + diff --git a/0003-Fix-no-response-of-interface.patch b/0003-Fix-no-response-of-interface.patch new file mode 100644 index 0000000..227efab --- /dev/null +++ b/0003-Fix-no-response-of-interface.patch @@ -0,0 +1,75 @@ +From c4bab27ff8264e6b9ef12b07a47f4b27df83e957 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Thu, 9 Jun 2022 14:37:35 +0800 +Subject: [PATCH] Fix no response of interface + +--- + src/web/index-ubuntukylin.html | 4 ++-- + src/web/index-ubuntukylin_black.html | 4 ++-- + src/web/index-ubuntukylin_en_US _black.html | 4 ++-- + src/web/index-ubuntukylin_en_US.html | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/web/index-ubuntukylin.html b/src/web/index-ubuntukylin.html +index 7802fde..0fc4465 100755 +--- a/src/web/index-ubuntukylin.html ++++ b/src/web/index-ubuntukylin.html +@@ -7,8 +7,8 @@ + + + +- +- ++ ++ + +- +- ++ ++ + +- +- ++ ++ + +- +- ++ ++ +