diff --git a/fix-panel-taskview-icon.patch b/fix-panel-taskview-icon.patch deleted file mode 100644 index 16352c6..0000000 --- a/fix-panel-taskview-icon.patch +++ /dev/null @@ -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 diff --git a/fix-taskbar-compile-issue.patch b/fix-taskbar-compile-issue.patch new file mode 100644 index 0000000..ef32fec --- /dev/null +++ b/fix-taskbar-compile-issue.patch @@ -0,0 +1,24 @@ +diff -ur ukui-panel-3.0.3/plugin-taskbar/ukuitaskwidget.cpp ukui-panel-3.0.3~/plugin-taskbar/ukuitaskwidget.cpp +--- ukui-panel-3.0.3/plugin-taskbar/ukuitaskwidget.cpp 2020-09-28 10:40:15.000000000 +0800 ++++ ukui-panel-3.0.3~/plugin-taskbar/ukuitaskwidget.cpp 2020-10-26 15:46:58.146651735 +0800 +@@ -592,7 +590,8 @@ + { + // return KWindowInfo(mWindow,NET::WMState | NET::XAWMState).isMinimized(); + #if (QT_VERSION >= QT_VERSION_CHECK(5,7,0)) +- return NET::Focused == (KWindowInfo(mWindow,NET::WMState).state()&NET::Focused); ++ // return NET::Focused == (KWindowInfo(mWindow,NET::WMState).state()&NET::Focused); ++ return isApplicationActive(); + #else + return isApplicationActive(); + #endif +@@ -602,7 +601,8 @@ + { + qDebug()<<"KWindowInfo(mWindow,NET::WMState).state():"<= QT_VERSION_CHECK(5,7,0)) +- return NET::Focused == (KWindowInfo(mWindow,NET::WMState).state()&NET::Focused); ++ //return NET::Focused == (KWindowInfo(mWindow,NET::WMState).state()&NET::Focused); ++ return isApplicationActive(); + #else + return isApplicationActive(); + #endif + \ No newline at end of file diff --git a/ukui-panel-2.0.8.tar.gz b/ukui-panel-2.0.8.tar.gz deleted file mode 100644 index 6322c6f..0000000 Binary files a/ukui-panel-2.0.8.tar.gz and /dev/null differ diff --git a/ukui-panel-3.0.2.tar.gz b/ukui-panel-3.0.2.tar.gz new file mode 100644 index 0000000..ba2316d Binary files /dev/null and b/ukui-panel-3.0.2.tar.gz differ diff --git a/ukui-panel.spec b/ukui-panel.spec index ddb18b6..a58b646 100644 --- a/ukui-panel.spec +++ b/ukui-panel.spec @@ -1,10 +1,10 @@ %define debug_package %{nil} Name: ukui-panel -Version: 2.0.8 +Version: 3.0.2 Release: 1 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 @@ -41,7 +41,8 @@ BuildRequires: libpeony-dev BuildRequires: dconf-devel BuildRequires: libpeony-dev -patch0: fix-panel-taskview-icon.patch +#patch0: fix-panel-taskview-icon.patch +patch0: fix-taskbar-compile-issue.patch Provides: ukui-indicators @@ -53,6 +54,7 @@ Provides: ukui-indicators %prep %setup -q +#%%patch0 -p1 %patch0 -p1 %build @@ -76,5 +78,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/* %changelog +* Mon Oct 26 2020 douyan - 3.0.2-1 +- update to upstream version 3.0.1-1+1028 + * Thu Jul 9 2020 douyan - 2.0.8-1 - Init package for openEuler \ No newline at end of file