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

Compare commits

base: packages:3b2ebbe75d63314fcaad797cb928d81c4e55c41d
Branches Tags
packages:main
..
compare: packages:6d9970d55d5a2ce5d37f54fbaaf4fd85780d2ff5
Branches Tags
packages:main

No commits in common. "3b2ebbe75d63314fcaad797cb928d81c4e55c41d" and "6d9970d55d5a2ce5d37f54fbaaf4fd85780d2ff5" have entirely different histories.
3b2ebbe75d ... 6d9970d55d

10 changed files with 45 additions and 323 deletions
Show Stats Expand all files Collapse all files

24
0001-modify-compile-error-of-ukui-settings-daemon.patch
View File

@ -1,24 +0,0 @@
From c7a8d75f452b33af86290c0c906c7cd00b5fcc61 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Mon, 31 Oct 2022 17:39:28 +0800
Subject: [PATCH] modify compile error of ukui-settings-daemon
---
translate_generation.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/translate_generation.sh b/translate_generation.sh
index d24c183..7fcb6b7 100755
--- a/translate_generation.sh
+++ b/translate_generation.sh
@@ -10,6 +10,6 @@ do
if [ "$version" == "fedora" ] || [ "$version" == "opensuse-tumbleweed" ] || [ "$version" == "opensuse-leap" ];then
lrelease-qt5 "${ts}"
else
- lrelease "${ts}"
+ lrelease-qt5 "${ts}"
fi
done
--
2.36.1

29
Fix-the-failure-of-shortcut-key-to-open-terminal.patch
View File

@ -1,29 +0,0 @@
From 02b63ef64da86153c93e96b59ab55c95b0167ffd Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Sun, 25 Jun 2023 15:57:27 +0900
Subject: [PATCH] Fix the failure of shortcut key to open terminal
---
plugins/media-keys/mediakey-manager.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/plugins/media-keys/mediakey-manager.cpp b/plugins/media-keys/mediakey-manager.cpp
index 99f66b6..deca341 100644
--- a/plugins/media-keys/mediakey-manager.cpp
+++ b/plugins/media-keys/mediakey-manager.cpp
@@ -2165,11 +2165,7 @@ void MediaKeysManager::doOnScreenKeyboardAction()
void MediaKeysManager::doOpenTerminalAction()
{
- if(UsdBaseClass::isTablet()) {
- executeCommand("mate-terminal","");
- } else {
- executeCommand("x-terminal-emulator","");
- }
+ executeCommand("mate-terminal","");
}
void MediaKeysManager::doScreenshotAction(const QString pramater)
--
2.33.0

43
fix-ukui-settings-daemon-SIGABRT.patch
View File

@ -1,43 +0,0 @@
From a5af2ea9613c8c0defc175911468ee185f2e188f Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Fri, 21 Jul 2023 15:45:25 +0800
Subject: [PATCH] fix ukui-settings-daemon SIGABRT
---
daemon/main.cpp | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/daemon/main.cpp b/daemon/main.cpp
index 1db2eb6..e56fc7c 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -107,23 +107,13 @@ int main (int argc, char* argv[])
USD_LOG(LOG_INFO, "manager start error!");
return 0;
}
-/*
QObject::connect(&app,&QCoreApplication::aboutToQuit,[&]{
- //PluginManager::getInstance()->managerStop();
- //managerStop()执行时间过长，导致注销时，所有插件未完全Daectivity就已经强行关闭系统，最终导致SIGSEGV、SIGABRT
+ manager->managerStop();//注销时释放资源
+ exit(0);
- app.processEvents();
- //QTimer timer;
- // Wait until the event loop starts
- QTimer::singleShot(500, [=](){
- //make sure program exit
- exit(0);
});
- qApp->quit();
- exit(0);
- });
-*/
+
USD_LOG(LOG_INFO, "ukui-settings-daemon started!");
return app.exec();
}
--
2.33.0

48
fix-ukui-settings-daemon-SIGSEGV.patch
View File

@ -1,48 +0,0 @@
From 13693e16771b266448e084cd9cdb3a4e62a38563 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Tue, 18 Jul 2023 09:23:41 +0800
Subject: [PATCH] fix ukui-settings-daemon about color
---
daemon/main.cpp | 4 ++--
plugins/color/color-manager.cpp | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/daemon/main.cpp b/daemon/main.cpp
index 64148a7..90adce1 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -106,7 +106,7 @@ int main (int argc, char* argv[])
USD_LOG(LOG_INFO, "manager start error!");
return 0;
}
-
+/*
QObject::connect(&app,&QCoreApplication::aboutToQuit,[&]{
//PluginManager::getInstance()->managerStop();
@@ -124,7 +124,7 @@ int main (int argc, char* argv[])
qApp->quit();
exit(0);
});
-
+*/
USD_LOG(LOG_INFO, "ukui-settings-daemon started!");
return app.exec();
}
diff --git a/plugins/color/color-manager.cpp b/plugins/color/color-manager.cpp
index 227cfbe..b877b76 100644
--- a/plugins/color/color-manager.cpp
+++ b/plugins/color/color-manager.cpp
@@ -84,6 +84,8 @@ ColorManager::ColorManager()
disabled_until_tmw = false;
datetime_override = NULL;
geoclue_enabled = true;
+ geoclue_client = nullptr;
+ geoclue_simple = nullptr;
smooth_enabled = true;
cached_sunrise = -1.f;
cached_sunset = -1.f;
--
2.33.0

40
session.patch
View File

@ -1,40 +0,0 @@
diff -Naur ukui-settings-daemon-3.1.2/daemon/main.cpp ukui-settings-daemon-3.1.2~/daemon/main.cpp
--- ukui-settings-daemon-3.1.2/daemon/main.cpp 2023-07-11 15:31:29.785135187 +0800
+++ ukui-settings-daemon-3.1.2~/daemon/main.cpp 2023-07-11 15:30:40.694366917 +0800
@@ -56,6 +56,14 @@
QApplication::exit(15);
}
+void handlerB(int no)
+{
+ USD_LOG(LOG_DEBUG,"catch SIGSEGV signal, with exitcode %d",no);
+
+// manager->managerStop();
+ QApplication::exit(15);
+}
+
int main (int argc, char* argv[])
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
@@ -74,6 +82,7 @@
signal(SIGTERM, &handler);
signal(SIGABRT, &handlerA);
+ signal(SIGSEGV, &handlerB);
QApplication::setQuitOnLastWindowClosed(false);
QTranslator translator;
@@ -108,10 +117,11 @@
//QTimer timer;
// Wait until the event loop starts
QTimer::singleShot(500, [=](){
-
+ //make sure program exit
exit(0);
});
-
+ qApp->quit();
+ exit(0);
});
USD_LOG(LOG_INFO, "ukui-settings-daemon started!");

BIN
ukui-settings-daemon-3.0.1.tar.gz Normal file
View File

Binary file not shown.

59
ukui-settings-daemon-3.1.2-kylin-fix-coredump.patch
View File

@ -1,59 +0,0 @@
diff -Naur ukui-settings-daemon-3.1.2/daemon/main.cpp ukui-settings-daemon-3.1.2~/daemon/main.cpp
--- ukui-settings-daemon-3.1.2/daemon/main.cpp 2022-04-15 11:36:50.000000000 +0800
+++ ukui-settings-daemon-3.1.2~/daemon/main.cpp 2023-07-06 17:50:20.704690501 +0800
@@ -31,7 +31,8 @@
#include <sys/types.h>
#include <signal.h>
-
+#include <syslog.h>
+#include <QTimer>
static void print_help ();
static void parse_args (int argc, char *argv[]);
static void stop_daemon ();
@@ -46,6 +47,15 @@
QApplication::exit(15);
}
+void handlerA(int no)
+{
+ USD_LOG(LOG_DEBUG,"catch SIGABRT signal, with exitcode %d",no);
+
+
+// manager->managerStop();
+ QApplication::exit(15);
+}
+
int main (int argc, char* argv[])
{
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
@@ -63,6 +73,7 @@
signal(SIGTERM, &handler);
+ signal(SIGABRT, &handlerA);
QApplication::setQuitOnLastWindowClosed(false);
QTranslator translator;
@@ -88,6 +99,21 @@
return 0;
}
+ QObject::connect(&app,&QCoreApplication::aboutToQuit,[&]{
+
+ //PluginManager::getInstance()->managerStop();
+ //managerStop()执行时间过长，导致注销时，所有插件未完全Daectivity就已经强行关闭系统，最终导致SIGSEGV、SIGABRT
+
+ app.processEvents();
+ //QTimer timer;
+ // Wait until the event loop starts
+ QTimer::singleShot(500, [=](){
+
+ exit(0);
+ });
+
+ });
+
USD_LOG(LOG_INFO, "ukui-settings-daemon started!");
return app.exec();
}

BIN
ukui-settings-daemon-3.1.2.tar.gz
View File

Binary file not shown.

121
ukui-settings-daemon.spec
View File

@ -1,56 +1,77 @@
%define debug_package %{nil}
Name: ukui-settings-daemon
Version: 3.1.2
Release: 8
Version: 3.0.1
Release: 4
Summary: daemon handling the UKUI session settings
License: GPL-2.0-or-later and GPL-3.0-or-later and LGPL-2.0-or-later
License: GPL-2.0, GPL-2+, GPL-2.1, LGPL-2.1+, GPL-3+, LGPL-2+, MIT~OldStyleWithDisclaimer+RedHat, MIT~OldStyle+RedHat
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch1: 0001-modify-compile-error-of-ukui-settings-daemon.patch
Patch2: Fix-the-failure-of-shortcut-key-to-open-terminal.patch
Patch4: ukui-settings-daemon-3.1.2-kylin-fix-coredump.patch
Patch5: session.patch
Patch6: fix-ukui-settings-daemon-SIGSEGV.patch
Patch7: fix-ukui-settings-daemon-SIGABRT.patch
BuildRequires: intltool
BuildRequires: libcanberra-devel
BuildRequires: dbus-glib-devel
BuildRequires: dconf-devel
BuildRequires: fontconfig-devel
BuildRequires: glib2-devel
BuildRequires: gtk3-devel
BuildRequires: libnotify-devel
BuildRequires: nss-devel
BuildRequires: polkit-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: startup-notification-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXi-devel
BuildRequires: libxklavier-devel
BuildRequires: libXrandr-devel
BuildRequires: libXt-devel
BuildRequires: mate-desktop-libs
BuildRequires: xorg-x11-server-utils
BuildRequires: libusb-devel
BuildRequires: mate-desktop-devel >= 1.18
BuildRequires: libmatekbd-devel >= 1.18
BuildRequires: libmatemixer-devel >= 1.18
BuildRequires: mate-common >= 1.18
#x11proto-kb-devel
BuildRequires: pkgconf-pkg-config
BuildRequires: intltool
BuildRequires: qt5-qtbase
BuildRequires: qtchooser
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qttools-devel
BuildRequires: gsettings-qt-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtsensors-devel
BuildRequires: kf5-kconfig-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: libxklavier-devel
BuildRequires: libXtst-devel
BuildRequires: mate-desktop-devel
BuildRequires: gnome-desktop3-devel
BuildRequires: libmatemixer-devel
BuildRequires: libmatekbd-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: libwnck3-devel
BuildRequires: libcanberra-devel
BuildRequires: libwayland-client
BuildRequires: libnotify-devel
BuildRequires: geoclue2-devel
BuildRequires: colord-devel
BuildRequires: lcms2-devel
BuildRequires: imlib2-devel
BuildRequires: xorg-x11-server-devel
BuildRequires: libgudev-devel
BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
BuildRequires: libX11-devel
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: libkscreen-qt5-devel
BuildRequires: libxkbcommon-devel
BuildRequires: kf5-kglobalaccel-devel
BuildRequires: qt5-qtx11extras-devel
#BuildRequires: ukui-common-devel
BuildRequires: colord
BuildRequires: glib2
BuildRequires: ukui-interface
BuildRequires: colord-gtk-devel
BuildRequires: gsettings-qt-devel
Requires: mate-desktop-libs ukui-polkit ukui-settings-daemon-common imwheel xorg-x11-drv-synaptics-legacy
Requires: mate-desktop-libs ukui-settings-daemon-common colord imwheel ukui-polkit xorg-x11-server-utils xorg-x11-drv-synaptics-legacy glib2-devel
%description
This package contains the daemon which is responsible for setting the
various parameters of a UKUI session and the applications that run
@ -69,6 +90,7 @@ Requires: mate-desktop-libs ukui-settings-daemon-common colord imwheel ukui-polk
%package common
Summary: daemon handling the UKUI session settings (common files)
Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-libs-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils mate-desktop-devel libmatekbd-devel libmatemixer-devel mate-common
%description common
This package contains the daemon which is responsible for setting the
@ -90,16 +112,10 @@ Summary: daemon handling the UKUI session settings (common files)
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
%{qmake_qt5}
%{make_build}
qmake-qt5
make -j24
%install
make INSTALL_ROOT=%{buildroot} install
@ -111,6 +127,7 @@ gzip -c %{_builddir}/%{name}-%{version}/man/ukui-settings-daemon.1 > %{bui
gzip -c %{_builddir}/%{name}-%{version}/man/usd-locate-pointer.1 > %{buildroot}/usr/share/man/man1/usd-locate-pointer.1.gz
%clean
rm -rf $RPM_BUILD_ROOT
@ -141,59 +158,11 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null || :
%changelog
* Fri Jul 21 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-8
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add Patch7:fix-ukui-settings-daemon-SIGABRT.patch
* Tue Jul 18 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add Patch6:fix-ukui-settings-daemon-SIGSEGV.patch
* Tue Jul 11 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-6
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add Patch5:session.patch
* Mon Jul 10 2023 huayadong <huayadong@kylinos.cn> - 3.1.2-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:add Patch4:ukui-settings-daemon-3.1.2-kylin-fix-coredump.patch
* Sun Jun 25 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: add Fix-the-failure-of-shortcut-key-to-open-terminal.patch
* Wed Jan 18 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-3
- add build debuginfo and debugsource
* Tue Dec 6 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-2
- modify install error
* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-1
- update version to 3.1.2
* Mon Aug 08 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-7
- update Copyright and Authors information
* Thu Aug 04 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-6
- remove depend xserver xorg input synaptics on s390x
* Tue May 24 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-5
- Improve the project according to the requirements of compliance improvement
* Tue Apr 19 2022 douyan <douyan@kylimos.cn> - 3.0.1-4
- fix first install post script issue
* Wed Apr 06 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.1-3
- add yaml file
* Tue Feb 22 2022 huayadong <huayadong@kylinos.cn> - 3.0.1-3
- update to upstream version 3.0.1-3
* Thu Dec 16 2021 peijiankang <peijiankang@kylinos.cn> - 3.0.1-2
- Modify the shortcut key prompt

4
ukui-settings-daemon.yaml
View File

@ -1,4 +0,0 @@
version_control: github
src_repo: UKUI/ukui-settings-daemon
tag_prefix: "^v"
separator: "."