packages/kylin-user-guide
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize master branch, update to 1.0.5

Browse Source
This commit is contained in:
huayadong 2023-05-23 11:15:42 +08:00
parent 459395b13a
commit bd7fa0a736
6 changed files with 125 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-modify-compile-error-of-None.patch
View File

@ -1,27 +0,0 @@
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

2
0002-Fix-kylin-user-guide-version-is-empty.patch
View File

@ -23,7 +23,7 @@ index 68e5c11..2d3b270 100644
- arg.clear(); - arg.clear();
- arg << "-l" << CHANGELOG_PATH << "--show-field" << "Version"; - arg << "-l" << CHANGELOG_PATH << "--show-field" << "Version";
- process.start(cmd,arg); - process.start(cmd,arg);
+ options << "-qa" << "|" << "grep" << "kylin-user-guide"; + options << "-q" << "kylin-user-guide";
+ process.start("rpm", options); + process.start("rpm", options);
process.waitForFinished(); process.waitForFinished();
- QByteArray result = process.readAllStandardOutput(); - QByteArray result = process.readAllStandardOutput();

140
0003-Fix-no-response-of-interface.patch
View File

@ -1,75 +1,107 @@
From c4bab27ff8264e6b9ef12b07a47f4b27df83e957 Mon Sep 17 00:00:00 2001 From 98aa746ba8923b7b133dbcbe2a2844fe7b6691a0 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn> From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 9 Jun 2022 14:37:35 +0800 Date: Thu, 2 Mar 2023 00:25:48 +0800
Subject: [PATCH] Fix no response of interface Subject: [PATCH] Fix no response of interface
--- ---
src/web/index-ubuntukylin.html | 4 ++-- src/web/index-ubuntukylin.html | 6 +++---
src/web/index-ubuntukylin_black.html | 4 ++-- src/web/index-ubuntukylin_black.html | 6 +++---
src/web/index-ubuntukylin_en_US _black.html | 4 ++-- src/web/index-ubuntukylin_en_US.html | 6 +++---
src/web/index-ubuntukylin_en_US.html | 4 ++-- src/web/index-ubuntukylin_en_US_black.html | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-) 4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/web/index-ubuntukylin.html b/src/web/index-ubuntukylin.html diff --git a/src/web/index-ubuntukylin.html b/src/web/index-ubuntukylin.html
index 7802fde..0fc4465 100755 index 3cddf8a..2148694 100644
--- a/src/web/index-ubuntukylin.html --- a/src/web/index-ubuntukylin.html
+++ b/src/web/index-ubuntukylin.html +++ b/src/web/index-ubuntukylin.html
@@ -7,8 +7,8 @@ @@ -9,9 +9,9 @@
<link rel="stylesheet" type="text/css" href="css/guide-white.css" id="css" > <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/kylin-user-guide/web/js/marked.min.js"></script>
-<script src="/usr/share/javascript/jquery/jquery.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 src="/usr/share/javascript/jquery/3/jquery.min.js"></script> <script type="text/javascript" data-main="js/guide"
+<script type="text/javascript" data-main="js/guide" src="/usr/lib/node_modules/requirejs/require.js"></script> - src="/usr/share/javascript/requirejs/require.min.js"></script>
<script type="text/javascript"> + src="/usr/lib/node_modules/requirejs/require.js"></script>
function doNothing(){ <script type="text/javascript">
window.event.returnValue=false; function doNothing() {
window.event.returnValue = false;
@@ -161,4 +161,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/web/index-ubuntukylin_black.html b/src/web/index-ubuntukylin_black.html diff --git a/src/web/index-ubuntukylin_black.html b/src/web/index-ubuntukylin_black.html
index 9dec6d2..28493a7 100755 index 0393d56..244b678 100644
--- a/src/web/index-ubuntukylin_black.html --- a/src/web/index-ubuntukylin_black.html
+++ b/src/web/index-ubuntukylin_black.html +++ b/src/web/index-ubuntukylin_black.html
@@ -7,8 +7,8 @@ @@ -9,9 +9,9 @@
<link rel="stylesheet" type="text/css" href="css/guide-black.css" id="css" > <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/kylin-user-guide/web/js/marked.min.js"></script>
-<script src="/usr/share/javascript/jquery/jquery.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 src="/usr/share/javascript/jquery/3/jquery.min.js"></script> <script type="text/javascript" data-main="js/guide"
+<script type="text/javascript" data-main="js/guide" src="/usr/lib/node_modules/requirejs/require.js"></script> - src="/usr/share/javascript/requirejs/require.min.js"></script>
<script type="text/javascript"> + src="/usr/lib/node_modules/requirejs/require.js"></script>
function doNothing(){ <script type="text/javascript">
window.event.returnValue=false; function doNothing() {
diff --git a/src/web/index-ubuntukylin_en_US _black.html b/src/web/index-ubuntukylin_en_US _black.html window.event.returnValue = false;
index 23fd234..777f15d 100755 @@ -161,4 +161,4 @@
--- 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> </body>
-<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> -</html>
+<script src="/usr/share/javascript/jquery/3/jquery.min.js"></script> \ No newline at end of file
+<script type="text/javascript" data-main="js/guide" src="/usr/lib/node_modules/requirejs/require.js"></script> +</html>
<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 diff --git a/src/web/index-ubuntukylin_en_US.html b/src/web/index-ubuntukylin_en_US.html
index 4485393..db9235f 100755 index b5a494c..3b943b7 100644
--- a/src/web/index-ubuntukylin_en_US.html --- a/src/web/index-ubuntukylin_en_US.html
+++ b/src/web/index-ubuntukylin_en_US.html +++ b/src/web/index-ubuntukylin_en_US.html
@@ -8,8 +8,8 @@ @@ -9,9 +9,9 @@
<!-- <link rel="stylesheet" type="text/css" href="css/guide-black.css" id="css2" > --> <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/kylin-user-guide/web/js/marked.min.js"></script>
-<script src="/usr/share/javascript/jquery/jquery.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 src="/usr/share/javascript/jquery/3/jquery.min.js"></script> <script type="text/javascript" data-main="js/guide"
+<script type="text/javascript" data-main="js/guide" src="/usr/lib/node_modules/requirejs/require.js"></script> - src="/usr/share/javascript/requirejs/require.min.js"></script>
<script type="text/javascript"> + src="/usr/lib/node_modules/requirejs/require.js"></script>
function doNothing(){ <script type="text/javascript">
window.event.returnValue=false; function doNothing() {
window.event.returnValue = false;
@@ -161,4 +161,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/web/index-ubuntukylin_en_US_black.html b/src/web/index-ubuntukylin_en_US_black.html
index 42f0b5b..8780876 100644
--- a/src/web/index-ubuntukylin_en_US_black.html
+++ b/src/web/index-ubuntukylin_en_US_black.html
@@ -9,9 +9,9 @@
<link rel="stylesheet" type="text/css" href="css/guide-black.css" id="css">
<script src="/usr/share/kylin-user-guide/web/js/marked.min.js"></script>
- <script src="/usr/share/javascript/jquery/jquery.min.js"></script>
+ <script src="/usr/share/javascript/jquery/3/jquery.min.js"></script>
<script type="text/javascript" data-main="js/guide"
- src="/usr/share/javascript/requirejs/require.min.js"></script>
+ src="/usr/lib/node_modules/requirejs/require.js"></script>
<script type="text/javascript">
function doNothing() {
window.event.returnValue = false;
@@ -161,4 +161,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
-- --
2.33.0 2.33.0

BIN
atril.tar.gz Normal file
View File

Binary file not shown.

BIN
kylin-user-guide-1.0.4.tar.gz → kylin-user-guide-1.0.5.tar.gz
View File

Binary file not shown.

59
kylin-user-guide.spec
View File

@ -1,60 +1,60 @@
%define debug_package %{nil}
Name: kylin-user-guide Name: kylin-user-guide
Version: 1.0.4 Version: 1.0.5
Release: 4 Release: 2
Summary: A component of the ukui desktop environment that provides convenient text Summary: Smanual for UKUI desktop environment
License: CC-BY-SA-4.0 and GPL-3.0-or-later License: CC-BY-SA-4.0 and GPL-3.0-or-later
URL: http://www.ukui.org URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch01: 0001-modify-compile-error-of-None.patch Source1: atril.tar.gz
Patch02: 0002-Fix-kylin-user-guide-version-is-empty.patch Patch02: 0002-Fix-kylin-user-guide-version-is-empty.patch
Patch03: 0003-Fix-no-response-of-interface.patch Patch03: 0003-Fix-no-response-of-interface.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: gsettings-qt-devel BuildRequires: pkgconf
BuildRequires: qt5-qtx11extras-devel
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: qt5-qttools-devel BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtwebkit-devel BuildRequires: qt5-qtwebkit-devel
BuildRequires: pkgconf BuildRequires: qt5-qtx11extras-devel
BuildRequires: libX11-devel BuildRequires: kf5-kwindowsystem-devel
BuildRequires: gsettings-qt-devel
BuildRequires: ukui-interface BuildRequires: ukui-interface
Requires: js-jquery Requires: js-jquery
Requires: nodejs-requirejs Requires: nodejs-requirejs
Requires: js-marked Requires: js-marked
Requires: ukui-interface
Requires: kylin-user-guide-common Requires: kylin-user-guide-common
%description %description
A component of the ukui desktop environment that provides convenient text recording and flexible interface display Kylin User Guide is a simple and lightweight guide written by Qt5/js/md,
It has the characteristics of easy maintenance and simple interface.
.
A simple and lightweight guide written by Qt5/js/md.
%package common %package common
summary: common picture file summary: Smanual for UKUI desktop environment (common files)
%description common %description common
this packages contains the picture of application A simple and lightweight guide written by Qt5/js/md (common files).
%prep %prep
%setup -q %autosetup -n %{name}-%{version} -p1
%patch01 -p1 %setup -T -D -q -b 1
%patch02 -p1
%patch03 -p1
%build %build
mkdir build && cd build mkdir build && cd build
cmake .. %cmake ..
make %{make_build}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
cd %{_builddir}/%{name}-%{version}/build cd build
make install DESTDIR=%{buildroot} %{make_install} DESTDIR=%{buildroot}
mkdir -p %{buildroot}/usr/share/kylin-user-guide/web mkdir -p %{buildroot}/usr/share/kylin-user-guide/web
cp -r %{_builddir}/%{name}-%{version}/src/web/* %{buildroot}/usr/share/kylin-user-guide/web cp -r %{_builddir}/%{name}-%{version}/src/web/* %{buildroot}/usr/share/kylin-user-guide/web
@ -85,6 +85,23 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Mar 03 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.5-2
- add the user guide of atril
* Thu Mar 02 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.5-1
- update version to 1.0.5
* Tue Feb 07 2023 peijiankang <peijiankang@kylinos.cn> - 1.0.4-7
- add build debuginfo and debugsource
* Wed Sep 21 2022 lvfei <lvfei@kylinos.cn> - 1.0.4-6
- add patch:0001-kylin-user-guide-add-bo-desktop-translate.patch
- kylin user guide add desktop zangwen support
* Fri Sep 9 2022 lvfei <lvfei@kylinos.cn> - 1.0.4-5
- add patch:0001-kylin-user-guide-add-bo-translate.patch
- kylin user guide add zangwen support
* Thu Jun 9 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.4-4 * Thu Jun 9 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.4-4
- Fix no response of interface - Fix no response of interface