Compare commits

..

12 Commits

Author SHA1 Message Date
openeuler-ci-bot
bcf2e93a69
!21 [sync] PR-20: fix time shutdown coredump
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2023-03-01 08:09:34 +00:00
huayadong
61f6a1d0b1 fix time shutdown coredump
(cherry picked from commit 625f4541f4e48b6623b4eb4200ac9ff4cd05da33)
2023-03-01 11:35:50 +08:00
openeuler-ci-bot
e91564ca8c
!18 update to upstream version 1.1.2
From: @dou33 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2022-12-06 07:12:27 +00:00
dou33
58d13cdd22 update to upstream version 1.1.2 2022-12-06 14:46:46 +08:00
openeuler-ci-bot
2461b836d7
!12 Submit yaml file into this repository
From: @duyiwei7w 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2022-05-13 02:15:01 +00:00
duyiwei
4aa3dfda90 add time-shutdown.yaml. 2022-05-10 10:15:16 +08:00
openeuler-ci-bot
c9590e50e1
!9 [sync] PR-7: 修复编译缺少头文件问题
From: @openeuler-sync-bot 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-03-04 03:22:44 +00:00
tanyulong2021
464c711967 fix build header file error
(cherry picked from commit 9588b17af9a7ece8ca4787891fe87531c2e7f638)
2022-02-23 14:59:34 +08:00
openeuler-ci-bot
a01254d35c !6 sync
From: @myshow2258
Reviewed-by: @dou33
Signed-off-by: @dou33
2021-01-28 16:48:16 +08:00
openeuler-ci-bot
f41fc1022a !4 fix-title-bar-issue
From: @dou33
Reviewed-by: @handsome_feng
Signed-off-by: @handsome_feng
2020-12-01 16:44:01 +08:00
dou33
b2f37e501c fix-title-bar-issue 2020-12-01 15:53:59 +08:00
openeuler-ci-bot
f01d0b3383 !1 package init
From: @dou33
Reviewed-by: @handsome_feng
Signed-off-by: @handsome_feng
2020-11-12 09:57:29 +08:00
6 changed files with 71 additions and 5 deletions

View File

@ -0,0 +1,25 @@
From 0593828f399543eff2da150c4589e7e4af66978d Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
Date: Wed, 1 Mar 2023 10:32:07 +0800
Subject: [PATCH] dddd
---
src/widget.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/widget.cpp b/src/widget.cpp
index f288c91..852d7ae 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -43,7 +43,7 @@ Widget::Widget(QWidget *parent)
initGsetting();
// 根据版本设置gsetting值
- getTimeShutdownVersion();
+// getTimeShutdownVersion();
// 创建当前动作
createActions();
--
2.36.1

18
add_desktop_file.patch Normal file
View File

@ -0,0 +1,18 @@
diff -Naur time-shutdown-1.1.1/time-shutdown.pro time-shutdown-1.1.1~/time-shutdown.pro
--- time-shutdown-1.1.1/time-shutdown.pro 2021-11-04 16:30:10.000000000 +0800
+++ time-shutdown-1.1.1~/time-shutdown.pro 2022-03-04 14:27:52.702298450 +0800
@@ -42,11 +42,11 @@
schemes.files += data/org.ukui.time.shutdown.settings.gschema.xml
schemes.path = /usr/share/glib-2.0/schemas/
-#desktopfile.files = data/ukui-time-shotdown.desktop
-#desktopfile.path = /usr/share/applications/
+desktopfile.files = data/ukui-time-shotdown.desktop
+desktopfile.path = /usr/share/applications/
target.path = /usr/bin/
-INSTALLS += target schemes translation
+INSTALLS += target schemes translation desktopfile
# Default rules for deployment.

Binary file not shown.

BIN
time-shutdown-1.1.2.tar.gz Normal file

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: time-shutdown
Version: 1.1.1
Release: 1
Version: 1.1.2
Release: 2
Summary: The time-shutdown is mainly used in the desktop operating system
License: GPL-3+
@ -16,6 +16,9 @@ Requires: gsettings-qt
Requires: libX11
Requires: ukui-notification-daemon
Patch0: add_desktop_file.patch
Patch1: 0001-fix-time-shutdown-coredump.patch
%description
The time-shutdown is mainly used in the desktop operating system.
Timed shutdown program The shutdown frequency can be selected.
@ -23,7 +26,7 @@ Requires: ukui-notification-daemon
and a notification popup will be sent. You can select, postpone and set.
%prep
%setup -q
%autosetup -p1
%build
export PATH=%{_qt5_bindir}:$PATH
@ -45,7 +48,23 @@ popd
%{_datadir}/applications/ukui-time-shotdown.desktop
%{_datadir}/glib-2.0/schemas/org.ukui.time.shutdown.settings.gschema.xml
%{_datadir}/ukui-time-shutdown/time-shutdown_zh_CN.qm
%{_datadir}/ukui-time-shutdown/ukui-time-shutdown_bo_CN.qm
%changelog
* Wen Nov 11 2020 douyan <douyan@kylinos.cn> - 1.1.1-1
- update to upstream version 1.1.0-1-0001+1031
* Wed Mar 1 2023 huayadong <huayadong@kylinos.cn> - 1.1.2-2
- fix time shutdown coredump
* Fri Nov 25 2022 douyan <douyan@kylinos.cn> - 1.1.2-1
- update to upstream version 1.1.2
* Fri Mar 4 2022 douyan <douyan@kylinos.cn> - 1.1.1-4
- update to upstream version 1.1.1
* Thu Feb 10 2022 tanyulong <tanyulong@kylinos.cn> - 1.1.1-3
- fix missing head file error
* Tue Dec 1 2020 douyan <douyan@kylinos.cn> - 1.1.1-2
- fix-title-bar-issue
* Wed Nov 11 2020 douyan <douyan@kylinos.cn> - 1.1.1-1
- update to upstream version 1.1.0-1-0001+1031

4
time-shutdown.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: https://github.com/ukui/time-shutdown.git
tag_prefix: "v"
separator: "."