diff --git a/0000-fix-translator-fix-screensaver-dialog-translator-85d16be2.patch b/0000-fix-translator-fix-screensaver-dialog-translator-85d16be2.patch new file mode 100644 index 0000000..1e5d149 --- /dev/null +++ b/0000-fix-translator-fix-screensaver-dialog-translator-85d16be2.patch @@ -0,0 +1,311 @@ +From 85d16be296340058a28540ebbdb2989aa898c975 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Thu, 20 Jan 2022 12:05:16 +0800 +Subject: [PATCH] fix(translator): fix screensaver-dialog translator +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修复屏保窗口的翻译 +--- + libexec/session-guard-checkpass/main.cpp | 2 +- + .../kiran-cpanel-greeter.zh_CN.ts | 28 ++++++------- + .../lightdm-kiran-greeter.zh_CN.ts | 42 +++++++++---------- + screensaver-dialog/src/plugin.cpp | 21 +++++++--- + .../kiran-screensaver-dialog.zh_CN.ts | 9 +++- + 5 files changed, 59 insertions(+), 43 deletions(-) + +diff --git a/libexec/session-guard-checkpass/main.cpp b/libexec/session-guard-checkpass/main.cpp +index 5bd4839..e667bde 100644 +--- a/libexec/session-guard-checkpass/main.cpp ++++ b/libexec/session-guard-checkpass/main.cpp +@@ -77,7 +77,7 @@ int conversation(int num_msg, const pam_message **msgs, pam_response **resp, voi + else + { + auto replyEvent = dynamic_cast(recvReply); +- KLOG_DEBUG() << "recv prompt reply:" << replyEvent->result() << replyEvent->text(); ++ //KLOG_DEBUG() << "recv prompt reply:" << replyEvent->result() << replyEvent->text(); + //消息返回失败 + if (!replyEvent->result()) + { +diff --git a/lightdm-greeter/kiran-cpanel-greeter/translations/kiran-cpanel-greeter.zh_CN.ts b/lightdm-greeter/kiran-cpanel-greeter/translations/kiran-cpanel-greeter.zh_CN.ts +index a863764..9ee3e23 100644 +--- a/lightdm-greeter/kiran-cpanel-greeter/translations/kiran-cpanel-greeter.zh_CN.ts ++++ b/lightdm-greeter/kiran-cpanel-greeter/translations/kiran-cpanel-greeter.zh_CN.ts +@@ -84,13 +84,13 @@ + + + +- ++ + Save + 保存 + + + +- ++ + Reset + 重置 + +@@ -115,22 +115,22 @@ + 禁用 + + +- ++ + Scale Factor + 缩放比例 + + +- ++ + Enable manual input user login + 允许手动输入用户名登录 + + +- ++ + Show User List + 显示用户列表 + + +- ++ + Please ensure that one of the two options is turned on! + 请确保两个选项之一被打开! + +@@ -143,28 +143,28 @@ + 隐藏用户列表 + + +- +- ++ ++ + Configuration changed + 配置已改变 + + +- +- ++ ++ + The external configuration file has changed + If you choose to save, all external changes will be overwritten + Select discard to discard the modification and reload the new configuration + 配置文件已被修改，如果继续保存所有额外的修改将会被覆盖，选择丢弃将丢弃所有的修改并重新加载新的配置文件 + + +- +- ++ ++ + Save failed, reload + 保存失败，已重新加载 + + +- +- ++ ++ + Saved successfully + 保存成功 + +diff --git a/lightdm-greeter/translations/lightdm-kiran-greeter.zh_CN.ts b/lightdm-greeter/translations/lightdm-kiran-greeter.zh_CN.ts +index 71eeba4..b3ebbda 100644 +--- a/lightdm-greeter/translations/lightdm-kiran-greeter.zh_CN.ts ++++ b/lightdm-greeter/translations/lightdm-kiran-greeter.zh_CN.ts +@@ -27,7 +27,7 @@ + + + +- ++ + login other user + 登录其他用户 + +@@ -83,28 +83,28 @@ + 认证失败 + + +- +- ++ ++ + Return + 返回 + + +- ++ + Entry your name + 请输入用户名 + + +- ++ + dddd MMM HH:mm + MM月dd日 dddd HH:mm + + +- ++ + Start face authentication + 开始人脸认证 + + +- ++ + Start fingerprint authentication + 开始指纹认证 + +@@ -133,13 +133,13 @@ + + + +- ++ + Save + + + + +- ++ + Reset + + +@@ -164,48 +164,48 @@ + + + +- ++ + Scale Factor + + + +- ++ + Enable manual input user login + + + +- ++ + Show User List + + + +- +- ++ ++ + Configuration changed + + + +- +- ++ ++ + The external configuration file has changed + If you choose to save, all external changes will be overwritten + Select discard to discard the modification and reload the new configuration + + + +- +- ++ ++ + Save failed, reload + + + +- +- ++ ++ + Saved successfully + + + +- ++ + Please ensure that one of the two options is turned on! + + +diff --git a/screensaver-dialog/src/plugin.cpp b/screensaver-dialog/src/plugin.cpp +index 649d276..f8f036f 100644 +--- a/screensaver-dialog/src/plugin.cpp ++++ b/screensaver-dialog/src/plugin.cpp +@@ -15,9 +15,11 @@ + + #include + #include ++#include + #include "config.h" + #include "screensaver-dialog.h" + ++ + #define TRANSLATION_FILE_DIR "/usr/share/kiran-screensaver-dialog/translations/" + + using namespace Kiran::ScreenSaver; +@@ -30,12 +32,19 @@ int KSPlugin::init(Interface* ksInterface) + Q_INIT_RESOURCE(commonWidgets); + + m_translator = new QTranslator; +- m_translator->load(QLocale(), +- "kiran-screensaver-dialog", +- ".", +- TRANSLATION_FILE_DIR, +- ".qm"); +- qApp->installTranslator(m_translator); ++ if (m_translator->load(QLocale(), ++ "kiran-screensaver-dialog", ++ ".", ++ TRANSLATION_FILE_DIR, ++ ".qm")) ++ { ++ qApp->installTranslator(m_translator); ++ KLOG_DEBUG() << "install kiran-screensaver-dialog success"; ++ } ++ else ++ { ++ KLOG_WARNING() << "can't load kiran-screensaver-dialog translator"; ++ } + + return 0; + } +diff --git a/screensaver-dialog/translations/kiran-screensaver-dialog.zh_CN.ts b/screensaver-dialog/translations/kiran-screensaver-dialog.zh_CN.ts +index f9b9faa..55c86f9 100644 +--- a/screensaver-dialog/translations/kiran-screensaver-dialog.zh_CN.ts ++++ b/screensaver-dialog/translations/kiran-screensaver-dialog.zh_CN.ts +@@ -5,7 +5,7 @@ + AuthProxy + + Failed to authenticate +- 认证失败 ++ 认证失败 + + + +@@ -39,6 +39,13 @@ + 开始指纹认证 + + ++ ++ KSPlugin ++ ++ Failed to authenticate ++ 认证失败 ++ ++ + + ScreenSaverDialog + +-- +2.27.0 + diff --git a/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch b/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch new file mode 100644 index 0000000..62065db --- /dev/null +++ b/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch @@ -0,0 +1,38 @@ +From 7c4fdfa5e93361d99c51e5b9f8ae8dbe89252f04 Mon Sep 17 00:00:00 2001 +From: root +Date: Tue, 25 Jan 2022 14:56:35 +0800 +Subject: [PATCH] fix(build): fix incomplete type 'class QPainterPath' build + error + +--- + lib/common-widgets/finger-auth-avatar.cpp | 1 + + lib/common-widgets/user-avatar.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/lib/common-widgets/finger-auth-avatar.cpp b/lib/common-widgets/finger-auth-avatar.cpp +index e26ff41..b0c7300 100644 +--- a/lib/common-widgets/finger-auth-avatar.cpp ++++ b/lib/common-widgets/finger-auth-avatar.cpp +@@ -15,6 +15,7 @@ + + #include "finger-auth-avatar.h" + #include ++#include + + FingerAuthAvatar::FingerAuthAvatar(QWidget *parent) : QWidget(parent) + { +diff --git a/lib/common-widgets/user-avatar.cpp b/lib/common-widgets/user-avatar.cpp +index 9cfb2df..9394818 100644 +--- a/lib/common-widgets/user-avatar.cpp ++++ b/lib/common-widgets/user-avatar.cpp +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + #define DEFAULT_USER_AVATAR ":/common-widgets-images/user_180.png" + +-- +2.33.0 + diff --git a/kiran-session-guard-2.2.1.tar.gz b/kiran-session-guard-2.2.1.tar.gz new file mode 100644 index 0000000..ede994c Binary files /dev/null and b/kiran-session-guard-2.2.1.tar.gz differ diff --git a/kiran-session-guard.spec b/kiran-session-guard.spec new file mode 100644 index 0000000..7e62841 --- /dev/null +++ b/kiran-session-guard.spec @@ -0,0 +1,168 @@ +Name: kiran-session-guard +Version: 2.2.1 +Release: 1.kb4 +Summary: Kiran desktop environment login and lock screen dialog +Summary(zh_CN): Kiran桌面环境登录和解锁框 + +License: Mulan PSL v2 +Source0: %{name}-%{version}.tar.gz +Patch0001: 0000-fix-translator-fix-screensaver-dialog-translator-85d16be2.patch +Patch0002: 0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch + +%define SHOW_VIRTUAL_KEYBOARD 0 + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: libXtst-devel +BuildRequires: libX11-devel +BuildRequires: libXrandr-devel +BuildRequires: libXcursor-devel +BuildRequires: libXfixes-devel +BuildRequires: glib2-devel +BuildRequires: lightdm-qt5-devel +BuildRequires: pam-devel + +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-linguist +BuildRequires: qt5-qtx11extras-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: gsettings-qt-devel + +BuildRequires: kiran-widgets-qt5-devel +BuildRequires: kiran-log-qt5-devel +BuildRequires: kiran-biometrics-devel +BuildRequires: kiran-authentication-service-devel +BuildRequires: kiran-cc-daemon-devel +BuildRequires: kiran-control-panel-devel + +Requires: qt5-qtbase +Requires: qt5-qtsvg +Requires: qt5-qtx11extras +Requires: gsettings-qt + +Requires: kiran-widgets-qt5 +Requires: kiran-log-qt5 +Requires: kiran-authentication-service +Requires: kiran-biometrics +Requires: kiran-system-daemon +Requires: kiran-session-daemon +Requires: kiran-cpanel-launcher + +Requires: lightdm-qt5 +Requires: libX11 +Requires: libXfixes +Requires: libXtst +Requires: libXrandr +Requires: libXcursor +Requires: glib2 +Requires: pam +%if %{SHOW_VIRTUAL_KEYBOARD} == 1 +Requires: onboard +%endif + +%package -n lightdm-kiran-greeter +Provides: lightdm-greeter +Obsoletes: lightdm-settings +Summary: Kiran desktop environment login greeter +Summary(zh_CN): Kiran桌面环境登录界面 + +%package -n kiran-screensaver-dialog +Summary: Kiran desktop environment lock dialog +Summary(zh_CN): Kiran桌面环境解锁框 +BuildRequires: kiran-screensaver-devel +Requires: kiran-screensaver + +%description +%{summary}. + +%description -n lightdm-kiran-greeter +lightdm login greeter + +%description -n kiran-screensaver-dialog +mate-screensaver lock dialog + +%prep +%autosetup -p1 + +%build +%{__mkdir} -p %{buildroot} +%cmake -DBUILD_SHARED_LIBS:BOOL=OFF \ +%if %{SHOW_VIRTUAL_KEYBOARD} == 1 +-DSHOW_VIRTUAL_KEYBOARD=on \ +%endif + +make %{?_smp_mflags} + +%install +%make_install + +%posttrans -n lightdm-kiran-greeter +%define link_source %{_datadir}/kiran-control-panel/plugins/desktop/kiran-cpanel-greeter.desktop +%define link_target %{_datadir}/applications/kiran-cpanel-greeter.desktop +if [ ! -e %{link_target} ] ; then + ln -sf %{link_source} %{link_target} + echo "link %{link_source} -> %{link_target}" +fi + +%post -n lightdm-kiran-greeter +gtk-update-icon-cache -f /usr/share/icons/hicolor/ + +%files -n kiran-screensaver-dialog +%doc +%{_libdir}/kiran-screensaver/libkiran-screensaver-dialog.so +%{_datadir}/kiran-screensaver-dialog/translations/* +%{_datadir}/kiran-screensaver-dialog/screensaver.ini +%{_libexecdir}/kiran-session-guard-checkpass + +%files -n lightdm-kiran-greeter +%doc +%{_datadir}/kiran-control-panel/plugins/libs/libkiran-cpanel-greeter.so* +%{_datadir}/kiran-control-panel/plugins/desktop/* +%{_datadir}/icons/hicolor/* +%{_datadir}/applications/*.desktop + +%{_sbindir}/lightdm-kiran-greeter +%{_datadir}/lightdm-kiran-greeter/translations/* +%{_datadir}/lightdm-kiran-greeter/greeter.ini +%{_datadir}/lightdm-kiran-greeter/zlog.conf +%{_datadir}/xgreeters/lightdm-kiran-greeter.desktop +%{_datadir}/lightdm/lightdm.conf.d/*-lightdm-kiran-greeter.conf + +%clean +rm -rf %{buildroot} + +%changelog +* Wed Jan 26 2022 longcheng - 2.2.1-1.kb4 +- KYOS-B: fix compilation errors on OpenEuler + +* Thu Jan 20 2022 caoyuanji - 2.2.1-1.kb3 +- rebuild for KY3.4-5-KiranUI-2.2 + +* Thu Jan 20 2022 liuxinhao - 2.2.1-1.kb2 +- KYOS-B: fix kiran-screensaver-dialog type eq vanished translator + +* Thu Dec 30 2021 kpkg - 2.2.1-1.kb1 +- rebuild for KY3.4-MATE-modules-dev + +* Wed Dec 29 2021 caoyuanji - 2.2.1-1 +- Upgrade version number for easy upgrade + +* Sat Dec 25 2021 caoyuanji - 2.2.1-.kb2 +- rebuild for KY3.4-4-KiranUI-2.2 + +* Mon Nov 08 2021 liuxinhao - 2.2.1.kb1 +- KYOS-B: add the display user list and allow manual login switch judgment(#45711) +- KYOS-B: set locale,pam message translate +- KYOS-B: fix that the user did not load through the filter module(#41716) +- KYOS-B: fix that scaling mode was not disabled when the configuration item was first loaded +- KYOS-F: kiran-screensaver-dialog build for kiran-screensaver plugin + +* Mon Oct 25 2021 liuxinhao - 2.2.0-2.kb1 +- KYOS-B: fix implicit convert problem + +* Thu Oct 21 2021 liuxinhao - 2.2.0-1.kb2 +- KYBD: rebuild for static library + +* Wed Aug 25 2021 liuxinhao - 2.2.0-1.kb1 +- Initial build +