Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
6bbd73c4a2
!83 fix %patchN is deprecated warning
From: @dou33 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2024-05-06 09:10:43 +00:00
dou33
1139a2e931 fix %patchN is deprecated warning 2024-05-06 14:30:23 +08:00
openeuler-ci-bot
7f369e5192
!80 fix a memory leak
From: @hou-hongxun 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2024-05-06 06:13:31 +00:00
侯红勋
7d92108160 ukui-panel: fix a memory leak problem
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
2024-04-16 10:40:16 +08:00
openeuler-ci-bot
66e45d7d88
!78 修复错误使用的资源释放函数
From: @hou-hongxun 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2024-04-15 08:07:43 +00:00
侯红勋
59afc15380 ukui-panel: fix incorrect usage of deallocation func
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
2024-04-15 10:35:55 +08:00
openeuler-ci-bot
6b02443fdc
!76 [sync] PR-74: update 0002-fix-translation-of-calendar.patch
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2023-09-18 01:50:16 +00:00
peijiankang
18a9f698b4 update 0002-fix-translation-of-calendar.patch
(cherry picked from commit 31d43fb4d869cacb7809f4c48788849c74013762)
2023-09-15 17:36:51 +08:00
openeuler-ci-bot
3948aacc9c
!69 Modify file permissions
From: @peijiankang 
Reviewed-by: @hua_yadong 
Signed-off-by: @hua_yadong
2023-07-28 00:53:35 +00:00
peijiankang
fb87ee1415 Modify file permissions 2023-07-27 17:51:59 +08:00
5 changed files with 141 additions and 25 deletions

View File

@ -0,0 +1,29 @@
From 033cecc576749ca7a542efccdcdefb29c1f3ef69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
Date: Mon, 15 Apr 2024 11:12:34 +0800
Subject: [PATCH] ukui-panel: fix a memory leak problem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
---
panel/ukuipanel.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panel/ukuipanel.cpp b/panel/ukuipanel.cpp
index 93efa54..e3fa7a5 100644
--- a/panel/ukuipanel.cpp
+++ b/panel/ukuipanel.cpp
@@ -294,7 +294,7 @@ UKUIPanel::UKUIPanel(const QString &configGroup, UKUi::Settings *settings, QWidg
styleAdjust();
qDebug()<<"Panel :: UKuiPanel finished";
- UKuiPanelInformation* dbus=new UKuiPanelInformation;
+ UKuiPanelInformation* dbus=new UKuiPanelInformation(this);
new PanelAdaptor(dbus);
QDBusConnection con=QDBusConnection::sessionBus();
if(!con.registerService("org.ukui.panel") ||
--
2.43.0

View File

@ -0,0 +1,32 @@
From 4f7b0a8c64580ce6272fc27d9bc8f89e1c8a25df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= <houhongxun@kylinos.cn>
Date: Mon, 15 Apr 2024 10:11:43 +0800
Subject: [PATCH] ukui-panel: fix incorrect usage of deallocation func
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: 侯红勋 <houhongxun@kylinos.cn>
---
panel/ukuipanelapplication.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/panel/ukuipanelapplication.cpp b/panel/ukuipanelapplication.cpp
index d69244b..29cfc4b 100644
--- a/panel/ukuipanelapplication.cpp
+++ b/panel/ukuipanelapplication.cpp
@@ -289,8 +289,9 @@ bool UKUIPanelApplication::copyFileToPath(QString sourceDir ,QString toDir, QStr
createFile->remove(toDir+fileName);
}
}//end if
- free(createDir);
- free(createFile);
+
+ delete createDir;
+ delete createFile;
if(!QFile::copy(sourceDir+fileName, toDir+fileName))
{
--
2.43.0

View File

@ -1,33 +1,27 @@
From 1727c034ae8f43ba607d75503e0d9840bdf497cd Mon Sep 17 00:00:00 2001 From 364e77f821d31c1cff7dc9bf83d1cbe47b60e7e9 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn> From: peijiankang <peijiankang@kylinos.cn>
Date: Tue, 17 Jan 2023 10:12:33 +0800 Date: Thu, 29 Jun 2023 17:45:28 +0800
Subject: [PATCH] fix translation of calendar Subject: [PATCH] fix translation of calendar
--- ---
plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp | 6 ++++-- plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp | 4 ++++
1 file changed, 4 insertions(+), 2 deletions(-) 1 file changed, 4 insertions(+)
diff --git a/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp b/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp diff --git a/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp b/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp
index 4c5e743..40686e8 100644 index 4c5e743..1c4d931 100644
--- a/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp --- a/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp
+++ b/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp +++ b/plugin-calendar/lunarcalendarwidget/lunarcalendarwidget.cpp
@@ -606,8 +606,8 @@ void LunarCalendarWidget::setLocaleCalendar() @@ -668,9 +668,13 @@ QStringList LunarCalendarWidget::getLocale()
{ propertyMap = reply.value();
if (propertyMap.keys().contains("FormatsLocale")) {
QStringList res = getLocale(); formats = propertyMap.find("FormatsLocale").value().toString();
- qDebug()<<"设置区域:"<<res.at(0); + if(formats.isEmpty())
- int isCN = res.at(0) == "zh_CN.UTF-8" ? 1 : 0; + formats = QLocale::system().name() + ".UTF-8";
+ qDebug()<<"设置区域:"<<res.at(1);
+ int isCN = res.at(1).contains("zh_CN", Qt::CaseSensitive);
if(isCN){
if (FirstdayisSun) {
labWeeks.at(0)->setText("周日");
@@ -671,6 +671,8 @@ QStringList LunarCalendarWidget::getLocale()
} }
if(language.isEmpty() && propertyMap.keys().contains("Language")) { if(language.isEmpty() && propertyMap.keys().contains("Language")) {
language = propertyMap.find("Language").value().toString(); language = propertyMap.find("Language").value().toString();
+ if(language.isEmpty()) + if(language.isEmpty())
+ language = QLocale::system().name(); + language = QLocale::system().name() + ".UTF-8";
} }
} else { } else {
qDebug() << "reply failed"; qDebug() << "reply failed";

View File

@ -0,0 +1,25 @@
From bc49dae5bb33b111c9fb877c255bfb1ebc29514a Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Thu, 27 Jul 2023 17:12:31 +0800
Subject: [PATCH] Modify file permissions
---
panel/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panel/CMakeLists.txt b/panel/CMakeLists.txt
index bdfcf63..815b553 100644
--- a/panel/CMakeLists.txt
+++ b/panel/CMakeLists.txt
@@ -184,7 +184,7 @@ install(FILES
resources/panel-commission.sh resources/ukui-panel-reset.sh resources/ukui-panel-config.sh
DESTINATION "/usr/share/ukui/ukui-panel"
COMPONENT Runtime
- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ GROUP_WRITE WORLD_READ WORLD_WRITE WORLD_EXECUTE
+ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
GROUP_EXECUTE GROUP_READ
)
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: ukui-panel Name: ukui-panel
Version: 3.1.0 Version: 3.1.0
Release: 9 Release: 14
Summary: ukui desktop panel Summary: ukui desktop panel
License: LGPL-2.0-or-later and GPL-2.0-or-later and BSD License: LGPL-2.0-or-later and GPL-2.0-or-later and BSD
URL: http://www.ukui.org URL: http://www.ukui.org
@ -12,6 +12,9 @@ Patch04: 0004-fix-the-backlight-of-nightmode-button.patch
%if 0%{?kylin} %if 0%{?kylin}
Patch05: disable-Suspend-and-Sleep-of-ukui-panel.patch Patch05: disable-Suspend-and-Sleep-of-ukui-panel.patch
%endif %endif
Patch06: Modify-file-permissions.patch
Patch07: 0001-ukui-panel-fix-incorrect-usage-of-deallocation-func.patch
Patch08: 0001-ukui-panel-fix-a-memory-leak-problem.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
@ -66,6 +69,9 @@ Recommends: time-shutdown
%if 0%{?kylin} %if 0%{?kylin}
%patch 05 -p1 %patch 05 -p1
%endif %endif
%patch 06 -p1
%patch 07 -p1
%patch 08 -p1
%build %build
mkdir build && cd build mkdir build && cd build
@ -88,6 +94,36 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/* %{_datadir}/*
%changelog %changelog
* Mon May 06 2024 douyan <douyan@kylinos.cn> - 3.1.0-14
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: fix %patchN is deprecated warning
* Tue Apr 16 2024 houhongxun <houhongxun@kylinos.cn> - 3.1.0-13
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: add 0001-ukui-panel-fix-a-memory-leak-problem.patch
* Mon Apr 15 2024 houhongxun <houhongxun@kylinos.cn> - 3.1.0-12
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: add 0001-ukui-panel-fix-incorrect-usage-of-deallocation-func.patch
* Thu Sep 07 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-11
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: update 0002-fix-translation-of-calendar.patch
* Thu Jul 27 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-10
- Type:update
- ID:NA
- SUG:NA
- DESC: add Modify-file-permissions.patch
* Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-9 * Wed Jun 14 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.0-9
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA