update
This commit is contained in:
peijiankang
parent
a9363f472b
commit
612540c9c0
27
0001-modify-compile-error-of-None.patch
Normal file
27
0001-modify-compile-error-of-None.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From 62908f315fbc92fbebc930992cf186dcdb3bf550 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
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 <QList>
|
||||
#include <QSysInfo>
|
||||
#include <QX11Info>
|
||||
+#include "guide-widget.h"
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
-#include "guide-widget.h"
|
||||
#include "common-tool/comm_func.h"
|
||||
#include "xatom-helper.h"
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
50
0002-Fix-kylin-user-guide-version-is-empty.patch
Normal file
50
0002-Fix-kylin-user-guide-version-is-empty.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From 6433e34bc3e113a11aa2d56b8eec8607f43a1927 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
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
|
||||
|
||||
75
0003-Fix-no-response-of-interface.patch
Normal file
75
0003-Fix-no-response-of-interface.patch
Normal file
@ -0,0 +1,75 @@
|
||||
From c4bab27ff8264e6b9ef12b07a47f4b27df83e957 Mon Sep 17 00:00:00 2001
|
||||
From: peijiankang <peijiankang@kylinos.cn>
|
||||
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 @@
|
||||
<link rel="stylesheet" type="text/css" href="css/guide-white.css" id="css" >
|
||||
|
||||
<script src="/usr/share/javascript/marked/marked.min.js"></script>
|
||||
-<script src="/usr/share/javascript/jquery/jquery.min.js"></script>
|
||||
-<script type="text/javascript" data-main="js/guide" src="/usr/share/javascript/requirejs/require.min.js"></script>
|
||||
+<script src="/usr/share/javascript/jquery/3/jquery.min.js"></script>
|
||||
+<script type="text/javascript" data-main="js/guide" src="/usr/lib/node_modules/requirejs/require.js"></script>
|
||||
<script type="text/javascript">
|
||||
function doNothing(){
|
||||
window.event.returnValue=false;
|
||||
diff --git a/src/web/index-ubuntukylin_black.html b/src/web/index-ubuntukylin_black.html
|
||||
index 9dec6d2..28493a7 100755
|
||||
--- a/src/web/index-ubuntukylin_black.html
|
||||
+++ b/src/web/index-ubuntukylin_black.html
|
||||
@@ -7,8 +7,8 @@
|
||||
<link rel="stylesheet" type="text/css" href="css/guide-black.css" id="css" >
|
||||
|
||||
<script src="/usr/share/javascript/marked/marked.min.js"></script>
|
||||
-<script src="/usr/share/javascript/jquery/jquery.min.js"></script>
|
||||
-<script type="text/javascript" data-main="js/guide" src="/usr/share/javascript/requirejs/require.min.js"></script>
|
||||
+<script src="/usr/share/javascript/jquery/3/jquery.min.js"></script>
|
||||
+<script type="text/javascript" data-main="js/guide" src="/usr/lib/node_modules/requirejs/require.js"></script>
|
||||
<script type="text/javascript">
|
||||
function doNothing(){
|
||||
window.event.returnValue=false;
|
||||
diff --git a/src/web/index-ubuntukylin_en_US _black.html b/src/web/index-ubuntukylin_en_US _black.html
|
||||
index 23fd234..777f15d 100755
|
||||
--- a/src/web/index-ubuntukylin_en_US _black.html
|
||||
+++ b/src/web/index-ubuntukylin_en_US _black.html
|
||||
@@ -8,8 +8,8 @@
|
||||
<!-- <link rel="stylesheet" type="text/css" href="css/guide-black.css" id="css2" > -->
|
||||
|
||||
<script src="/usr/share/javascript/marked/marked.min.js"></script>
|
||||
-<script src="/usr/share/javascript/jquery/jquery.min.js"></script>
|
||||
-<script type="text/javascript" data-main="js/guide" src="/usr/share/javascript/requirejs/require.min.js"></script>
|
||||
+<script src="/usr/share/javascript/jquery/3/jquery.min.js"></script>
|
||||
+<script type="text/javascript" data-main="js/guide" src="/usr/lib/node_modules/requirejs/require.js"></script>
|
||||
<script type="text/javascript">
|
||||
function doNothing(){
|
||||
window.event.returnValue=false;
|
||||
diff --git a/src/web/index-ubuntukylin_en_US.html b/src/web/index-ubuntukylin_en_US.html
|
||||
index 4485393..db9235f 100755
|
||||
--- a/src/web/index-ubuntukylin_en_US.html
|
||||
+++ b/src/web/index-ubuntukylin_en_US.html
|
||||
@@ -8,8 +8,8 @@
|
||||
<!-- <link rel="stylesheet" type="text/css" href="css/guide-black.css" id="css2" > -->
|
||||
|
||||
<script src="/usr/share/javascript/marked/marked.min.js"></script>
|
||||
-<script src="/usr/share/javascript/jquery/jquery.min.js"></script>
|
||||
-<script type="text/javascript" data-main="js/guide" src="/usr/share/javascript/requirejs/require.min.js"></script>
|
||||
+<script src="/usr/share/javascript/jquery/3/jquery.min.js"></script>
|
||||
+<script type="text/javascript" data-main="js/guide" src="/usr/lib/node_modules/requirejs/require.js"></script>
|
||||
<script type="text/javascript">
|
||||
function doNothing(){
|
||||
window.event.returnValue=false;
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Binary file not shown.
BIN
kylin-user-guide-1.0.4.tar.gz
Normal file
BIN
kylin-user-guide-1.0.4.tar.gz
Normal file
Binary file not shown.
@ -1,11 +1,14 @@
|
||||
%define debug_package %{nil}
|
||||
Name: kylin-user-guide
|
||||
Version: 1.0.0
|
||||
Release: 1
|
||||
Summary: A component of the ukui desktop environment that provides convenient text
|
||||
License: GPL-2+
|
||||
URL: http://www.ukui.org
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Name: kylin-user-guide
|
||||
Version: 1.0.4
|
||||
Release: 4
|
||||
Summary: A component of the ukui desktop environment that provides convenient text
|
||||
License: CC-BY-SA-4.0 and GPL-3.0-or-later
|
||||
URL: http://www.ukui.org
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Patch01: 0001-modify-compile-error-of-None.patch
|
||||
Patch02: 0002-Fix-kylin-user-guide-version-is-empty.patch
|
||||
Patch03: 0003-Fix-no-response-of-interface.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
@ -16,12 +19,13 @@ BuildRequires: qt5-qttools-devel
|
||||
BuildRequires: qt5-qtwebkit-devel
|
||||
BuildRequires: pkgconf
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: ukui-interface
|
||||
|
||||
|
||||
Requires: js-jquery
|
||||
Requires: nodejs-requirejs
|
||||
Requires: kylin-user-guide-common
|
||||
|
||||
Requires: js-jquery
|
||||
Requires: nodejs-requirejs
|
||||
Requires: js-marked
|
||||
Requires: kylin-user-guide-common
|
||||
|
||||
|
||||
%description
|
||||
@ -34,8 +38,12 @@ summary: common picture file
|
||||
%description common
|
||||
this packages contains the picture of application
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch01 -p1
|
||||
%patch02 -p1
|
||||
%patch03 -p1
|
||||
|
||||
%build
|
||||
mkdir build && cd build
|
||||
@ -48,13 +56,16 @@ cd %{_builddir}/%{name}-%{version}/build
|
||||
|
||||
make install DESTDIR=%{buildroot}
|
||||
mkdir -p %{buildroot}/usr/share/kylin-user-guide/web
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/web/*.html %{buildroot}/usr/share/kylin-user-guide/web
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/web/* %{buildroot}/usr/share/kylin-user-guide/web
|
||||
|
||||
mkdir -p %{buildroot}/etc/xdg/autostart/
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/data/kylin-user-guide.desktop %{buildroot}/etc/xdg/autostart/
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/data/kylin-user-guide-daemon.desktop %{buildroot}/etc/xdg/autostart/
|
||||
|
||||
mkdir -p %{buildroot}/usr/share/applications
|
||||
cp -r %{_builddir}/%{name}-%{version}/src/data/kylin-user-guide.desktop %{buildroot}/usr/share/applications
|
||||
|
||||
mkdir -p %{buildroot}/usr/share/kylin-user-guide/data
|
||||
cp -r %{_builddir}/%{name}-%{version}/data/*png %{buildroot}/usr/share/kylin-user-guide/data
|
||||
cp -r %{_builddir}/%{name}-%{version}/data/ %{buildroot}/usr/share/kylin-user-guide/
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
@ -65,13 +76,33 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/icons/hicolor/32x32/apps/kylin-user-guide.png
|
||||
%{_datadir}/icons/hicolor/56x56/apps/kylin-user-guide.png
|
||||
%{_datadir}/kylin-user-guide/web/*
|
||||
%{_sysconfdir}/xdg/autostart/kylin-user-guide.desktop
|
||||
%{_datadir}/applications/kylin-user-guide.desktop
|
||||
%{_sysconfdir}/xdg/autostart/kylin-user-guide-daemon.desktop
|
||||
|
||||
%files common
|
||||
%{_datadir}/kylin-user-guide/translations/*.qm
|
||||
%{_datadir}/kylin-user-guide/data/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 9 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.4-4
|
||||
- Fix no response of interface
|
||||
|
||||
* Thu Jun 9 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.4-3
|
||||
- Fix kylin-user-guide version is empty
|
||||
|
||||
* Wed Jun 8 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.4-2
|
||||
- add js-marked requires
|
||||
|
||||
* Wed Jun 1 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.4-1
|
||||
- update version to 1.0.4
|
||||
|
||||
* Wed May 18 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.0-3
|
||||
- Improve the project according to the requirements of compliance improvement
|
||||
|
||||
* Tue Mar 29 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.0-2
|
||||
- remove %if macros
|
||||
|
||||
* Tue Mar 15 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.0-1
|
||||
- init for openEuler
|
||||
|
||||
|
||||
4
kylin-user-guide.yaml
Normal file
4
kylin-user-guide.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
version_control: github
|
||||
src_repo: UbuntuKylin/kylin-user-guide
|
||||
tag_prefix: "^v"
|
||||
separator: "."
|
||||
Loading…
x
Reference in New Issue
Block a user