!12 sync

From: @myshow2258
Reviewed-by: @dou33
Signed-off-by: @dou33

0001-block-taskbar-right-click.patch

@@ -0,0 +1,32 @@
+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
+

fix-panel-taskview-icon.patch

@@ -1,13 +0,0 @@
-diff -ur ukui-panel-2.0.8/plugin-taskview/taskview.cpp ukui-panel-2.0.8~/plugin-taskview/taskview.cpp
---- ukui-panel-2.0.8/plugin-taskview/taskview.cpp	2020-06-22 15:53:13.000000000 +0800
-+++ ukui-panel-2.0.8~/plugin-taskview/taskview.cpp	2020-06-28 14:10:34.000000000 +0800
-@@ -44,7 +44,8 @@
- {
-     mButton =new TaskViewButton();
-     mButton->setStyle(new CustomStyle());
--    mButton->setIcon(QIcon::fromTheme("taskview",QIcon("/usr/share/ukui-panel/panel/img/taskview.svg")));
-+    //mButton->setIcon(QIcon::fromTheme("taskview",QIcon("/usr/share/ukui-panel/panel/img/taskview.svg")));
-+    mButton->setIcon(QIcon::fromTheme("taskview"));
-     mButton->setToolTip(tr("Show Taskview"));
- 
-     /* hide/show taskview

ukui-panel.spec

@@ -1,14 +1,13 @@
 %define debug_package %{nil}
 
 Name:           ukui-panel
-Version:        2.0.8
-Release:        1
+Version:        3.0.2
+Release:        4
 Summary:        ukui desktop panel
-License:        LGPL-2.1+ GPL-2+
+License:        LGPL-2.1+ GPL-2+ LGPL-3
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
 
-
 BuildRequires: cmake
 BuildRequires: alsa-lib-devel
 BuildRequires: dbusmenu-qt5-devel
@@ -41,14 +40,13 @@ BuildRequires: libpeony-dev
 BuildRequires: dconf-devel
 BuildRequires: libpeony-dev
 
-patch0:  fix-panel-taskview-icon.patch
-
 Provides: ukui-indicators
 
+patch0: 0001-block-taskbar-right-click.patch
+
 %description
  The ukui desktop panel is used on ukui desktop and has some plugins like
  starmenu, quicklaunch and other useful tools.
- .
  This package contains the ukui panel.
 
 %prep
@@ -60,14 +58,14 @@ mkdir build && cd build
 %{cmake3} ..
 
 %install
-rm -rf $RPM_BUILD_ROOT 
+rm -rf $RPM_BUILD_ROOT
 cd %{_builddir}/%{name}-%{version}/build
-make DESTDIR=$RPM_BUILD_ROOT install 
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files 
+%files
 %doc debian/copyright  debian/changelog
 %{_sysconfdir}/xdg/autostart/*
 %{_bindir}/*
@@ -76,5 +74,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/*
 
 %changelog
+* Fri Dec 4 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-4
+- block taskbar right click
+
+* Fri Dec 4 2020 lvhan <lvhan@kylinos.cn> - 3.0.2-3
+- fix calendar
+
+* Thu Dec 3 2020 douyan <douyan@kylinos.cn> - 3.0.2-2
+- block calendar
+
+* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.2-1
+- update to upstream version 3.0.1-1+1028
+
 * Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 2.0.8-1
-- Init package for openEuler
+- Init package for openEuler