fix(*):Compatible for versions below 5.14
- 兼容5.14以下版本 去掉对 QPixmap pixmap(Qt::ReturnByValueConstant) 接口的使用
This commit is contained in:
parent
49e9520c8e
commit
0ef7b3c723
56
0002-fix-Compatible-for-versions-below-5.14.patch
Normal file
56
0002-fix-Compatible-for-versions-below-5.14.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
From f648b9a5d07492dccc5f52e59dada653c4878bee Mon Sep 17 00:00:00 2001
|
||||||
|
From: wangyucheng <wangyucheng@kylinsec.com.cn>
|
||||||
|
Date: Sun, 23 Apr 2023 20:06:14 +0800
|
||||||
|
Subject: [PATCH] fix(*):Compatible for versions below 5.14
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
- 兼容5.14以下版本
|
||||||
|
去掉对 QPixmap pixmap(Qt::ReturnByValueConstant) 接口的使用
|
||||||
|
---
|
||||||
|
src/lightdm-greeter/main.cpp | 3 +--
|
||||||
|
src/polkit-agent/main.cpp | 3 +--
|
||||||
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/lightdm-greeter/main.cpp b/src/lightdm-greeter/main.cpp
|
||||||
|
index 59ac360..cec93b0 100644
|
||||||
|
--- a/src/lightdm-greeter/main.cpp
|
||||||
|
+++ b/src/lightdm-greeter/main.cpp
|
||||||
|
@@ -82,7 +82,6 @@ bool loadTranslator()
|
||||||
|
{
|
||||||
|
QApplication::installTranslator(translator);
|
||||||
|
bRes = true;
|
||||||
|
- KLOG_INFO() << "loaded translator" << translator->filePath();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -148,4 +147,4 @@ int main(int argc, char* argv[])
|
||||||
|
Prefs::globalDeinit();
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
-}
|
||||||
|
\ No newline at end of file
|
||||||
|
+}
|
||||||
|
diff --git a/src/polkit-agent/main.cpp b/src/polkit-agent/main.cpp
|
||||||
|
index 7fff663..3aa86c5 100644
|
||||||
|
--- a/src/polkit-agent/main.cpp
|
||||||
|
+++ b/src/polkit-agent/main.cpp
|
||||||
|
@@ -44,7 +44,6 @@ int main(int argc, char* argv[])
|
||||||
|
else
|
||||||
|
{
|
||||||
|
app.installTranslator(translatorPointer.data());
|
||||||
|
- KLOG_DEBUG() << "load translator:" << translatorPointer->filePath();
|
||||||
|
}
|
||||||
|
|
||||||
|
PolkitQt1::UnixSessionSubject session(app.applicationPid());
|
||||||
|
@@ -56,4 +55,4 @@ int main(int argc, char* argv[])
|
||||||
|
}
|
||||||
|
|
||||||
|
return app.exec();
|
||||||
|
-}
|
||||||
|
\ No newline at end of file
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,12 +1,13 @@
|
|||||||
Name: kiran-session-guard
|
Name: kiran-session-guard
|
||||||
Version: 2.5.0
|
Version: 2.5.0
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Kiran desktop environment login and lock screen dialog
|
Summary: Kiran desktop environment login and lock screen dialog
|
||||||
Summary(zh_CN): Kiran桌面环境登录和解锁框
|
Summary(zh_CN): Kiran桌面环境登录和解锁框
|
||||||
|
|
||||||
License: MulanPSL-2.0
|
License: MulanPSL-2.0
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch0: 0001-fix-translate-add-some-translation.patch
|
Patch0: 0001-fix-translate-add-some-translation.patch
|
||||||
|
Patch1: 0002-fix-Compatible-for-versions-below-5.14.patch
|
||||||
|
|
||||||
%define SHOW_VIRTUAL_KEYBOARD 0
|
%define SHOW_VIRTUAL_KEYBOARD 0
|
||||||
|
|
||||||
@ -146,6 +147,9 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/
|
|||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Apr 23 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 2.5.0-4
|
||||||
|
- KYOS-F: Compatible for versions below 5.14
|
||||||
|
|
||||||
* Sun Apr 23 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 2.5.0-3
|
* Sun Apr 23 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 2.5.0-3
|
||||||
- KYOS-F: add required package
|
- KYOS-F: add required package
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user