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

update version to 3.1.0

Browse Source
This commit is contained in:
peijiankang 2022-12-06 10:24:24 +08:00
parent 89ff3df937
commit 01adab609b
11 changed files with 38 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
0001-fix-poweroff.patch
View File

@ -1,65 +0,0 @@
From 6e6f2d46c03b255062c8fdb6f64f0e587445a6ef Mon Sep 17 00:00:00 2001
From: myshow <296570182@qq.com>
Date: Thu, 3 Dec 2020 11:05:51 +0800
Subject: [PATCH] fix-poweroff
---
ukui-session/sessiondbusadaptor.h | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/ukui-session/sessiondbusadaptor.h b/ukui-session/sessiondbusadaptor.h
index c005702..4da2b55 100644
--- a/ukui-session/sessiondbusadaptor.h
+++ b/ukui-session/sessiondbusadaptor.h
@@ -21,6 +21,7 @@
#define SESSIONDBUSADAPTOR_H
#include <QtDBus>
+#include <QMessageBox>
#include "../tools/ukuipower.h"
#include "modulemanager.h"
@@ -54,7 +55,16 @@ public slots:
bool canPowerOff()
{
- return mPower->canAction(UkuiPower::PowerShutdown);
+ QProcess p;
+ p.start("bash", QStringList() <<"-c" << "who | wc -l");
+ p.waitForFinished();
+ QString ret = p.readAllStandardOutput();
+ int user = ret.toInt();
+ if (user > 1)
+ return false;
+ else
+ return true;
+ // return mPower->canAction(UkuiPower::PowerShutdown);
}
Q_NOREPLY void logout()
@@ -74,10 +84,19 @@ public slots:
Q_NOREPLY void powerOff()
{
if(mPower->canAction(UkuiPower::PowerShutdown)){
- mManager->logout(false);
- mPower->doAction(UkuiPower::PowerShutdown);
+ // mManager->logout(false);
+ // mPower->doAction(UkuiPower::PowerShutdown);
+ QProcess::execute("shutdown -h now");
+ // QProcess::execute("poweroff");
+ }
+ else {
+ //弹框提示无法生效?
+ QMessageBox msg;
+ msg.setWindowTitle(tr("Error"));
+ msg.setText(tr("The computer could not be shut down!"));
+ msg.addButton(tr("Ok"), QMessageBox::AcceptRole);
+ msg.exec();
}
- //QCoreApplication::exit(0);
}
// QDBusVariant listModules()
--
2.29.2.windows.2

19
0002-reset-changelog-and-format.patch
View File

@ -1,19 +0,0 @@
From 62ca5caa25027ef6a98dad553e2ef2548aa25f49 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 28 Oct 2021 19:26:10 +0800
Subject: [PATCH] reset changelog and format
---
debian/source/format | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100755
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
--
2.30.0

61
0003-adjust-the-sequence-to-make-translation-file-loaded-first.patch
View File

@ -1,61 +0,0 @@
From 3da5d58af9a10a88e213a0d1ad64984032f3f795 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 1 Nov 2021 17:02:58 +0800
Subject: [PATCH] adjust the sequence to make translation file loaded first
---
tools/main.cpp | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/tools/main.cpp b/tools/main.cpp
index 58459e4..94f9d72 100755
--- a/tools/main.cpp
+++ b/tools/main.cpp
@@ -70,6 +70,19 @@ int main(int argc, char* argv[])
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QApplication a(argc, argv);
+
+ // Load ts files
+ const QString locale = QLocale::system().name();
+ QTranslator translator;
+ qDebug() << "local: " << locale;
+ qDebug() << "path: " << QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager");
+ if (translator.load(locale, QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager"))) {
+ a.installTranslator(&translator);
+ } else {
+ qDebug() << "Load translations file failed!";
+ }
+
+
UkuiPower powermanager(&a);
bool flag = true;
@@ -120,15 +133,15 @@ int main(int argc, char* argv[])
gs->set("win-key-release",true);
// Load ts files
- const QString locale = QLocale::system().name();
- QTranslator translator;
- qDebug() << "local: " << locale;
- qDebug() << "path: " << QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager");
- if (translator.load(locale, QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager"))) {
- a.installTranslator(&translator);
- } else {
- qDebug() << "Load translations file failed!";
- }
+// const QString locale = QLocale::system().name();
+// QTranslator translator;
+// qDebug() << "local: " << locale;
+// qDebug() << "path: " << QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager");
+// if (translator.load(locale, QStringLiteral(UKUI_TRANSLATIONS_DIR) + QStringLiteral("/ukui-session-manager"))) {
+// a.installTranslator(&translator);
+// } else {
+// qDebug() << "Load translations file failed!";
+// }
MainWindow *w = new MainWindow();
--
2.30.0

37
0004-add-startlogout-signal.patch
View File

@ -1,37 +0,0 @@
From f4e2ebc5a54ba84014d4e7820d57b5c7a59a786d Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 11 Nov 2021 15:50:16 +0800
Subject: [PATCH] add startlogout signal
---
ukui-session/sessiondbusadaptor.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ukui-session/sessiondbusadaptor.h b/ukui-session/sessiondbusadaptor.h
index 4da2b55..e75953c 100755
--- a/ukui-session/sessiondbusadaptor.h
+++ b/ukui-session/sessiondbusadaptor.h
@@ -41,6 +41,7 @@ public:
Q_SIGNALS:
void moduleStateChanged(QString moduleName, bool state);
+ void StartLogout();
public slots:
bool canLogout()
@@ -114,6 +115,12 @@ public slots:
mManager->stopProcess(name);
}
+ Q_NOREPLY void emitStartLogout(){
+ qDebug()<<"emit StartLogout";
+ emit StartLogout();
+ }
+
+
private:
ModuleManager *mManager;
UkuiPower *mPower;
--
2.30.0

28
0005-update-debian-changelog.patch
View File

@ -1,28 +0,0 @@
From e9c78c11e5f7b9fc7c851e3c63aae0cf1f609dc4 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 2 Dec 2021 11:11:23 +0800
Subject: [PATCH] update changelog
---
debian/changelog | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0801f8e..ae46305 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ukui-session-manager (2.0.6-5) v101; urgency=medium
+
+ * Bug 号：无
+ * 任务号：25371
+ * 其他改动说明：无
+
+ -- liuliang <liuliang@kylinos.cn> Thu, 22 Apr 2021 14:56:27 +0800
+
ukui-session-manager (3.0.1-1+1026) focal; urgency=medium
* Daily build.
--
2.30.0

28
0006-ukui-session-session-application.patch
View File

@ -1,28 +0,0 @@
From 5d42662e88b950b69ca49f0ad79e813b8b0ecd23 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Tue, 7 Dec 2021 15:34:59 +0800
Subject: [PATCH] ukui-session/sessionapplication.cpp
---
ukui-session/sessionapplication.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ukui-session/sessionapplication.cpp b/ukui-session/sessionapplication.cpp
index 5f6243c..1688c40 100755
--- a/ukui-session/sessionapplication.cpp
+++ b/ukui-session/sessionapplication.cpp
@@ -56,6 +56,11 @@ void SessionApplication::InitialEnvironment()
gs->set("canhibernate",false);
}
+ //在打开关机管理界面后通过物理按键的方式关机/重启
+ //将导致win-key-release键值为true
+ //造成大部分热键和组合键失效
+ //所以在登录进来时恢复默认值
+ //gs->reset("win-key-release");
//检查qt主题是否安装
const QByteArray qt_style(QT5_UKUI_STYLE);
QByteArray QT_QPA_PLATFORMTHEME;
--
2.30.0

34
0007-update-frash-style.patch
View File

@ -1,34 +0,0 @@
From 03f0d03796be3dab05193dd7535b4097784e3bef Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Thu, 4 Aug 2022 12:20:41 +0800
Subject: [PATCH] update frash style
---
tools/mainwindow.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/mainwindow.cpp b/tools/mainwindow.cpp
index 1010b4a..06f0207 100755
--- a/tools/mainwindow.cpp
+++ b/tools/mainwindow.cpp
@@ -29,6 +29,8 @@
#include <QCloseEvent>
#include <QMouseEvent>
#include <QX11Info>
+#include <QMessageBox>
+#include <QPushButton>
#include <X11/extensions/XTest.h>
#include <unistd.h>
#include <sys/types.h>
@@ -318,7 +320,7 @@ void MainWindow::doevent(QString test, int i){
} else {
qDebug()<<"failure to close Grab";
}
- this->hide();
+ //this->hide();
if(i == 3){
doLockscreen();
}
--
2.33.0

41
0008-add-control-dependency.patch
View File

@ -1,41 +0,0 @@
From 8ed40820dcbb48f9d78867f907ed6007858e2a26 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Mon, 8 Aug 2022 10:15:19 +0800
Subject: [PATCH] add control dependency
---
debian/control | 5 +++++
debian/rules | 1 +
2 files changed, 6 insertions(+)
diff --git a/debian/control b/debian/control
index fafc983..c8342cb 100755
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,11 @@ Build-Depends: debhelper-compat (= 12),
libgsettings-qt-dev,
libqt5x11extras5-dev,
libxtst-dev,
+ libkf5coreaddons-dev,
+ libkf5config-dev,
+ libkf5windowsystem-dev,
+ libsm-dev,
+ libglib2.0-dev,
qttools5-dev-tools,
pkg-config,
Rules-Requires-Root: no
diff --git a/debian/rules b/debian/rules
index 31c22ec..f3201ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
export LC_ALL=C.UTF-8
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_HARDENING_FORTY=2 -O2
ifeq ($(DEB_HOST_ARCH_OS),linux)
CMAKE_ARGS += -DWITH_LIBUDEV=ON
--
2.33.0

BIN
ukui-session-manager-3.0.2.tar.gz
View File

Binary file not shown.

BIN
ukui-session-manager-3.1.0.tar.gz Normal file
View File

Binary file not shown.

72
ukui-session-manager.spec
View File

@ -1,35 +1,46 @@
%define debug_package %{nil}
Name: ukui-session-manager
Version: 3.0.2
Release: 11
Version: 3.1.0
Release: 1
Summary: Session manager of the UKUI desktop environment
License: GPL-2.0-or-later and GPL-3.0-or-later and LGPL-2.0-or-later
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
BuildRequires: cmake,libXtst-devel,libX11-devel,xdg-user-dirs,kf5-kidletime-devel,qt5-qtx11extras-devel,qt5-qtbase-devel,systemd-devel,qt5-qttools-devel,qt5-qtmultimedia-devel,gsettings-qt-devel,pkgconf
Requires: ukui-themes
Requires: glib2
Requires: qt5-qtmultimedia
Recommends: peony
Recommends: ukwm
Recommends: ukui-panel
Recommends: ukui-polkit
Recommends: ukui-screensaver
Recommends: ukui-settings-daemon
BuildRequires: cmake
BuildRequires: libX11-devel
BuildRequires: xdg-user-dirs
BuildRequires: kf5-kidletime-devel
BuildRequires: kf5-kcoreaddons-devel
BuildRequires: kf5-kconfig-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: gsettings-qt-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: libXtst-devel
BuildRequires: pkgconf
BuildRequires: ukui-interface
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: libSM-devel
BuildRequires: glib2-devel
Provides: x-session-manager
patch0: 0001-fix-poweroff.patch
patch1: 0002-reset-changelog-and-format.patch
patch2: 0003-adjust-the-sequence-to-make-translation-file-loaded-first.patch
patch3: 0004-add-startlogout-signal.patch
patch4: 0005-update-debian-changelog.patch
patch5: 0006-ukui-session-session-application.patch
patch6: 0007-update-frash-style.patch
patch7: 0008-add-control-dependency.patch
Requires: ukui-themes
Requires: glib2
Requires: qt5-qtmultimedia
Recommends: peony
Recommends: ukui-kwin
Recommends: ukui-panel
Recommends: ukui-polkit
Recommends: ukui-screensaver
Recommends: ukui-settings-daemon
Provides: x-session-manager
%description
This package contains a session that can be started from a display
@ -39,14 +50,6 @@ patch7: 0008-add-control-dependency.patch
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
mkdir cmake-build
@ -59,8 +62,7 @@ popd
pushd cmake-build
%make_install INSTALL_ROOT=%{buildroot}
popd
#mkdir -p %{buildroot}/etc/X11/Xsession.d/ %{buildroot}/usr/share/man/man1/
#install -m644 debian/99ukui-environment %{buildroot}/etc/X11/Xsession.d/99ukui-environment
install -d %{buildroot}/usr/share/man/man1/ %{buildroot}/etc/polkit-1/localauthority/50-local.d/
install -m644 data/com.ubuntu.enable-hibernate.pkla %{buildroot}/etc/polkit-1/localauthority/50-local.d/com.ubuntu.enable-hibernate.pkla
gzip -c man/ukui-session.1 > %{buildroot}/usr/share/man/man1/ukui-session.1.gz
@ -71,15 +73,17 @@ rm -rf $RPM_BUILD_ROOT
%files
%doc debian/changelog debian/copyright
#%%{_sysconfdir}/X11/Xsession.d/99ukui-environment
%{_sysconfdir}/polkit-1/localauthority/50-local.d/com.ubuntu.enable-hibernate.pkla
%{_datadir}/*
%{_prefix}/bin/ukui-session
%{_prefix}/bin/ukui-session-tools
#%%{_datadir}/man/man1/ukui-session.1.gz
#%%{_datadir}/man/man1/ukui-session-tools.1.gz
%{_datadir}/man/man1/ukui-session.1.gz
%{_datadir}/man/man1/ukui-session-tools.1.gz
%changelog
* Tue Dec 6 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.0-1
- update version to 3.1.0
* Mon Aug 08 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.2-11
- add control dependency and rules