packages/dde-session-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:b8f3245f64b4dead27def2937044011097de07cf
Branches Tags
packages:main
..
compare: packages:db9eec19b910b36aaceefe64eb2768d39e2ef948
Branches Tags
packages:main

No commits in common. "b8f3245f64b4dead27def2937044011097de07cf" and "db9eec19b910b36aaceefe64eb2768d39e2ef948" have entirely different histories.
b8f3245f64 ... db9eec19b9

10 changed files with 149 additions and 206 deletions
Show Stats Expand all files Collapse all files

45
0001-Solve-the-user-switching-login-problem.patch
View File

@ -1,45 +0,0 @@
From b1a4628480f1e9387ae5ac2c1bc298aaeab48abb Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Tue, 12 Dec 2023 14:29:36 +0800
Subject: [PATCH] Solve-the-user-switching-login-problem
---
src/session-widgets/lockcontent.cpp | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/session-widgets/lockcontent.cpp b/src/session-widgets/lockcontent.cpp
index 1325addc..9437c468 100644
--- a/src/session-widgets/lockcontent.cpp
+++ b/src/session-widgets/lockcontent.cpp
@@ -129,6 +129,17 @@ void LockContent::initConnections()
{
connect(m_model, &SessionBaseModel::currentUserChanged, this, &LockContent::onCurrentUserChanged);
connect(m_controlWidget, &ControlWidget::requestSwitchUser, this, [this] {
+ // 在服务器版本中，如果没有用户登录，当点击切换用户时，直接切回到账户输入界面
+ if (m_model->isServerModel() && m_model->loginedUserList().isEmpty()) {
+ std::shared_ptr<User> user_ptr = m_model->findUserByName("...");
+
+ if (user_ptr) {
+ m_controlWidget->setUserSwitchEnable(false);
+ emit requestSwitchToUser(user_ptr);
+ return;
+ }
+ }
+
m_model->setCurrentModeState(SessionBaseModel::ModeStatus::UserMode);
emit requestEndAuthentication(m_model->currentUser()->name(), AuthCommon::AT_All);
});
@@ -304,6 +315,10 @@ void LockContent::onCurrentUserChanged(std::shared_ptr<User> user)
m_centerTopWidget->setCurrentUser(user.get());
m_logoWidget->updateLocale(locale);
+ // 在服务器版中，当没有用户登录时，在登录界面切换到之前登录过的用户时，显示切换用户按钮，供用户重新输入新的账户登录
+ if (m_model->isServerModel() && user->type() == User::Native && m_model->loginedUserList().isEmpty()) {
+ m_controlWidget->setUserSwitchEnable(true);
+ }
}
void LockContent::pushPasswordFrame()
--
2.39.3

24
0001-feat-add-QpainterPath-include.patch
View File

@ -1,24 +0,0 @@
From 9f0ebf49ee3d7eeb01ab9e62bd47c48d30e5c810 Mon Sep 17 00:00:00 2001
From: leeffo <liweiganga@uniontech.com>
Date: Mon, 9 Oct 2023 16:36:38 +0800
Subject: [PATCH] feat: add QpainterPath include
---
src/session-widgets/buttonbox.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/session-widgets/buttonbox.cpp b/src/session-widgets/buttonbox.cpp
index aa8f20dc..ca903259 100644
--- a/src/session-widgets/buttonbox.cpp
+++ b/src/session-widgets/buttonbox.cpp
@@ -8,6 +8,7 @@
#include <DStyleOption>
#include <QPainter>
+#include <QPainterPath>
#include <QButtonGroup>
#include <QHBoxLayout>
--
2.20.1

44
0001-fix-compile-error-for-openeuler.patch Normal file
View File

@ -0,0 +1,44 @@
From 2fd2c44240f32423c040f909de2a323d72d4fe82 Mon Sep 17 00:00:00 2001
From: panchenbo <panchenbo@uniontech.com>
Date: Wed, 9 Sep 2020 19:48:57 +0800
Subject: [PATCH] fix compile error
---
CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a50f11e..0f47e79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,14 +147,14 @@ set(WIDGETS_SRCS
./src/widgets/fullscreenbackground.h
./src/widgets/userbutton.h
./src/widgets/controlwidget.h
- ./src/widgets/errortooltip.h
+ #./src/widgets/errortooltip.h
./src/widgets/shutdownwidget.h
./src/widgets/dbreathinglabel.h
./src/widgets/rounditembutton.h
./src/widgets/kblayoutwidget.h
./src/widgets/mediawidget.h
./src/widgets/propertygroup.h
- ./src/widgets/darrowrectangle.h
+ #./src/widgets/darrowrectangle.h
./src/widgets/userbreathinglabel.h
./src/widgets/virtualkbinstance.h
./src/widgets/logowidget.h
@@ -164,8 +164,8 @@ set(WIDGETS_SRCS
./src/widgets/fullscreenbackground.cpp
./src/widgets/loginbutton.cpp
./src/widgets/dbreathinglabel.cpp
- ./src/widgets/errortooltip.cpp
- ./src/widgets/darrowrectangle.cpp
+ #./src/widgets/errortooltip.cpp
+ #./src/widgets/darrowrectangle.cpp
./src/widgets/mediawidget.cpp
./src/widgets/controlwidget.cpp
./src/widgets/virtualkbinstance.cpp
--
2.20.1

50
0002-fix-dde-lock-prompt-message.patch
View File

@ -1,50 +0,0 @@
diff -Naur a/src/libdde-auth/deepinauthframework.cpp b/src/libdde-auth/deepinauthframework.cpp
--- a/src/libdde-auth/deepinauthframework.cpp 2023-10-09 14:52:49.000000000 +0800
+++ b/src/libdde-auth/deepinauthframework.cpp 2024-03-04 15:45:26.110492602 +0800
@@ -129,13 +129,15 @@
} else {
qDebug() << "PAM start...";
}
-
+
+ m_message = "";
int rc = pam_authenticate(m_pamHandle, 0);
if (rc != PAM_SUCCESS) {
qWarning() << "PAM authenticate failed:" << pam_strerror(m_pamHandle, rc) << rc;
if (m_message.isEmpty()) m_message = pam_strerror(m_pamHandle, rc);
} else {
qDebug() << "PAM authenticate finished.";
+ m_message = "";
}
int re = pam_end(m_pamHandle, rc);
@@ -185,8 +187,9 @@
qWarning() << "PAM_BUF_ERR";
return PAM_BUF_ERR;
}
- const QString message = QString::fromLocal8Bit(PAM_MSG_MEMBER(msg, idx, msg));
+ //const QString message = QString::fromLocal8Bit(PAM_MSG_MEMBER(msg, idx, msg));
for (idx = 0; idx < num_msg; ++idx) {
+ const QString message = QString::fromLocal8Bit(PAM_MSG_MEMBER(msg, idx, msg));
switch (PAM_MSG_MEMBER(msg, idx, msg_style)) {
case PAM_PROMPT_ECHO_ON:
case PAM_PROMPT_ECHO_OFF: {
@@ -219,15 +222,15 @@
}
case PAM_ERROR_MSG: {
qDebug() << "pam auth error: " << message;
- app_ptr->m_message = message;
+ //app_ptr->m_message = message;
app_ptr->UpdateAuthState(AS_Failure, message);
aresp[idx].resp_retcode = PAM_SUCCESS;
break;
}
case PAM_TEXT_INFO: {
qDebug() << "pam auth info: " << message;
- app_ptr->m_message = message;
- app_ptr->UpdateAuthState(AS_Prompt, message);
+ //app_ptr->m_message = message;
+ app_ptr->UpdateAuthState(AS_Failure, message);
aresp[idx].resp_retcode = PAM_SUCCESS;
break;
}

36
README.en.md Normal file
View File

@ -0,0 +1,36 @@
# dde-session-shell
#### Description
dde session shell
#### Software Architecture
Software architecture description
#### Installation
1. xxxx
2. xxxx
3. xxxx
#### Instructions
1. xxxx
2. xxxx
3. xxxx
#### Contribution
1. Fork the repository
2. Create Feat_xxx branch
3. Commit your code
4. Create Pull Request
#### Gitee Feature
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
4. The most valuable open source project [GVP](https://gitee.com/gvp)
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

37
README.md Normal file
View File

@ -0,0 +1,37 @@
# dde-session-shell
#### 介绍
dde session shell
#### 软件架构
软件架构说明
#### 安装教程
1. xxxx
2. xxxx
3. xxxx
#### 使用说明
1. xxxx
2. xxxx
3. xxxx
#### 参与贡献
1. Fork 本仓库
2. 新建 Feat_xxx 分支
3. 提交代码
4. 新建 Pull Request
#### 码云特技
1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

BIN
dde-session-shell-5.6.21.tar.gz
View File

Binary file not shown.

115
dde-session-shell.spec
View File

@ -1,29 +1,23 @@
%global debug_package %{nil}
%debug_package %{nil}
%if 0%{?with_debug}
%global debug_package %{nil}
%endif
Name: dde-session-shell
Version: 5.6.21
Release: 2%{?dist}.01
Version: 5.0.0.8
Release: 3
Summary: deepin-session-shell - Deepin desktop-environment - session-shell module
License: GPLv3+
URL: https://github.com/linuxdeepin/dde-session-shell/
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
#Patch0: 9000-fix-lastLogoutUser-root-bug.patch
Patch0: 0001-feat-add-QpainterPath-include.patch
Patch1: 0001-Solve-the-user-switching-login-problem.patch
Patch2: 0002-fix-dde-lock-prompt-message.patch
URL: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNzYxMA/pool/main/d/dde-session-shell/
Source0: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNzYxMA/pool/main/d/%{name}/%{name}_%{version}.orig.tar.xz
Patch0: 0001-fix-compile-error-for-openeuler.patch
BuildRequires: cmake
BuildRequires: glib2-devel
BuildRequires: libarchive
BuildRequires: dtkcore-devel >= 5.5
BuildRequires: dtkcommon-devel
BuildRequires: dde-daemon
BuildRequires: dtkcore-devel
BuildRequires: gsettings-qt
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtdeclarative-devel
BuildRequires: startdde
BuildRequires: qt5-linguist
BuildRequires: dtkwidget-devel >= 5.5
BuildRequires: dtkwidget-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: qt5-qtsvg-devel
@ -31,102 +25,49 @@ BuildRequires: libXcursor-devel
BuildRequires: libXrandr-devel
BuildRequires: libXtst-devel
BuildRequires: libXi-devel
BuildRequires: deepin-gettext-tools
BuildRequires: xcb-util-wm xcb-util-wm-devel
BuildRequires: dde-qt-dbus-factory-devel
BuildRequires: gsettings-qt-devel
BuildRequires: lightdm-qt5-devel
BuildRequires: pam-devel
BuildRequires: openssl-devel
BuildRequires: gtest-devel
BuildRequires: dtkgui-devel
BuildRequires: gcc-c++
BuildRequires: kf5-kwayland-devel
BuildRequires: gmock
Requires: lightdm
Requires: google-noto-cjk-fonts
Requires: libqtxdg-devel
Requires: deepin-desktop-schemas
Requires: dde-daemon
Requires: startdde
Requires(post): sed
Provides: lightdm-deepin-greeter = %{version}-%{release}
Provides: lightdm-greeter = 1.2
BuildRequires: lightdm-qt5-devel lightdm-gtk-greeter
%description
deepin-session-shell - Deepin desktop-environment - session-shell module.
%package devel
Summary: Development package for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
Header files for %{name}.
%prep
%autosetup -p1
%autosetup -n %{name}-%{version} -p1
%build
export PATH=$PATH:%{_qt5_bindir}
cmake_version=$(cmake --version | head -1 | awk '{print $3}')
sed -i "s|VERSION 3.13.4|VERSION $cmake_version|g" CMakeLists.txt
%cmake -DCMAKE_INSTALL_SYSCONFDIR=/etc
%make_build
%{__cmake} .
make
%install
%make_install
%files
%{_bindir}/dde-lock
%{_bindir}/greeter-display-setting
%{_bindir}/dde-shutdown
%{_bindir}/lightdm-deepin-greeter
%{_bindir}/lightdm-deepin-greeter-lighter
%attr(755,root,root) %{_bindir}/deepin-greeter
%{_sysconfdir}/pam.d/dde-lock
%{_sysconfdir}/lightdm/deepin/
%{_sysconfdir}/xdg/autostart/dde-lock.desktop
%{_sysconfdir}/deepin/greeters.d/00-xrandr
%{_sysconfdir}/deepin/greeters.d/lightdm-deepin-greeter
%{_datadir}/dde-session-shell/
%{_datadir}/deepin-authentication/
%{_datadir}/applications/dde-lock.desktop
%{_datadir}/xgreeters/lightdm-deepin-greeter.desktop
%{_datadir}/xgreeters/lightdm-deepin-greeter-wayland.desktop
%{_datadir}/dbus-1/services/com.deepin.dde.lockFront.service
%{_datadir}/dbus-1/services/com.deepin.dde.shutdownFront.service
%{_datadir}/glib-2.0/schemas/com.deepin.dde.session-shell.gschema.xml
%{_datadir}/dsg/
%{_datadir}/lightdm/lightdm.conf.d/50-deepin.conf
%{_libdir}/security/pam_inhibit_autologin.so
%files devel
%{_includedir}/%{name}
%{_prefix}/lib/%{name}/modules/
%{_libdir}/cmake/DdeSessionShell/DdeSessionShellConfig.cmake
%changelog
* Mon Mar 04 2024 yangfei <yangfei@uniontech.com> - 5.6.21-2.01
- fix: fix dde-lock prompt message(bugid:241641)
* Wed Sep 09 2020 chenbo.pan <panchenbo@uniontech.com> - 5.0.0.8-4
- fix compile error for openeuler
* Tue Dec 12 2023 mahailiang <mahailiang@uniontech.com> - 5.6.21-2
- fix: Solve the user switching login problem(bugid:194591)
* Fri Sep 04 2020 weidong <weidong@uniontech.com> - 5.0.0.8-3
- fix source url in spec
* Mon Oct 09 2023 liweigang <liweiganga@uniontech.com> - 5.6.21-1
- update: update to version 5.6.21
* Fri Sep 04 2020 chenbo.pan <panchenbo@uniontech.com> - 5.0.0.8-2
- fix compile error
* Fri Sep 08 2023 liuzhilin <liuzhilin@uniontech.com> - 5.6.12.5-1.01
- spec: add buildrequires gmock to sw_64
* Thu Aug 17 2023 liuzhilin <liuzhilin@uniontech.com> - 5.6.12.5-1
- update: update to 5.6.12.5
* Wed Jul 05 2023 yuxiaojun <yuxiaojun@uniontech.com> - 5.5.90-1.03
- fix: When root is disabled after creating an administrator account, the problem of being unable to enter the system through the graphical interface(bugid:203337)
* Tue Jan 17 2023 liweiganga <liweiganga@uniontech.com> - 5.5.90-1.01
- spec: fix greeters path
* Thu Dec 29 2022 liweiganga <liweiganga@uniontech.com> - 5.5.90-1
- update: update to 5.5.90
* Fri Jun 10 2022 uoser <uoser@uniontech.com> - 5.4.92-1.01
- package init
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.0.0.8-1
- Package init

4
dde-session-shell.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: linuxdeepin/dde-session-shell
tag_prefix: ^v
seperator: .

BIN
dde-session-shell_5.0.0.8.orig.tar.xz Executable file
View File

Binary file not shown.