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

remove no longer use & update src pkg and remove patches

Browse Source 
Signed-off-by: wangyucheng <wangyucheng@kylinsec.com.cn>
This commit is contained in:
wangyucheng 2023-04-17 17:40:38 +08:00
parent 6579759c29
commit 498da1a00a
6 changed files with 5 additions and 2456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
0001-feature-wayland-Support-wayland-session-by-launching.patch
View File

@ -1,124 +0,0 @@
From 199320d7beec9ea0b80c3e7f331f3d269d68f493 Mon Sep 17 00:00:00 2001
From: tangjie02 <tangjie02@kylinsec.com.cn>
Date: Tue, 7 Feb 2023 20:23:51 +0800
Subject: [PATCH] feature(wayland): Support wayland session by launching kwin
as wayland server.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 使用kwin来支持wayland会话
Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
---
data/CMakeLists.txt | 32 +++++++++++++++--------------
data/kiran-session-kwayland.in | 9 ++++++++
data/kiran-session-wayland.in | 3 +++
data/kiran-wayland.desktop.in | 4 ++--
data/sessions/kiran-wayland.session | 2 +-
5 files changed, 32 insertions(+), 18 deletions(-)
create mode 100644 data/kiran-session-kwayland.in
create mode 100644 data/kiran-session-wayland.in
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8df02d5..83aed59 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,27 +1,29 @@
cmake_minimum_required(VERSION 3.2)
-# gschema.xml
-file(GLOB SCHEMA_IN_FILES ./*.gschema.xml.in)
-
-foreach(SCHEMA_IN_FILE IN LISTS SCHEMA_IN_FILES)
- string(REGEX REPLACE ".+/(.+)\\..*" "\\1" SCHEMA_FILE ${SCHEMA_IN_FILE})
- configure_file(${SCHEMA_IN_FILE} ${PROJECT_BINARY_DIR}/data/${SCHEMA_FILE})
+# xxx.in -> xxx
+file(GLOB XXX_IN_FILES ./*.in)
- install(FILES ${PROJECT_BINARY_DIR}/data/${SCHEMA_FILE}
- DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas/)
+foreach(XXX_IN_FILE IN LISTS XXX_IN_FILES)
+ string(REGEX REPLACE ".+/(.+)\\..*" "\\1" XXX_FILE ${XXX_IN_FILE})
+ configure_file(${XXX_IN_FILE} ${PROJECT_BINARY_DIR}/data/${XXX_FILE} @ONLY)
endforeach()
+# wayland executable file
+install(PROGRAMS ${PROJECT_BINARY_DIR}/data/kiran-session-wayland
+ ${PROJECT_BINARY_DIR}/data/kiran-session-kwayland
+ DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}/)
+
+# gschema.xml
+install(
+ FILES
+ ${PROJECT_BINARY_DIR}/data/com.kylinsec.kiran.session-manager.gschema.xml
+ DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas/)
+
# conf
install(FILES ${PROJECT_SOURCE_DIR}/data/90-lightdm-kiran-greeter.conf
DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/lightdm/lightdm.conf.d)
-# desktop.in
-file(GLOB DESKTOP_IN_FILES ./*.desktop.in)
-foreach(DESKTOP_IN_FILE IN LISTS DESKTOP_IN_FILES)
- string(REGEX REPLACE ".+/(.+)\\..*" "\\1" DESKTOP_FILE ${DESKTOP_IN_FILE})
- configure_file(${DESKTOP_IN_FILE} ${PROJECT_BINARY_DIR}/data/${DESKTOP_FILE})
-endforeach()
-
+# desktop
install(FILES ${PROJECT_BINARY_DIR}/data/kiran.desktop
DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/xsessions)
install(FILES ${PROJECT_BINARY_DIR}/data/kiran-wayland.desktop
diff --git a/data/kiran-session-kwayland.in b/data/kiran-session-kwayland.in
new file mode 100644
index 0000000..91c2cf8
--- /dev/null
+++ b/data/kiran-session-kwayland.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+drs=
+
+if [ -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
+ drs=dbus-run-session
+fi
+
+exec ${drs} kwin_wayland --xwayland --drm --no-lockscreen --exit-with-session=@CMAKE_INSTALL_FULL_BINDIR@/kiran-session-wayland
\ No newline at end of file
diff --git a/data/kiran-session-wayland.in b/data/kiran-session-wayland.in
new file mode 100644
index 0000000..4bd1de9
--- /dev/null
+++ b/data/kiran-session-wayland.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @CMAKE_INSTALL_FULL_BINDIR@/kiran-session-manager --session-type=kiran-wayland
\ No newline at end of file
diff --git a/data/kiran-wayland.desktop.in b/data/kiran-wayland.desktop.in
index d98cd10..34c4781 100644
--- a/data/kiran-wayland.desktop.in
+++ b/data/kiran-wayland.desktop.in
@@ -2,8 +2,8 @@
Name=KIRAN
Comment=This session logs you into KIRAN
Comment[zh_CN]=此会话将您登录到 KIRAN
-Exec=@CMAKE_INSTALL_FULL_BINDIR@/kiran-session-manager --session-type=kiran-wayland
-TryExec=@CMAKE_INSTALL_FULL_BINDIR@/kiran-session-manager
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/kiran-session-kwayland
+TryExec=@CMAKE_INSTALL_FULL_BINDIR@/kiran-session-kwayland
Type=Application
DesktopNames=KIRAN
Keywords=KIRAN;session;
diff --git a/data/sessions/kiran-wayland.session b/data/sessions/kiran-wayland.session
index 5292a1f..65bc4a6 100644
--- a/data/sessions/kiran-wayland.session
+++ b/data/sessions/kiran-wayland.session
@@ -1,3 +1,3 @@
[Kiran Session]
Name=Kiran Session
-RequiredComponents=kiran-session-idlemonitor;kiran-session-daemon;mate-settings-daemon;mutter;kiran-panel;caja
+RequiredComponents=kiran-session-idlemonitor;kiran-session-daemon;mate-settings-daemon;kiran-panel;caja
--
2.36.1

2180
0002-fix-translate-add-some-translation.patch
View File

File diff suppressed because it is too large Load Diff

141
0003-feature-dbus-Generate-adapter-and-interface-classes-the-qt5DBus.patch
View File

@ -1,141 +0,0 @@
From 84128419ca0aef23c2b76c515b69ce47bcb3bc11 Mon Sep 17 00:00:00 2001
From: huangjiawen <huangjiawen@kylinsec.com.cn>
Date: Tue, 11 Apr 2023 11:36:59 +0800
Subject: [PATCH] feature(dbus): Generate adapter and interface classes using
the qt5 D-Bus interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 使用qt5 D-Bus接口生成适配器类和接口类
Signed-off-by: huangjiawen <huangjiawen@kylinsec.com.cn>
---
src/core/CMakeLists.txt | 10 +++++-----
src/core/app/app.cpp | 1 +
src/core/client/client-xsmp.h | 1 +
src/core/main.cpp | 1 +
src/idle/CMakeLists.txt | 2 +-
src/ui/CMakeLists.txt | 4 ++--
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index bf53180..249e281 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -3,12 +3,12 @@ cmake_minimum_required(VERSION 3.0)
file(GLOB_RECURSE SRC_H_FILES ./*.h)
file(GLOB_RECURSE SRC_CPP_FILES ./*.cpp)
-qt_add_dbus_adaptor(
+qt5_add_dbus_adaptor(
SESSION_MANAGER_SRCS ${CMAKE_SOURCE_DIR}/data/org.gnome.SessionManager.xml
${CMAKE_SOURCE_DIR}/src/core/session-manager.h Kiran::SessionManager
session_manager_adaptor SessionManagerAdaptor)
-qt_add_dbus_adaptor(
+qt5_add_dbus_adaptor(
CLIENT_PRIVATE_SRCS
${CMAKE_SOURCE_DIR}/data/org.gnome.SessionManager.ClientPrivate.xml
${CMAKE_SOURCE_DIR}/src/core/client/client-dbus.h
@@ -16,7 +16,7 @@ qt_add_dbus_adaptor(
client_dbus_adaptor
ClientDBusAdaptor)
-qt_add_dbus_adaptor(
+qt5_add_dbus_adaptor(
PRESENCE_SRCS ${CMAKE_SOURCE_DIR}/data/org.gnome.SessionManager.Presence.xml
${CMAKE_SOURCE_DIR}/src/core/presence.h Kiran::Presence presence_adaptor
PresenceAdaptor)
@@ -25,7 +25,7 @@ set_source_files_properties(
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SessionManager.IdleMonitor.xml
PROPERTIES CLASSNAME IdleMonitorProxy NO_NAMESPACE true)
-qt_add_dbus_interface(
+qt5_add_dbus_interface(
IDLE_MONITOR_SRCS
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SessionManager.IdleMonitor.xml
idle_monitor_proxy)
@@ -33,7 +33,7 @@ qt_add_dbus_interface(
set(TARGET_NAME kiran-session-manager)
file(GLOB TS_FILES "${PROJECT_SOURCE_DIR}/translations/${TARGET_NAME}.*.ts")
-qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
add_executable(
${TARGET_NAME}
diff --git a/src/core/app/app.cpp b/src/core/app/app.cpp
index 4e1a101..0fc995b 100644
--- a/src/core/app/app.cpp
+++ b/src/core/app/app.cpp
@@ -18,6 +18,7 @@
#include <KService>
#include <QFileInfo>
#include <QProcess>
+#include <QUrl>
#include "lib/base/base.h"
#include "src/core/app/app-manager.h"
diff --git a/src/core/client/client-xsmp.h b/src/core/client/client-xsmp.h
index 2f5e6be..dbdc38e 100644
--- a/src/core/client/client-xsmp.h
+++ b/src/core/client/client-xsmp.h
@@ -15,6 +15,7 @@
#pragma once
#include "src/core/client/client.h"
+#include <QVector>
struct _SmsConn;
typedef struct _SmsConn *SmsConn;
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 8244df7..7ce98db 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -20,6 +20,7 @@
#include <QTranslator>
#include <QtGlobal>
#include <iostream>
+#include <unistd.h>
#include "config.h"
#include "lib/base/base.h"
#include "src/core/app/app-manager.h"
diff --git a/src/idle/CMakeLists.txt b/src/idle/CMakeLists.txt
index 7245af8..a5c62ec 100644
--- a/src/idle/CMakeLists.txt
+++ b/src/idle/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
file(GLOB_RECURSE IDLE_H_FILES ./*.h)
file(GLOB_RECURSE IDLE_CPP_FILES ./*.cpp)
-qt_add_dbus_adaptor(
+qt5_add_dbus_adaptor(
IDLE_MONITOR_SRCS
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SessionManager.IdleMonitor.xml
${CMAKE_SOURCE_DIR}/src/idle/idle-monitor.h
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 574f3eb..adc7aed 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -8,7 +8,7 @@ set_source_files_properties(
${CMAKE_SOURCE_DIR}/data/org.gnome.SessionManager.xml
PROPERTIES CLASSNAME SessionManagerProxy NO_NAMESPACE true)
-qt_add_dbus_interface(
+qt5_add_dbus_interface(
SESSION_MANAGER_SRCS ${CMAKE_SOURCE_DIR}/data/org.gnome.SessionManager.xml
session_manager_interface)
@@ -18,7 +18,7 @@ qt5_wrap_ui(UI_FILES ${CMAKE_CURRENT_SOURCE_DIR}/exit-query-window.ui
${CMAKE_CURRENT_SOURCE_DIR}/inhibitor-row.ui)
file(GLOB TS_FILES "${PROJECT_SOURCE_DIR}/translations/${TARGET_NAME}.*.ts")
-qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
+qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
add_executable(
${TARGET_NAME}
--
2.33.0

BIN
kiran-session-manager-2.4.0.tar.gz
View File

Binary file not shown.

BIN
kiran-session-manager-2.4.1.tar.gz Normal file
View File

Binary file not shown.

16
kiran-session-manager.spec
View File

@ -1,14 +1,11 @@
Name: kiran-session-manager
Version: 2.4.0
Release: 4
Version: 2.4.1
Release: 1
Summary: Session manager for KIRAN desktop environment
License: MulanPSL-2.0
Source0: %{name}-%{version}.tar.gz
Patch1001: 0001-feature-wayland-Support-wayland-session-by-launching.patch
Patch1002: 0002-fix-translate-add-some-translation.patch
Patch1003: 0003-feature-dbus-Generate-adapter-and-interface-classes-the-qt5DBus.patch
BuildRequires: cmake >= 3.2
BuildRequires: pkgconfig(gio-unix-2.0)
@ -61,12 +58,6 @@ make %{?_smp_mflags}
%{_datadir}/kiran-session-manager/blacklist_autostart_apps.txt
%dir %{_datadir}/kiran-session-manager/sessions
%{_datadir}/kiran-session-manager/sessions/*
%{_datadir}/locale/zh_CN/LC_MESSAGES/kiran-session-manager.mo
%{_datadir}/locale/bo_CN/LC_MESSAGES/kiran-session-manager.mo
%{_datadir}/locale/kk_KG/LC_MESSAGES/kiran-session-manager.mo
%{_datadir}/locale/kk_KZ/LC_MESSAGES/kiran-session-manager.mo
%{_datadir}/locale/mn_MN/LC_MESSAGES/kiran-session-manager.mo
%{_datadir}/locale/ug_CN/LC_MESSAGES/kiran-session-manager.mo
%{_datadir}/kiran-session-manager/translations/kiran-session-manager.zh_CN.qm
%{_datadir}/kiran-session-manager/translations/kiran-session-manager.bo_CN.qm
%{_datadir}/kiran-session-manager/translations/kiran-session-manager.kk_KG.qm
@ -89,6 +80,9 @@ make %{?_smp_mflags}
%changelog
* Mon Apr 17 2023 wangyucheng <wangyucheng@kylinsec.om.cn> - 2.4.1-1
- KYOS-F: remove no longer use files & update src pkg and remove patches
* Mon Apr 10 2023 huangjiawen <huangjiawen@kylinsec.om.cn> - 2.4.0-4
- KYOS-F: Generate adapter and interface classes using the qt5 D-Bus interface.