update to 5.6.21
This commit is contained in:
parent
8c371a91d0
commit
858d77f922
45
0001-Solve-the-user-switching-login-problem.patch
Normal file
45
0001-Solve-the-user-switching-login-problem.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
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
Normal file
24
0001-feat-add-QpainterPath-include.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
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
|
||||||
|
|
||||||
50
0002-fix-dde-lock-prompt-message.patch
Normal file
50
0002-fix-dde-lock-prompt-message.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@ -1,202 +0,0 @@
|
|||||||
From a8a0810d6966af7c212261444fe04bb3aafc6251 Mon Sep 17 00:00:00 2001
|
|
||||||
From: uos <uos@localhost.localdomain>
|
|
||||||
Date: Wed, 5 Jul 2023 17:05:31 +0800
|
|
||||||
Subject: [PATCH] fix-lastLogoutUser-root-bug
|
|
||||||
|
|
||||||
---
|
|
||||||
src/dde-lock/lockworker.cpp | 2 -
|
|
||||||
src/lightdm-deepin-greeter/greeterworker.cpp | 2 -
|
|
||||||
src/session-widgets/authinterface.cpp | 16 --------
|
|
||||||
src/session-widgets/authinterface.h | 1 -
|
|
||||||
src/session-widgets/sessionbasemodel.cpp | 42 +++-----------------
|
|
||||||
src/session-widgets/sessionbasemodel.h | 4 --
|
|
||||||
6 files changed, 6 insertions(+), 61 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/dde-lock/lockworker.cpp b/src/dde-lock/lockworker.cpp
|
|
||||||
index 7edeaf7..22e798b 100644
|
|
||||||
--- a/src/dde-lock/lockworker.cpp
|
|
||||||
+++ b/src/dde-lock/lockworker.cpp
|
|
||||||
@@ -81,7 +81,6 @@ void LockWorker::initConnections()
|
|
||||||
m_model->updateCurrentUser(m_lockInter->CurrentUser());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
- connect(m_loginedInter, &LoginedInter::LastLogoutUserChanged, m_model, static_cast<void (SessionBaseModel::*)(const uid_t)>(&SessionBaseModel::updateLastLogoutUser));
|
|
||||||
connect(m_loginedInter, &LoginedInter::UserListChanged, m_model, &SessionBaseModel::updateLoginedUserList);
|
|
||||||
/* com.deepin.daemon.Authenticate */
|
|
||||||
connect(m_authFramework, &DeepinAuthFramework::FramworkStateChanged, m_model, &SessionBaseModel::updateFrameworkState);
|
|
||||||
@@ -199,7 +198,6 @@ void LockWorker::initData()
|
|
||||||
{
|
|
||||||
/* com.deepin.daemon.Accounts */
|
|
||||||
m_model->updateUserList(m_accountsInter->userList());
|
|
||||||
- m_model->updateLastLogoutUser(m_loginedInter->lastLogoutUser());
|
|
||||||
m_model->updateLoginedUserList(m_loginedInter->userList());
|
|
||||||
|
|
||||||
/* com.deepin.udcp.iam */
|
|
||||||
diff --git a/src/lightdm-deepin-greeter/greeterworker.cpp b/src/lightdm-deepin-greeter/greeterworker.cpp
|
|
||||||
index 915fce2..65bc331 100644
|
|
||||||
--- a/src/lightdm-deepin-greeter/greeterworker.cpp
|
|
||||||
+++ b/src/lightdm-deepin-greeter/greeterworker.cpp
|
|
||||||
@@ -120,7 +120,6 @@ void GreeterWorker::initConnections()
|
|
||||||
m_soundPlayerInter->PrepareShutdownSound(static_cast<int>(m_model->currentUser()->uid()));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
- connect(m_loginedInter, &LoginedInter::LastLogoutUserChanged, m_model, static_cast<void (SessionBaseModel::*)(const uid_t)>(&SessionBaseModel::updateLastLogoutUser));
|
|
||||||
connect(m_loginedInter, &LoginedInter::UserListChanged, m_model, &SessionBaseModel::updateLoginedUserList);
|
|
||||||
/* com.deepin.daemon.Authenticate */
|
|
||||||
connect(m_authFramework, &DeepinAuthFramework::FramworkStateChanged, m_model, &SessionBaseModel::updateFrameworkState);
|
|
||||||
@@ -257,7 +256,6 @@ void GreeterWorker::initData()
|
|
||||||
|
|
||||||
/* com.deepin.daemon.Accounts */
|
|
||||||
m_model->updateUserList(m_accountsInter->userList());
|
|
||||||
- m_model->updateLastLogoutUser(m_loginedInter->lastLogoutUser());
|
|
||||||
m_model->updateLoginedUserList(m_loginedInter->userList());
|
|
||||||
|
|
||||||
/* com.deepin.udcp.iam */
|
|
||||||
diff --git a/src/session-widgets/authinterface.cpp b/src/session-widgets/authinterface.cpp
|
|
||||||
index ad8b661..38f1005 100644
|
|
||||||
--- a/src/session-widgets/authinterface.cpp
|
|
||||||
+++ b/src/session-widgets/authinterface.cpp
|
|
||||||
@@ -92,7 +92,6 @@ void AuthInterface::onUserRemove(const QString &user)
|
|
||||||
void AuthInterface::initData()
|
|
||||||
{
|
|
||||||
onUserListChanged(m_accountsInter->userList());
|
|
||||||
- onLastLogoutUserChanged(m_loginedInter->lastLogoutUser());
|
|
||||||
onLoginUserListChanged(m_loginedInter->userList());
|
|
||||||
// m_accountsInter->userList();
|
|
||||||
// m_loginedInter->lastLogoutUser();
|
|
||||||
@@ -110,24 +109,9 @@ void AuthInterface::initDBus()
|
|
||||||
connect(m_accountsInter, &AccountsInter::UserAdded, this, &AuthInterface::onUserAdded, Qt::QueuedConnection);
|
|
||||||
connect(m_accountsInter, &AccountsInter::UserDeleted, this, &AuthInterface::onUserRemove, Qt::QueuedConnection);
|
|
||||||
|
|
||||||
- connect(m_loginedInter, &LoginedInter::LastLogoutUserChanged, this, &AuthInterface::onLastLogoutUserChanged);
|
|
||||||
connect(m_loginedInter, &LoginedInter::UserListChanged, this, &AuthInterface::onLoginUserListChanged);
|
|
||||||
}
|
|
||||||
|
|
||||||
-void AuthInterface::onLastLogoutUserChanged(uint uid)
|
|
||||||
-{
|
|
||||||
- m_lastLogoutUid = uid;
|
|
||||||
-
|
|
||||||
- QList<std::shared_ptr<User>> userList = m_model->userList();
|
|
||||||
- for (auto it = userList.constBegin(); it != userList.constEnd(); ++it) {
|
|
||||||
- if ((*it)->uid() == uid) {
|
|
||||||
- m_model->updateLastLogoutUser((*it));
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- m_model->updateLastLogoutUser(std::shared_ptr<User>(nullptr));
|
|
||||||
-}
|
|
||||||
|
|
||||||
void AuthInterface::onLoginUserListChanged(const QString &list)
|
|
||||||
{
|
|
||||||
diff --git a/src/session-widgets/authinterface.h b/src/session-widgets/authinterface.h
|
|
||||||
index d01afe1..3fc1fe8 100644
|
|
||||||
--- a/src/session-widgets/authinterface.h
|
|
||||||
+++ b/src/session-widgets/authinterface.h
|
|
||||||
@@ -54,7 +54,6 @@ public:
|
|
||||||
protected:
|
|
||||||
void initDBus();
|
|
||||||
void initData();
|
|
||||||
- void onLastLogoutUserChanged(uint uid);
|
|
||||||
void onLoginUserListChanged(const QString &list);
|
|
||||||
|
|
||||||
bool checkHaveDisplay(const QJsonArray &array);
|
|
||||||
diff --git a/src/session-widgets/sessionbasemodel.cpp b/src/session-widgets/sessionbasemodel.cpp
|
|
||||||
index 9593db3..f8a43de 100644
|
|
||||||
--- a/src/session-widgets/sessionbasemodel.cpp
|
|
||||||
+++ b/src/session-widgets/sessionbasemodel.cpp
|
|
||||||
@@ -31,7 +31,6 @@ SessionBaseModel::SessionBaseModel(QObject *parent)
|
|
||||||
, m_isUseWayland(QGuiApplication::platformName().startsWith("wayland", Qt::CaseInsensitive))
|
|
||||||
, m_appType(AuthCommon::None)
|
|
||||||
, m_currentUser(nullptr)
|
|
||||||
- , m_lastLogoutUser(nullptr)
|
|
||||||
, m_powerAction(PowerAction::RequireNormal)
|
|
||||||
, m_currentModeState(ModeStatus::NoStatus)
|
|
||||||
, m_authProperty {false, false, Unavailable, AuthCommon::None, AuthCommon::None, 0, "", "", ""}
|
|
||||||
@@ -385,8 +384,12 @@ bool SessionBaseModel::updateCurrentUser(const QString &userJson)
|
|
||||||
qDebug("update current user, data: %s", qPrintable(userJson));
|
|
||||||
|
|
||||||
std::shared_ptr<User> user_ptr = json2User(userJson);
|
|
||||||
- if (!user_ptr)
|
|
||||||
- user_ptr = m_lastLogoutUser ? m_lastLogoutUser : m_users->first();
|
|
||||||
+ if (!user_ptr) {
|
|
||||||
+ if (m_currentUser)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
+ user_ptr = m_users->first();
|
|
||||||
+ }
|
|
||||||
|
|
||||||
return updateCurrentUser(user_ptr);
|
|
||||||
}
|
|
||||||
@@ -439,39 +442,6 @@ void SessionBaseModel::updateUserList(const QStringList &list)
|
|
||||||
}
|
|
||||||
emit userListChanged(m_users->values());
|
|
||||||
}
|
|
||||||
-
|
|
||||||
-/**
|
|
||||||
- * @brief 更新上一个登录用户
|
|
||||||
- *
|
|
||||||
- * @param uid
|
|
||||||
- */
|
|
||||||
-void SessionBaseModel::updateLastLogoutUser(const uid_t uid)
|
|
||||||
-{
|
|
||||||
- qDebug() << "SessionBaseModel::updateLastLogoutUser:" << uid;
|
|
||||||
- QList<std::shared_ptr<User>> userList = m_users->values();
|
|
||||||
- auto it = std::find_if(userList.begin(), userList.end(), [uid](std::shared_ptr<User> &user) {
|
|
||||||
- return user->uid() == uid;
|
|
||||||
- });
|
|
||||||
- if (it != userList.end()) {
|
|
||||||
- updateLastLogoutUser(it.i->t());
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-/**
|
|
||||||
- * @brief 设置上一个登录的用户
|
|
||||||
- *
|
|
||||||
- * @param lastLogoutUser
|
|
||||||
- */
|
|
||||||
-void SessionBaseModel::updateLastLogoutUser(const std::shared_ptr<User> lastLogoutUser)
|
|
||||||
-{
|
|
||||||
- if (!lastLogoutUser.get() || m_lastLogoutUser == lastLogoutUser) {
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
- qInfo() << "last logout user:" << lastLogoutUser->name() << lastLogoutUser->uid();
|
|
||||||
-
|
|
||||||
- m_lastLogoutUser = lastLogoutUser;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
/**
|
|
||||||
* @brief 更新已登录用户列表
|
|
||||||
*
|
|
||||||
diff --git a/src/session-widgets/sessionbasemodel.h b/src/session-widgets/sessionbasemodel.h
|
|
||||||
index 09e35f4..5e57249 100644
|
|
||||||
--- a/src/session-widgets/sessionbasemodel.h
|
|
||||||
+++ b/src/session-widgets/sessionbasemodel.h
|
|
||||||
@@ -70,7 +70,6 @@ public:
|
|
||||||
~SessionBaseModel() override;
|
|
||||||
|
|
||||||
inline std::shared_ptr<User> currentUser() const { return m_currentUser; }
|
|
||||||
- inline std::shared_ptr<User> lastLogoutUser() const { return m_lastLogoutUser; }
|
|
||||||
|
|
||||||
inline QList<std::shared_ptr<User>> loginedUserList() const { return m_loginedUsers->values(); }
|
|
||||||
inline QList<std::shared_ptr<User>> userList() const { return m_users->values(); }
|
|
||||||
@@ -165,8 +164,6 @@ public slots:
|
|
||||||
bool updateCurrentUser(const QString &userJson);
|
|
||||||
bool updateCurrentUser(const std::shared_ptr<User> user);
|
|
||||||
void updateUserList(const QStringList &list);
|
|
||||||
- void updateLastLogoutUser(const uid_t uid);
|
|
||||||
- void updateLastLogoutUser(const std::shared_ptr<User> lastLogoutUser);
|
|
||||||
void updateLoginedUserList(const QString &list);
|
|
||||||
/* com.deepin.daemon.Authenticate */
|
|
||||||
void updateLimitedInfo(const QString &info);
|
|
||||||
@@ -236,7 +233,6 @@ private:
|
|
||||||
AppType m_appType;
|
|
||||||
QList<std::shared_ptr<User>> m_userList;
|
|
||||||
std::shared_ptr<User> m_currentUser;
|
|
||||||
- std::shared_ptr<User> m_lastLogoutUser;
|
|
||||||
QString m_sessionKey;
|
|
||||||
PowerAction m_powerAction;
|
|
||||||
ModeStatus m_currentModeState;
|
|
||||||
--
|
|
||||||
2.27.0
|
|
||||||
|
|
||||||
36
README.en.md
36
README.en.md
@ -1,36 +0,0 @@
|
|||||||
# 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
37
README.md
@ -1,37 +0,0 @@
|
|||||||
# 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/)
|
|
||||||
Binary file not shown.
BIN
dde-session-shell-5.6.21.tar.gz
Normal file
BIN
dde-session-shell-5.6.21.tar.gz
Normal file
Binary file not shown.
@ -1,18 +1,29 @@
|
|||||||
|
%global debug_package %{nil}
|
||||||
|
%debug_package %{nil}
|
||||||
|
|
||||||
|
|
||||||
Name: dde-session-shell
|
Name: dde-session-shell
|
||||||
Version: 5.5.90
|
Version: 5.6.21
|
||||||
Release: 1
|
Release: 2%{?dist}.01
|
||||||
Summary: deepin-session-shell - Deepin desktop-environment - session-shell module
|
Summary: deepin-session-shell - Deepin desktop-environment - session-shell module
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://github.com/linuxdeepin/dde-session-shell
|
URL: https://github.com/linuxdeepin/dde-session-shell/
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||||
Patch0: 9000-fix-lastLogoutUser-root-bug.patch
|
#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
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: dde-daemon
|
BuildRequires: glib2-devel
|
||||||
BuildRequires: dtkcore-devel
|
BuildRequires: libarchive
|
||||||
|
BuildRequires: dtkcore-devel >= 5.5
|
||||||
|
BuildRequires: dtkcommon-devel
|
||||||
BuildRequires: gsettings-qt
|
BuildRequires: gsettings-qt
|
||||||
|
BuildRequires: qt5-qttools-devel
|
||||||
|
BuildRequires: qt5-qtdeclarative-devel
|
||||||
BuildRequires: qt5-linguist
|
BuildRequires: qt5-linguist
|
||||||
BuildRequires: dtkwidget-devel >= 5.1
|
BuildRequires: dtkwidget-devel >= 5.5
|
||||||
BuildRequires: qt5-qtx11extras-devel
|
BuildRequires: qt5-qtx11extras-devel
|
||||||
BuildRequires: qt5-qtmultimedia-devel
|
BuildRequires: qt5-qtmultimedia-devel
|
||||||
BuildRequires: qt5-qtsvg-devel
|
BuildRequires: qt5-qtsvg-devel
|
||||||
@ -20,17 +31,27 @@ BuildRequires: libXcursor-devel
|
|||||||
BuildRequires: libXrandr-devel
|
BuildRequires: libXrandr-devel
|
||||||
BuildRequires: libXtst-devel
|
BuildRequires: libXtst-devel
|
||||||
BuildRequires: libXi-devel
|
BuildRequires: libXi-devel
|
||||||
|
BuildRequires: deepin-gettext-tools
|
||||||
BuildRequires: xcb-util-wm xcb-util-wm-devel
|
BuildRequires: xcb-util-wm xcb-util-wm-devel
|
||||||
BuildRequires: dde-qt-dbus-factory-devel
|
BuildRequires: dde-qt-dbus-factory-devel
|
||||||
BuildRequires: gsettings-qt-devel
|
BuildRequires: gsettings-qt-devel
|
||||||
BuildRequires: lightdm-qt5-devel
|
BuildRequires: lightdm-qt5-devel
|
||||||
BuildRequires: pam-devel
|
BuildRequires: pam-devel
|
||||||
BuildRequires: gtest-devel gmock
|
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: gtest-devel
|
||||||
BuildRequires: dtkgui-devel
|
BuildRequires: dtkgui-devel
|
||||||
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: kf5-kwayland-devel
|
BuildRequires: kf5-kwayland-devel
|
||||||
|
%ifarch sw_64
|
||||||
|
BuildRequires: gmock
|
||||||
|
%endif
|
||||||
|
|
||||||
Requires: lightdm
|
Requires: lightdm
|
||||||
|
Requires: google-noto-cjk-fonts
|
||||||
|
Requires: libqtxdg-devel
|
||||||
|
Requires: deepin-desktop-schemas
|
||||||
|
Requires: dde-daemon
|
||||||
|
Requires: startdde
|
||||||
Requires(post): sed
|
Requires(post): sed
|
||||||
Provides: lightdm-deepin-greeter = %{version}-%{release}
|
Provides: lightdm-deepin-greeter = %{version}-%{release}
|
||||||
Provides: lightdm-greeter = 1.2
|
Provides: lightdm-greeter = 1.2
|
||||||
@ -39,16 +60,14 @@ Provides: lightdm-greeter = 1.2
|
|||||||
deepin-session-shell - Deepin desktop-environment - session-shell module.
|
deepin-session-shell - Deepin desktop-environment - session-shell module.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development package for %{name}
|
Summary: Development package for %{name}
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Header files for %{name}.
|
Header files for %{name}.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export PATH=$PATH:%{_qt5_bindir}
|
export PATH=$PATH:%{_qt5_bindir}
|
||||||
@ -62,19 +81,24 @@ sed -i "s|VERSION 3.13.4|VERSION $cmake_version|g" CMakeLists.txt
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%{_bindir}/dde-lock
|
%{_bindir}/dde-lock
|
||||||
|
%{_bindir}/greeter-display-setting
|
||||||
%{_bindir}/lightdm-deepin-greeter
|
%{_bindir}/lightdm-deepin-greeter
|
||||||
|
%{_bindir}/lightdm-deepin-greeter-lighter
|
||||||
%attr(755,root,root) %{_bindir}/deepin-greeter
|
%attr(755,root,root) %{_bindir}/deepin-greeter
|
||||||
%{_sysconfdir}/deepin/
|
%{_sysconfdir}/pam.d/dde-lock
|
||||||
%{_sysconfdir}/lightdm/deepin/
|
%{_sysconfdir}/lightdm/deepin/
|
||||||
%{_sysconfdir}/xdg/autostart/dde-lock.desktop
|
%{_sysconfdir}/xdg/autostart/dde-lock.desktop
|
||||||
%{_datadir}/dde-session-shell/
|
%{_datadir}/dde-session-shell/
|
||||||
%{_datadir}/deepin-authentication/privileges/lightdm-deepin-greeter.conf
|
%{_datadir}/deepin-authentication/
|
||||||
|
%{_datadir}/applications/dde-lock.desktop
|
||||||
%{_datadir}/xgreeters/lightdm-deepin-greeter.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.lockFront.service
|
||||||
%{_datadir}/dbus-1/services/com.deepin.dde.shutdownFront.service
|
%{_datadir}/dbus-1/services/com.deepin.dde.shutdownFront.service
|
||||||
%{_datadir}/applications/dde-lock.desktop
|
|
||||||
%{_datadir}/glib-2.0/schemas/com.deepin.dde.session-shell.gschema.xml
|
%{_datadir}/glib-2.0/schemas/com.deepin.dde.session-shell.gschema.xml
|
||||||
%{_datadir}/dsg
|
%{_datadir}/dsg/
|
||||||
|
%{_datadir}/lightdm/lightdm.conf.d/50-deepin.conf
|
||||||
|
%{_libdir}/security/pam_inhibit_autologin.so
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/%{name}
|
%{_includedir}/%{name}
|
||||||
@ -82,26 +106,29 @@ sed -i "s|VERSION 3.13.4|VERSION $cmake_version|g" CMakeLists.txt
|
|||||||
%{_libdir}/cmake/DdeSessionShell/DdeSessionShellConfig.cmake
|
%{_libdir}/cmake/DdeSessionShell/DdeSessionShellConfig.cmake
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Jul 31 2023 leeffo <liweiganga@uniontech.com> - 5.5.90-1
|
* Mon Mar 04 2024 yangfei <yangfei@uniontech.com> - 5.6.21-2.01
|
||||||
- upgrade to version 5.5.90
|
- fix: fix dde-lock prompt message(bugid:241641)
|
||||||
|
|
||||||
* Thu Mar 30 2023 liweiganga <liweiganga@uniontech.com> - 5.4.92-1
|
* Tue Dec 12 2023 mahailiang <mahailiang@uniontech.com> - 5.6.21-2
|
||||||
- update: update to 5.4.92
|
- fix: Solve the user switching login problem(bugid:194591)
|
||||||
|
|
||||||
* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.4.20.24-1
|
* Mon Oct 09 2023 liweigang <liweiganga@uniontech.com> - 5.6.21-1
|
||||||
- Update to 5.4.20.24
|
- update: update to version 5.6.21
|
||||||
|
|
||||||
* Thu Jul 08 2021 weidong <weidong@uniontech.com> - 5.3.0.40.2-1
|
* Fri Sep 08 2023 liuzhilin <liuzhilin@uniontech.com> - 5.6.12.5-1.01
|
||||||
- Update 5.3.0.40.2
|
- spec: add buildrequires gmock to sw_64
|
||||||
|
|
||||||
* Wed Sep 09 2020 chenbo.pan <panchenbo@uniontech.com> - 5.0.0.8-4
|
* Thu Aug 17 2023 liuzhilin <liuzhilin@uniontech.com> - 5.6.12.5-1
|
||||||
- fix compile error for openeuler
|
- update: update to 5.6.12.5
|
||||||
|
|
||||||
* Fri Sep 04 2020 weidong <weidong@uniontech.com> - 5.0.0.8-3
|
* Wed Jul 05 2023 yuxiaojun <yuxiaojun@uniontech.com> - 5.5.90-1.03
|
||||||
- fix source url in spec
|
- 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)
|
||||||
|
|
||||||
* Fri Sep 04 2020 chenbo.pan <panchenbo@uniontech.com> - 5.0.0.8-2
|
* Tue Jan 17 2023 liweiganga <liweiganga@uniontech.com> - 5.5.90-1.01
|
||||||
- fix compile error
|
- spec: fix greeters path
|
||||||
|
|
||||||
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.0.0.8-1
|
* Thu Dec 29 2022 liweiganga <liweiganga@uniontech.com> - 5.5.90-1
|
||||||
- Package init
|
- update: update to 5.5.90
|
||||||
|
|
||||||
|
* Fri Jun 10 2022 uoser <uoser@uniontech.com> - 5.4.92-1.01
|
||||||
|
- package init
|
||||||
|
|||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: github
|
|
||||||
src_repo: linuxdeepin/dde-session-shell
|
|
||||||
tag_prefix: ^v
|
|
||||||
seperator: .
|
|
||||||
Loading…
x
Reference in New Issue
Block a user