Compare commits
No commits in common. "bcf2e93a69761e2961e166f5bbaa1f5e5282276a" and "eccbcfd736de7cdb6bb282d436fa1daad8f449f8" have entirely different histories.
bcf2e93a69
...
eccbcfd736
@ -1,25 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
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.
|
|
||||||
|
|
||||||
BIN
time-shutdown-1.1.1.tar.gz
Normal file
BIN
time-shutdown-1.1.1.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,6 +1,6 @@
|
|||||||
Name: time-shutdown
|
Name: time-shutdown
|
||||||
Version: 1.1.2
|
Version: 1.1.1
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: The time-shutdown is mainly used in the desktop operating system
|
Summary: The time-shutdown is mainly used in the desktop operating system
|
||||||
|
|
||||||
License: GPL-3+
|
License: GPL-3+
|
||||||
@ -16,9 +16,6 @@ Requires: gsettings-qt
|
|||||||
Requires: libX11
|
Requires: libX11
|
||||||
Requires: ukui-notification-daemon
|
Requires: ukui-notification-daemon
|
||||||
|
|
||||||
Patch0: add_desktop_file.patch
|
|
||||||
Patch1: 0001-fix-time-shutdown-coredump.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The time-shutdown is mainly used in the desktop operating system.
|
The time-shutdown is mainly used in the desktop operating system.
|
||||||
Timed shutdown program The shutdown frequency can be selected.
|
Timed shutdown program The shutdown frequency can be selected.
|
||||||
@ -26,7 +23,7 @@ Patch1: 0001-fix-time-shutdown-coredump.patch
|
|||||||
and a notification popup will be sent. You can select, postpone and set.
|
and a notification popup will be sent. You can select, postpone and set.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%setup -q
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export PATH=%{_qt5_bindir}:$PATH
|
export PATH=%{_qt5_bindir}:$PATH
|
||||||
@ -48,23 +45,7 @@ popd
|
|||||||
%{_datadir}/applications/ukui-time-shotdown.desktop
|
%{_datadir}/applications/ukui-time-shotdown.desktop
|
||||||
%{_datadir}/glib-2.0/schemas/org.ukui.time.shutdown.settings.gschema.xml
|
%{_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/time-shutdown_zh_CN.qm
|
||||||
%{_datadir}/ukui-time-shutdown/ukui-time-shutdown_bo_CN.qm
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Mar 1 2023 huayadong <huayadong@kylinos.cn> - 1.1.2-2
|
* Wen Nov 11 2020 douyan <douyan@kylinos.cn> - 1.1.1-1
|
||||||
- fix time shutdown coredump
|
- update to upstream version 1.1.0-1-0001+1031
|
||||||
|
|
||||||
* 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
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
version_control: github
|
|
||||||
src_repo: https://github.com/ukui/time-shutdown.git
|
|
||||||
tag_prefix: "v"
|
|
||||||
separator: "."
|
|
||||||
Loading…
x
Reference in New Issue
Block a user