diff --git a/fix-taskbar-compile-issue.patch b/fix-taskbar-compile-issue.patch deleted file mode 100644 index ef32fec..0000000 --- a/fix-taskbar-compile-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-3.0.2.tar.gz b/ukui-panel-3.0.2.tar.gz index 3b3af6f..ebafc98 100644 Binary files a/ukui-panel-3.0.2.tar.gz and b/ukui-panel-3.0.2.tar.gz differ diff --git a/ukui-panel.spec b/ukui-panel.spec index a432283..d6d6600 100644 --- a/ukui-panel.spec +++ b/ukui-panel.spec @@ -2,13 +2,12 @@ Name: ukui-panel Version: 3.0.2 -Release: 2 +Release: 3 Summary: ukui desktop panel 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,35 +40,30 @@ BuildRequires: libpeony-dev BuildRequires: dconf-devel BuildRequires: libpeony-dev -#patch0: fix-panel-taskview-icon.patch -patch0: fix-taskbar-compile-issue.patch - Provides: ukui-indicators %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 %setup -q -#%%patch0 -p1 -%patch0 -p1 +#%patch0 -p1 %build 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}/* @@ -78,11 +72,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/* %changelog -* Wen Dec 26 2020 douyan - 3.0.2-2 +* Fri Dec 4 2020 lvhan - 3.0.2-3 +- fix calendar + +* Thu Dec 3 2020 douyan - 3.0.2-2 - block calendar * 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 +- Init package for openEuler