fix power missing issue
This commit is contained in:
parent
49cb59005c
commit
579630a1f4
29
0003-fix-power-missing-issue.patch
Normal file
29
0003-fix-power-missing-issue.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
diff -Naur ukui-control-center-3.0.4/shell/mainwindow.cpp ukui-control-center-3.0.4-/shell/mainwindow.cpp
|
||||||
|
--- ukui-control-center-3.0.4/shell/mainwindow.cpp 2021-11-19 10:02:39.000000000 +0800
|
||||||
|
+++ ukui-control-center-3.0.4-/shell/mainwindow.cpp 2022-03-02 15:52:56.715867011 +0800
|
||||||
|
@@ -794,7 +794,7 @@
|
||||||
|
bool MainWindow::isExitsCloudAccount() {
|
||||||
|
QProcess *wifiPro = new QProcess();
|
||||||
|
QString shellOutput = "";
|
||||||
|
- wifiPro->start("dpkg -l | grep kylin-sso-client");
|
||||||
|
+ wifiPro->start("rpm -qa|grep kylin-sso-client");
|
||||||
|
wifiPro->waitForFinished();
|
||||||
|
QString output = wifiPro->readAll();
|
||||||
|
shellOutput += output;
|
||||||
|
@@ -811,14 +811,14 @@
|
||||||
|
bool MainWindow::isExitsPower()
|
||||||
|
{
|
||||||
|
QProcess *process = new QProcess;
|
||||||
|
- process->start("dpkg -l ukui-power-manager");
|
||||||
|
+ process->start("rpm -q ukui-power-manager");
|
||||||
|
process->waitForFinished();
|
||||||
|
|
||||||
|
QByteArray ba = process->readAllStandardOutput();
|
||||||
|
delete process;
|
||||||
|
QString mOutput = QString(ba.data());
|
||||||
|
|
||||||
|
- return mOutput.contains("ii", Qt::CaseSensitive) ? true : false;
|
||||||
|
+ return mOutput.contains("ukui-power-manager", Qt::CaseSensitive) ? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MainWindow::dblOnEdge(QMouseEvent *event) {
|
||||||
@ -1,13 +1,14 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
Name: ukui-control-center
|
Name: ukui-control-center
|
||||||
Version: 3.0.4
|
Version: 3.0.4
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: utilities to configure the UKUI desktop
|
Summary: utilities to configure the UKUI desktop
|
||||||
License: GPL-2+
|
License: GPL-2+
|
||||||
URL: http://www.ukui.org
|
URL: http://www.ukui.org
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch01: 0001-modify-version-info-error.patch
|
Patch01: 0001-modify-version-info-error.patch
|
||||||
Patch02: 0002-modify-area-info-display-error.patch
|
Patch02: 0002-modify-area-info-display-error.patch
|
||||||
|
Patch03: 0003-fix-power-missing-issue.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtsvg-devel
|
BuildRequires: qt5-qtsvg-devel
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
@ -106,6 +107,8 @@ Suggests: ukui-settings-daemon
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
qmake-qt5
|
qmake-qt5
|
||||||
make -j24
|
make -j24
|
||||||
@ -153,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 2 2022 douyan <douyan@kylinos.cn> - 3.0.4-4
|
||||||
|
- fix power missing issue
|
||||||
|
|
||||||
* Tue Mar 1 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.4-3
|
* Tue Mar 1 2022 pei-jiankang <peijiankang@kylinos.cn> - 3.0.4-3
|
||||||
- modify area-info display error
|
- modify area-info display error
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user