!29 update to upstream version 3.0.6-1

From: @hua_yadong 
Reviewed-by: @pei-jiankang 
Signed-off-by: @pei-jiankang

0001-block-taskbar-right-click.patch

@@ -1,32 +0,0 @@
-From 6fac1af7e08ce92384035f29d19141e5c79aa141 Mon Sep 17 00:00:00 2001
-From: myshow <296570182@qq.com>
-Date: Fri, 4 Dec 2020 17:52:24 +0800
-Subject: [PATCH] block-taskbar-right-click
-
----
- plugin-taskbar/ukuitaskwidget.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugin-taskbar/ukuitaskwidget.cpp b/plugin-taskbar/ukuitaskwidget.cpp
-index 2481fc4..b463f54 100644
---- a/plugin-taskbar/ukuitaskwidget.cpp
-+++ b/plugin-taskbar/ukuitaskwidget.cpp
-@@ -358,6 +358,7 @@ void UKUITaskWidget::closeGroup() {
- 
- void UKUITaskWidget::contextMenuEvent(QContextMenuEvent *event)
- {
-+    /*
-     QMenu * menu = new QMenu(tr("Widget"));
-     menu->setAttribute(Qt::WA_DeleteOnClose);
-     QAction *close = menu->addAction(QIcon::fromTheme("window-close-symbolic"), tr("close"));
-@@ -377,6 +378,7 @@ void UKUITaskWidget::contextMenuEvent(QContextMenuEvent *event)
-     menu->setGeometry(plugin()->panel()->calculatePopupWindowPos(mapToGlobal(event->pos()), menu->sizeHint()));
-     plugin()->willShowWindow(menu);
-     menu->show();
-+    */
- }
- /************************************************
- 
--- 
-2.29.2.windows.2
-

0003-Modify-some-modules-translation-error.patch

@@ -1,107 +0,0 @@
-From 06eaadf512479c4f20ce5955129ea0757dc59b02 Mon Sep 17 00:00:00 2001
-From: root <root@localhost.localdomain>
-Date: Sat, 18 Sep 2021 13:02:41 +0800
-Subject: [PATCH] Modify-some-modules-translation-error
-
----
- panel/resources/ukui-panel_zh_CN.ts | 5 +++++
- plugin-nightmode/nightmode.cpp      | 5 +++--
- plugin-showdesktop/showdesktop.cpp  | 3 ++-
- plugin-startmenu/startmenu.cpp      | 2 ++
- plugin-taskview/taskview.cpp        | 2 +-
- 5 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/panel/resources/ukui-panel_zh_CN.ts b/panel/resources/ukui-panel_zh_CN.ts
-index f234d96..e63297e 100755
---- a/panel/resources/ukui-panel_zh_CN.ts
-+++ b/panel/resources/ukui-panel_zh_CN.ts
-@@ -778,6 +778,11 @@ icons here</source>
-         <source>Shutdown</source>
-         <translation type="vanished">关闭计算机</translation>
-     </message>
-+    <message>
-+	<location filename="../../plugin-startmenu/startmenu.cpp" line="62"/>
-+	<source>UKui Menu</source>
-+	<translation>开始菜单</translation>
-+    </message>
-     <message>
-         <location filename="../../plugin-startmenu/startmenu.cpp" line="104"/>
-         <source>User Action</source>
-diff --git a/plugin-nightmode/nightmode.cpp b/plugin-nightmode/nightmode.cpp
-index 66e01ca..670a9df 100755
---- a/plugin-nightmode/nightmode.cpp
-+++ b/plugin-nightmode/nightmode.cpp
-@@ -22,6 +22,7 @@
- #include <QDebug>
- #include <QMessageBox>
- #include <QDir>
-+#include <QTimer>
- #include "nightmode.h"
- #include "../panel/customstyle.h"
- 
-@@ -240,13 +241,13 @@ void NightModeButton::setNightMode(const bool nightMode){
-         serverCmd = "enable";
-         QIcon icon=QIcon("/usr/share/ukui-panel/panel/img/nightmode-night.svg");
-         this->setIcon(icon);
--        this->setToolTip(tr("nightmode open"));
-+        QTimer::singleShot(5000,[this] { this->setToolTip(tr("nightmode open")); });
-     }
-     else{
-         cmd = "stop";
-         serverCmd = "disable";
-         this->setIcon(QIcon("/usr/share/ukui-panel/panel/img/nightmode-light.svg"));
--        this->setToolTip(tr("nightmode close"));
-+        QTimer::singleShot(5000,[this] { this->setToolTip(tr("nightmode close")); });
-     }
- 
-     process.startDetached("systemctl", QStringList() << "--user" << serverCmd << "redshift.service");
-diff --git a/plugin-showdesktop/showdesktop.cpp b/plugin-showdesktop/showdesktop.cpp
-index 3bd5529..11688e0 100755
---- a/plugin-showdesktop/showdesktop.cpp
-+++ b/plugin-showdesktop/showdesktop.cpp
-@@ -28,6 +28,7 @@
- #include <QtX11Extras/QX11Info>
- #include <QStyleOption>
- #include <QPainter>
-+#include <QTimer>
- #include <KWindowSystem/KWindowSystem>
- #include <KWindowSystem/NETWM>
- #include "showdesktop.h"
-@@ -44,7 +45,7 @@ ShowDesktop::ShowDesktop(const IUKUIPanelPluginStartupInfo &startupInfo) :
-     IUKUIPanelPlugin(startupInfo)
- {
-     state=NORMAL;
--    this->setToolTip(tr("Show Desktop"));
-+    QTimer::singleShot(5000,[this] {this->setToolTip(tr("Show Desktop"));});
-     realign();
- 
- }
-diff --git a/plugin-startmenu/startmenu.cpp b/plugin-startmenu/startmenu.cpp
-index bf4bf97..7875424 100755
---- a/plugin-startmenu/startmenu.cpp
-+++ b/plugin-startmenu/startmenu.cpp
-@@ -58,6 +58,8 @@ UKUIStartMenuButton::UKUIStartMenuButton( IUKUIPanelPlugin *plugin, QWidget* par
- {
-     this->setIcon(QIcon("/usr/share/ukui-panel/panel/img/startmenu.svg"));
-     this->setStyle(new CustomStyle());
-+    setStyleSheet("QToolButton { margin-left: 4px; } ");
-+    QTimer::singleShot(5000,[this] {this->setToolTip(tr("UKui Menu")); });
-     //    this->setWindowFlags(Qt::NoFocus);
-     //setAttribute(Qt::WA_X11DoNotAcceptFocus, true);
-     //setAttribute(Qt::WA_ShowWithoutActivating,true);
-diff --git a/plugin-taskview/taskview.cpp b/plugin-taskview/taskview.cpp
-index 7fb54b3..ec7eaaf 100755
---- a/plugin-taskview/taskview.cpp
-+++ b/plugin-taskview/taskview.cpp
-@@ -45,7 +45,7 @@ TaskView::TaskView(const IUKUIPanelPluginStartupInfo &startupInfo) :
-     mButton =new TaskViewButton();
-     mButton->setStyle(new CustomStyle());
-     mButton->setIcon(QIcon::fromTheme("taskview",QIcon("/usr/share/ukui-panel/panel/img/taskview.svg")));
--    mButton->setToolTip(tr("Show Taskview"));
-+    QTimer::singleShot(5000,[this] {mButton->setToolTip(tr("Show Taskview")); });
- 
-     /* hide/show taskview
-      * Monitor gsettings to set TaskViewButton size
--- 
-2.30.0
-

ukui-panel.spec

@@ -1,13 +1,12 @@
 %define debug_package %{nil}
 
 Name:           ukui-panel
-Version:        3.0.2
+Version:        3.0.6
-Release:        6
+Release:        1
 Summary:        ukui desktop panel
 License:        LGPL-2.1+ GPL-2+ LGPL-3
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
-Source1:        ukui-panel_zh_CN.qm
 
 BuildRequires: cmake
 BuildRequires: alsa-lib-devel
@@ -31,7 +30,6 @@ BuildRequires: libXdamage-devel
 BuildRequires: libxkbcommon-devel
 BuildRequires: libxkbcommon-x11-devel
 BuildRequires: libXrender-devel
-BuildRequires: qt5-qtwebkit-devel
 BuildRequires: qt5-qttools-devel
 BuildRequires: libqtxdg-devel
 BuildRequires: gsettings-qt-devel
@@ -40,12 +38,15 @@ BuildRequires: poppler-qt5-devel
 BuildRequires: libpeony-dev
 BuildRequires: dconf-devel
 BuildRequires: libpeony-dev
+BuildRequires: libXtst-devel
+BuildRequires: libX11-devel
+BuildRequires: libudisks2-devel
+BuildRequires: xcb-util-renderutil-devel
+BuildRequires: xcb-util-image-devel
+BuildRequires: libxcb-devel
 
 Provides: ukui-indicators
 
-patch0: 0001-block-taskbar-right-click.patch
-#patch1: 0002-Fixes-an-issue-with-a-year-jump-exception.patch 
-patch2: 0003-Modify-some-modules-translation-error.patch
 
 %description
  The ukui desktop panel is used on ukui desktop and has some plugins like
@@ -54,11 +55,7 @@ patch2: 0003-Modify-some-modules-translation-error.patch
 
 %prep
 %setup -q
-%patch0 -p1
-#%%patch1 -p1
-%patch2 -p1
 
-cp -rf %{SOURCE1} %{_builddir}/%{name}-%{version}/panel/resources
 %build
 mkdir build && cd build
 %{cmake3} ..
@@ -80,12 +77,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/*
 
 %changelog
-* Fri Feb 10 2022 douyan <douyan@kylinos.cn> - 3.0.2-6
+* Wed Jan 26 2022 huayadong <huayadong@kylinos.cn> - 3.0.6-1
-- add BuildRequires pulseaudio-libs-devel
+- update to upstream version 3.0.6-1
 
-* Sat Sep 18 2021 peijiankang <peijiankang@kylinos.cn> - 3.0.2-5
+* Fri Nov 05 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-8
+- Added changelog file for easy viewing
+
+* Tue Nov 02 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-7
+- add Storage arrow icon
+
+* Sat Sep 18 2021 peijiankang <peijiankang@kylinos.cn> - 3.0.2-6
 - Modify some modules translation error
 
+* Wed Sep 08 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.2-5
+- Fixes an issue with a year jump exception
+
 * Fri Dec 4 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-4
 - block taskbar right click