diff --git a/0001-fix-coredump-of-ukui-power-manager.patch b/0001-fix-coredump-of-ukui-power-manager.patch deleted file mode 100644 index ea58fac99acdf3ccffce83fd25aef736580af398..0000000000000000000000000000000000000000 --- a/0001-fix-coredump-of-ukui-power-manager.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 2e9aa0e924c803a1ac3a1080e52bed8cae8095d3 Mon Sep 17 00:00:00 2001 -From: peijiankang -Date: Sun, 11 Jun 2023 15:59:52 +0800 -Subject: [PATCH] fix coredump of ukui-power-manager - ---- - ukui-power-manager-tray/powertray.cpp | 20 +++++++++--- - ukui-power-manager-tray/powerwindow.cpp | 43 ++++++++++++------------- - ukui-power-manager-tray/powerwindow.h | 4 +-- - 3 files changed, 39 insertions(+), 28 deletions(-) - -diff --git a/ukui-power-manager-tray/powertray.cpp b/ukui-power-manager-tray/powertray.cpp -index 6a36c06..75f986e 100644 ---- a/ukui-power-manager-tray/powertray.cpp -+++ b/ukui-power-manager-tray/powertray.cpp -@@ -147,8 +147,20 @@ void PowerTray::set_preference_func() - - PowerTray::~PowerTray() - { -- delete powerWindow; -- delete menu; -- delete trayIcon; -- delete iface; -+ if (nullptr != powerWindow) { -+ delete powerWindow; -+ powerWindow = nullptr; -+ } -+ if (nullptr != menu) { -+ delete menu; -+ menu = nullptr; -+ } -+ if (nullptr != trayIcon) { -+ delete trayIcon; -+ trayIcon = nullptr; -+ } -+ if (nullptr != iface) { -+ delete iface; -+ iface = nullptr; -+ } - } -diff --git a/ukui-power-manager-tray/powerwindow.cpp b/ukui-power-manager-tray/powerwindow.cpp -index 0b732b2..cf68795 100755 ---- a/ukui-power-manager-tray/powerwindow.cpp -+++ b/ukui-power-manager-tray/powerwindow.cpp -@@ -67,7 +67,7 @@ powerwindow::powerwindow(QWidget *parent) : QWidget(parent) - setWindowProperty(); //设置窗口属性 - initUI(); //初始化UI - initgsetting(); -- set_window_position(); //设置出现在屏幕的位置以及大小 -+ //set_window_position(); //设置出现在屏幕的位置以及大小 - watchTranspartency(); - - //监听屏幕改变的信号 -@@ -82,16 +82,15 @@ powerwindow::powerwindow(QWidget *parent) : QWidget(parent) - - powerwindow::~powerwindow() - { -- delete m_pmainlayout; -- delete m_firstlayout; -- delete lastlayout; -- delete m_firstwidget; -- delete iconButton; -- delete percentageLabel; -- delete powerStateLabel; -- delete powerTimeToEmpty; -- delete settingLabel; -- delete transparency_gsettings; -+ if (nullptr != transparency_gsettings) { -+ delete transparency_gsettings; -+ transparency_gsettings = nullptr; -+ } -+ if (nullptr != percentageLabel) { -+ delete percentageLabel; -+ percentageLabel = nullptr; -+ } -+ - } - - void powerwindow::setWindowProperty() -@@ -115,27 +114,27 @@ void powerwindow::initUI() - hints.decorations = MWM_DECOR_BORDER; - XAtomHelper::getInstance()->setWindowMotifHint(this->winId(), hints); - -- m_pmainlayout = new QVBoxLayout(); -+ m_pmainlayout = new QVBoxLayout(this); - m_firstlayout = new QHBoxLayout(this); - m_firstlayout->setContentsMargins(0, 0, 0, 0); -- m_toplayout = new QHBoxLayout(); -- lastlayout = new QHBoxLayout(); -- m_statelayout = new QHBoxLayout(); -+ m_toplayout = new QHBoxLayout(this); -+ lastlayout = new QHBoxLayout(this); -+ m_statelayout = new QHBoxLayout(this); - -- m_firstwidget = new QWidget(); -- m_topwidget = new QWidget(); -- lastWidget = new QWidget(); -- m_statewidget = new QWidget(); -+ m_firstwidget = new QWidget(this); -+ m_topwidget = new QWidget(this); -+ lastWidget = new QWidget(this); -+ m_statewidget = new QWidget(this); - -- iconButton = new BatteryIcon(); -+ iconButton = new BatteryIcon(this); - - percentageLabel = new PercentageLabel(); - -- powerStateLabel = new QLabel(); -+ powerStateLabel = new QLabel(this); - powerStateLabel->setText(tr("Charging")); - powerStateLabel->setVisible(false); - -- powerTimeToEmpty = new QLabel(); -+ powerTimeToEmpty = new QLabel(this); - powerTimeToEmpty->setVisible(true); - - m_segmentationLine_1 = new Divider(this); -diff --git a/ukui-power-manager-tray/powerwindow.h b/ukui-power-manager-tray/powerwindow.h -index fffe943..84536ab 100755 ---- a/ukui-power-manager-tray/powerwindow.h -+++ b/ukui-power-manager-tray/powerwindow.h -@@ -92,7 +92,7 @@ public: - QWidget *m_statewidget; - - BatteryIcon *iconButton; -- PercentageLabel *percentageLabel; -+ PercentageLabel *percentageLabel = nullptr; - QLabel *powerStateLabel; - QLabel *powerTimeToEmpty; - QLabel *toplabel; -@@ -123,7 +123,7 @@ private : - int m_sysFontSize; - int m_batteryState; - double transparency; -- QGSettings *transparency_gsettings; -+ QGSettings *transparency_gsettings = nullptr; - QDBusInterface *m_notifyInterface; - QGSettings *m_PowerManagerGsettings; - enum powerPolicy --- -2.33.0 - diff --git a/0001-fix-translate_generation.sh.patch b/0001-fix-translate_generation.sh.patch new file mode 100644 index 0000000000000000000000000000000000000000..3d62a3f2c8feacbabf9599e8547d6a412f4b2ce9 --- /dev/null +++ b/0001-fix-translate_generation.sh.patch @@ -0,0 +1,24 @@ +From a46ca5fa4b487026c8e8ec581d916b054a9227e0 Mon Sep 17 00:00:00 2001 +From: huayadong +Date: Sun, 7 Apr 2024 23:45:32 +0800 +Subject: [PATCH] fix translate_generation.sh + +--- + plugin-power/translate_generation.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugin-power/translate_generation.sh b/plugin-power/translate_generation.sh +index 72f748b..6ab2acc 100755 +--- a/plugin-power/translate_generation.sh ++++ b/plugin-power/translate_generation.sh +@@ -10,6 +10,6 @@ do + if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then + lrelease-qt5 "${ts}" + else +- lrelease "${ts}" ++ lrelease-qt5 "${ts}" + fi + done +-- +2.33.0 + diff --git a/ukui-power-manager-3.1.2-disable-computer-sleep.patch b/ukui-power-manager-3.1.2-disable-computer-sleep.patch deleted file mode 100644 index 54bcc39a459b47cc67bb846e85a8e66030d055d1..0000000000000000000000000000000000000000 --- a/ukui-power-manager-3.1.2-disable-computer-sleep.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -Naur ukui-power-manager-3.1.2/data/org.ukui.power-manager.gschema.xml.in ukui-power-manager-3.1.2~/data/org.ukui.power-manager.gschema.xml.in ---- ukui-power-manager-3.1.2/data/org.ukui.power-manager.gschema.xml.in 2023-06-16 18:48:09.947724070 +0800 -+++ ukui-power-manager-3.1.2~/data/org.ukui.power-manager.gschema.xml.in 2023-06-16 19:27:01.352618650 +0800 -@@ -304,7 +304,7 @@ - The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true. - - -- 900 -+ 0 - Sleep timeout computer when on battery - The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. - -@@ -319,17 +319,17 @@ - The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep. - - -- 600 -+ 0 - Sleep timeout display when on AC - The amount of time in seconds before the display goes to sleep when the computer is on AC power. - - -- 600 -+ 0 - Sleep timeout display when on battery - The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep. - - -- 600 -+ 0 - Sleep timeout display when on UPS - The amount of time in seconds the computer on UPS power needs to be inactive before the display goes to sleep. - -diff -Naur ukui-power-manager-3.1.2/ukui-upower/resources/org.ukui.power-manager.gschema.xml ukui-power-manager-3.1.2~/ukui-upower/resources/org.ukui.power-manager.gschema.xml ---- ukui-power-manager-3.1.2/ukui-upower/resources/org.ukui.power-manager.gschema.xml 2022-02-22 11:24:54.000000000 +0800 -+++ ukui-power-manager-3.1.2~/ukui-upower/resources/org.ukui.power-manager.gschema.xml 2023-06-16 19:26:53.891582522 +0800 -@@ -304,12 +304,12 @@ - The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true. - - -- 900 -+ 0 - Sleep timeout computer when on battery - The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. - - -- 900 -+ 0 - Sleep timeout computer when on AC - The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. - -@@ -319,17 +319,17 @@ - The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep. - - -- 600 -+ 0 - Sleep timeout display when on AC - The amount of time in seconds before the display goes to sleep when the computer is on AC power. - - -- 600 -+ 0 - Sleep timeout display when on battery - The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep. - - -- 600 -+ 0 - Sleep timeout display when on UPS - The amount of time in seconds the computer on UPS power needs to be inactive before the display goes to sleep. - diff --git a/ukui-power-manager-3.1.2-fix-default-power-setting.patch b/ukui-power-manager-3.1.2-fix-default-power-setting.patch deleted file mode 100644 index 09e50700e721141f1ee99e1c468e9cc04b2da93d..0000000000000000000000000000000000000000 --- a/ukui-power-manager-3.1.2-fix-default-power-setting.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ukui-power-manager-3.1.2/data/org.ukui.power-manager.gschema.xml.in ukui-power-manager-3.1.2~/data/org.ukui.power-manager.gschema.xml.in ---- ukui-power-manager-3.1.2/data/org.ukui.power-manager.gschema.xml.in 2021-11-10 15:28:04.000000000 +0800 -+++ ukui-power-manager-3.1.2~/data/org.ukui.power-manager.gschema.xml.in 2023-02-28 11:05:26.150101153 +0800 -@@ -309,7 +309,7 @@ - The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. - - -- 900 -+ 0 - Sleep timeout computer when on AC - The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. - diff --git a/ukui-power-manager-3.1.2.tar.gz b/ukui-power-manager-3.1.2.tar.gz deleted file mode 100644 index 34409c9046cbd1a801e565a2a917bd23f6708a22..0000000000000000000000000000000000000000 Binary files a/ukui-power-manager-3.1.2.tar.gz and /dev/null differ diff --git a/ukui-power-manager-4.0.0.0.tar.gz b/ukui-power-manager-4.0.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..515ec9c8ad223d070b45574ddd3af0a3f80e8389 Binary files /dev/null and b/ukui-power-manager-4.0.0.0.tar.gz differ diff --git a/ukui-power-manager.spec b/ukui-power-manager.spec index 8209f21bdf3ba6741ad514e1047a31bb65cc2697..8bffb1de1dd1c2a6dc8f15854aad5a13840a50cc 100644 --- a/ukui-power-manager.spec +++ b/ukui-power-manager.spec @@ -1,15 +1,34 @@ Name: ukui-power-manager -Version: 3.1.2 -Release: 6 +Version: 4.0.0.0 +Release: 1 Summary: power management tool for the UKUI desktop License: GPL-3+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz -Patch01: ukui-power-manager-3.1.2-fix-default-power-setting.patch -Patch02: 0001-fix-coredump-of-ukui-power-manager.patch -Patch03: ukui-power-manager-3.1.2-disable-computer-sleep.patch -BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, ukui-interface, glib2-devel, upower-devel, libX11-devel, libXext-devel, perl-XML-Parser, libXrandr-devel, pkg-config, gsettings-qt-devel, kf5-kwindowsystem-devel, qt5-qtx11extras-devel libkysdk-qtwidgets-devel chrpath + +Patch01: 0001-fix-translate_generation.sh.patch + +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: ukui-interface +BuildRequires: glib2-devel +BuildRequires: upower-devel +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: perl-XML-Parser +BuildRequires: libXrandr-devel +BuildRequires: pkg-config +BuildRequires: gsettings-qt-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: libkysdk-qtwidgets-devel +BuildRequires: libkysdk-sysinfo-devel +BuildRequires: libkysdk-diagnostics-devel +BuildRequires: libukcc-devel +BuildRequires: libkysdk-waylandhelper-devel +BuildRequires: pciutils-devel +BuildRequires: chrpath Requires: dbus-x11,systemd,upower @@ -60,11 +79,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: %{_sysconfdir}/dbus-1/system.d/org.ukui.powermanagement.conf %{_sysconfdir}/xdg/autostart/ukui-power-manager-tray.desktop %{_sysconfdir}/xdg/autostart/ukui-powermanagement-daemon.desktop -%{_sysconfdir}/xdg/autostart/ukui-upower.desktop %{_bindir}/ukui-power-manager-tray %{_bindir}/ukui-powermanagement %{_bindir}/ukui-powermanagement-service -%{_bindir}/ukui-upower %{_prefix}/lib/udev/rules.d/99-upower-wake-up-usb-device.rules %{_datadir}/X11/xorg.conf.d/10-monitor.conf %{_datadir}/dbus-1/system-services/org.ukui.powermanagement.service @@ -72,8 +89,15 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: %{_datadir}/ukui-power-manager/tray/translations/*.qm %{_datadir}/ukui-power-manager/daemon/translations/*.qm %{_datadir}/man/* +%{_sysconfdir}/ukui/ukui-power-manager/upm-global.conf +%{_libdir}/ukui-control-center/libpower.so +%{_datadir}/ukui-power-manager/power-plugin/translations/* + %changelog +* Mon Apr 08 2024 huayadong - 4.0.0.0-1 +- update version to 4.0.0.0 + * Sat Jun 17 2023 douyan - 3.1.2-6 - Type: bugfix - ID : NA