!38 disable-computer-sleep

From: @hua_yadong 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang

0001-fix-coredump-of-ukui-power-manager.patch

@@ -0,0 +1,143 @@
+From 2e9aa0e924c803a1ac3a1080e52bed8cae8095d3 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+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
+

ukui-power-manager-3.1.2-disable-computer-sleep.patch

@@ -0,0 +1,72 @@
+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 @@
+       <description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true.</description>
+     </key>
+     <key name="sleep-computer-battery" type="i">
+-      <default>900</default>
++      <default>0</default>
+       <summary>Sleep timeout computer when on battery</summary>
+       <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep.</description>
+     </key>
+@@ -319,17 +319,17 @@
+       <description>The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep.</description>
+     </key>
+     <key name="sleep-display-ac" type="i">
+-      <default>600</default>
++      <default>0</default>
+       <summary>Sleep timeout display when on AC</summary>
+       <description>The amount of time in seconds before the display goes to sleep when the computer is on AC power.</description>
+     </key>
+     <key name="sleep-display-battery" type="i">
+-      <default>600</default>
++      <default>0</default>
+       <summary>Sleep timeout display when on battery</summary>
+       <description>The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep.</description>
+     </key>
+     <key name="sleep-display-ups" type="i">
+-      <default>600</default>
++      <default>0</default>
+       <summary>Sleep timeout display when on UPS</summary>
+       <description>The amount of time in seconds the computer on UPS power needs to be inactive before the display goes to sleep.</description>
+     </key>
+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 @@
+       <description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true.</description>
+     </key>
+     <key name="sleep-computer-battery" type="i">
+-      <default>900</default>
++      <default>0</default>
+       <summary>Sleep timeout computer when on battery</summary>
+       <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep.</description>
+     </key>
+     <key name="sleep-computer-ac" type="i">
+-      <default>900</default>
++      <default>0</default>
+       <summary>Sleep timeout computer when on AC</summary>
+       <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep.</description>
+     </key>
+@@ -319,17 +319,17 @@
+       <description>The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep.</description>
+     </key>
+     <key name="sleep-display-ac" type="i">
+-      <default>600</default>
++      <default>0</default>
+       <summary>Sleep timeout display when on AC</summary>
+       <description>The amount of time in seconds before the display goes to sleep when the computer is on AC power.</description>
+     </key>
+     <key name="sleep-display-battery" type="i">
+-      <default>600</default>
++      <default>0</default>
+       <summary>Sleep timeout display when on battery</summary>
+       <description>The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep.</description>
+     </key>
+     <key name="sleep-display-ups" type="i">
+-      <default>600</default>
++      <default>0</default>
+       <summary>Sleep timeout display when on UPS</summary>
+       <description>The amount of time in seconds the computer on UPS power needs to be inactive before the display goes to sleep.</description>
+     </key>

ukui-power-manager-3.1.2-fix-default-power-setting.patch

@@ -0,0 +1,12 @@
+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 @@
+       <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep.</description>
+     </key>
+     <key name="sleep-computer-ac" type="i">
+-      <default>900</default>
++      <default>0</default>
+       <summary>Sleep timeout computer when on AC</summary>
+       <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep.</description>
+     </key>

ukui-power-manager.spec

@@ -1,13 +1,15 @@
-%define debug_package %{nil}
 Name:           ukui-power-manager
 Version:        3.1.2
-Release:        1
+Release:        6
 Summary:        power management tool for the UKUI desktop
 License:        GPL-3+
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
 
-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
+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
 
 Requires: dbus-x11,systemd,upower
 
@@ -23,11 +25,11 @@ events, all integrated to other components of the UKUI desktop.
 
 
 %prep
-%setup -q
+%autosetup -n %{name}-%{version} -p1
 
 %build
-qmake-qt5
+%{qmake_qt5}
-%{make_build} -j2
+%{make_build}
 
 %install
 %{make_install}  INSTALL_ROOT=%{buildroot}
@@ -45,6 +47,8 @@ gzip -c %{_builddir}/%{name}-%{version}/man/ukui-power-manager.2	 > %{buildroot}
 gzip -c %{_builddir}/%{name}-%{version}/man/ukui-power-manager-tray.1	 > %{buildroot}/usr/share/man/man1/ukui-power-manager-tray.1.gz
 gzip -c %{_builddir}/%{name}-%{version}/man/ukui-upower.1	 > %{buildroot}/usr/share/man/man1/ukui-upower.1.gz
 
+chrpath -d %{buildroot}/usr/bin/ukui-power-manager-tray
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -70,6 +74,24 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||:
 %{_datadir}/man/*
 
 %changelog
+* Sat Jun 17 2023 douyan<douyan@kylinos.cn> - 3.1.2-6
+- Type: bugfix
+- ID  : NA
+- SUG : NA
+- DESC: add patch03: ukui-power-manager-3.1.2-disable-computer-sleep.patch
+
+* Sun Jun 11 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-5
+- fix coredump of ukui-power-manager
+
+* Wed Mar 01 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-4
+- remove rpath of ukui-power-manager-tray
+
+* Tue Feb 28 2023 douyan <douyan@kylinos.cn> - 3.1.2-3
+- add ukui-power-manager-3.1.2-fix-default-power-setting.patch
+
+* Thu Feb 09 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-2
+- add build debuginfo and debugsource
+
 * Tue Dec 6 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-1
 - update version to 3.1.2