diff --git a/kiran-menu-2.2.0+beta4.tar.gz b/kiran-menu-2.2.0+beta4.tar.gz deleted file mode 100644 index b42d4ae..0000000 Binary files a/kiran-menu-2.2.0+beta4.tar.gz and /dev/null differ diff --git a/kiran-menu-2.2.5.tar.gz b/kiran-menu-2.2.5.tar.gz new file mode 100644 index 0000000..6ca3d20 Binary files /dev/null and b/kiran-menu-2.2.5.tar.gz differ diff --git a/kiran-menu.spec b/kiran-menu.spec index 1ffd07b..692da04 100644 --- a/kiran-menu.spec +++ b/kiran-menu.spec @@ -1,14 +1,11 @@ Name: kiran-menu -Version: 2.2.0+beta4 -Release: 1%{?dist} +Version: 2.2.5 +Release: 6%{?dist} Summary: Applets for mate panel from Kiran Desktop -License: GPLv2+ +License: Mulan PSL v2 Source0: %{name}-%{version}.tar.gz -Source1: logo.svg -Source2: workspace-switcher.svg -Patch1: kiran-menu_change-filemanager-in-taskbar-fixed-apps.patch BuildRequires: cmake > 3.0 BuildRequires: gcc-c++ @@ -16,16 +13,23 @@ BuildRequires: gtkmm30-devel BuildRequires: mate-panel-devel >= 1.22 BuildRequires: gettext BuildRequires: libwnck3-devel -BuildRequires: accountsservice-devel +BuildRequires: kiran-cc-daemon-devel BuildRequires: libX11-devel BuildRequires: libxcb-devel BuildRequires: libXcomposite-devel BuildRequires: mate-desktop-devel >= 1.22 BuildRequires: cairomm-devel +BuildRequires: kiran-log-gtk3-devel +BuildRequires: libdbusmenu-devel +BuildRequires: libxml2-devel +BuildRequires: fmt-devel +BuildRequires: kiran-panel +BuildRequires: kiran-panel-libs +BuildRequires: kiran-panel-devel Requires: libwnck3 Requires: mate-screensaver -Requires: accountsservice +Requires: kiran-system-daemon Requires: mate-session-manager >= 1.22 Requires: glib2 Requires: gtk-update-icon-cache @@ -46,13 +50,9 @@ Redesigned panel applets for Mate Desktop %prep %autosetup -p1 -cp %SOURCE1 %{_builddir}/%{name}-%{version}/images/ -f -cp %SOURCE2 %{_builddir}/%{name}-%{version}/images/ -f -cp %SOURCE2 %{_builddir}/%{name}-%{version}/icons/ -f - %build -%cmake -DBUILD_SHARED_LIBS:BOOL=OFF +%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_WITH_KIRANACCOUNTS:BOOL=ON -DKIRAN_DESKTOP:BOOL=TRUE make %{?_smp_mflags} @@ -61,15 +61,16 @@ make install DESTDIR=%{buildroot} %files -n kiran-applets -%{_libexecdir}/mate-panel/kiran-applet -%{_datadir}/dbus-1/services/org.mate.panel.applet.KiranAppletFactory.service -%{_datadir}/glib-2.0/schemas/com.unikylin.Kiran.StartMenu.gschema.xml -%{_datadir}/glib-2.0/schemas/com.unikylin.Kiran.StartMenu.profile.gschema.xml -%{_datadir}/glib-2.0/schemas/com.unikylin.Kiran.TaskBar.gschema.xml -%{_datadir}/kiran-applet/com.unikylin.Kiran.MenuCategory.xml +%{_libexecdir}/kiran-panel/kiran-applet +%{_datadir}/dbus-1/services/org.kiran.panel.applet.KiranAppletFactory.service +%{_datadir}/glib-2.0/schemas/com.kylinsec.kiran.startmenu.gschema.xml +%{_datadir}/glib-2.0/schemas/com.kylinsec.kiran.taskbar.gschema.xml +%{_datadir}/glib-2.0/schemas/com.kylinsec.kiran.workspace-switcher.gschema.xml +%{_datadir}/glib-2.0/schemas/com.kylinsec.kiran.tray.gschema.xml +%{_datadir}/kiran-applet/com.kylinsec.Kiran.MenuCategory.xml %{_datadir}/kiran-applet/kiran-applet.gresource %{_datadir}/locale/zh_CN/LC_MESSAGES/kiran-applet.mo -%{_datadir}/mate-panel/applets/org.mate.panel.KiranApplet.mate-panel-applet +%{_datadir}/kiran-panel/applets/org.mate.panel.KiranApplet.mate-panel-applet %{_datadir}/icons/hicolor/scalable/apps/*.svg %{_datadir}/kiran-applet/menu-menu.ui.xml %{_datadir}/kiran-applet/tasklist-menu.ui.xml @@ -81,15 +82,83 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/ %changelog -* Thu Jan 28 2021 songchuanfei 2.2.0+beta4-1.ky3 -- KYOS-F: Treat challenge as yes when query suspend capabilities (#34207) +* Fri Oct 29 2021 tangjie02 2.2.5-6.ky3 +- KYOS-B: Fix the zlog_ex.h dependency error. -* Mon Jan 18 2021 songchuanfei 2.2.0+beta3-1.ky3 -- KYOS-F: [menu] Fix chinese translation not correct for control center(##33519) -- KYOS-F: [tasklist] Fix window animation direction error after change current page for app buttons +* Mon Oct 25 2021 tangjie02 2.2.5-5.ky3 +- KYOS-F: Rebuild for KiranUI-2.1-OE -* Tue Jan 12 2021 songchuanfei 2.2.0+beta2-1.ky3 -- KYOS-F: Fix applet crash when reset panel in some cases(#31883) +* Sat Oct 23 2021 tangjie02 2.2.5-4.ky3 +- KYOS-B: Revert: draw the background and the round window. + +* Fri Oct 22 2021 yuanxing 2.2.5-3.ky3 +- KYOS-F: add create new workspace translation.(#45212) +- KYOS-B: Fix the coredump when press power button on start menu. + +* Fri Oct 15 2021 xiewenhao 2.2.5-1.ky3.kb3 +- KYOS-B: add cmake parameter （#43502） + +* Sat Oct 09 2021 xiewenhao 2.2.5-1.ky3.kb2 +- KYBD: rebuild for KiranUI-2.1-OE + +* Sun Sep 26 2021 wangxiaoqing 2.2.5-1.ky3.kb1 +- KYOS-F: draw the background and the round window.(#39692) +- KYOS-B: delete the gtk image set from pixbuf with scale function.(#39692) +- KYOS-B: realse the gsettings object when kiran tray finalize.(#44222) + +* Fri Sep 17 2021 tangjie02 2.2.5-1.ky3 +- Modify the license to Mulan PSL. + +* Wed Aug 25 2021 tangjie02 2.2.4-1.ky3 +- KYOS-F: Compatible kiran-panel. + +* Wed Aug 04 2021 tangjie02 2.2.3-6.ky3 +- KYOS-B: Localization the tips name over tasklist application. (#42107) + +* Tue Jul 20 2021 tangjie02 2.2.3-5.ky3 +- KYOS-B: Check whether system can shutdown when show power buttons.(#39572 #40713) + +* Thu Jul 16 2021 wangxiaoqing 2.2.3-4.ky3.kb1 +- KYOS-B: add the About menu translator.(#39692) + +* Wed Jul 14 2021 tangjie02 2.2.3-4.ky3 +- KYOS-F: Add LICENSE file and copyright information in source file header. +- KYOS-F: Check whether system can shutdown or reboot when show power buttons. (#39572 #40713) + +* Thu Jul 01 2021 wangxiaoqing 2.2.3-3.ky3.kb1 +- KYOS-B: Not let panel applet to get key focus when mouse enter.(#39561) + +* Tue Jun 22 2021 tangjie02 2.2.3-3.ky3 +- KYOS-F: Add new command(kiran-cpanel-account) for launching account manager. + +* Sat Jun 19 2021 wangxiaoqing 2.2.3-2.ky3.kb1 +- KYOS-B: let the kiran flameshot app status icon defaut in the panel.(#40001) + +* Thu Jun 10 2021 tangjie02 2.2.3-2.ky3 +- KYOS-B: Fix the error that variable default-page in gsettings doesn't work. +- KYOS-F: rename gsettings name according to specification. + +* Wed Jun 09 2021 tangjie02 2.2.3-1.ky3.kb1 +- KYOS-B: Delete the override-redirect property for menu window. (#39773) + +* Thu Jun 03 2021 tangjie02 2.2.3-1.ky3 +- KYOS-F: Set default fixed applications which contain gnome-software, firfox, mate-terminal and caja on taskbar. + +* Thu May 27 2021 wangxiaoqing 2.2.2-1.ky3 +- KYOS-F: Add tray applet. + +* Mon Mar 29 2021 tangjie02 2.2.1+beta1-2.ky3 +- KYOS-F: Improve tranlations. (#36439) +- KYOS-B: Fix paging button visible when no apps opened. (#36444) +- KYOS-B: Fix disabled paging buttons style. +- KYOS-B: Grab keyboard for menu window after pop menu closed. (#36474) + + +* Thu Mar 25 2021 yuanxing 2.2.1+beta1-1.ky3.kb1 +- KYOS-F: [icons]change the icons of logo and workspace-switcher (#36338) + +* Fri Mar 19 2021 tangjie02 2.2.1+beta1-1.ky3 +- KYOS-F: new upstream source 2.2.1 * Thu Dec 24 2020 songchuanfei 2.2.0+beta1-1.ky3 - KYOS-F: [workspace] Fix user can use Alt+Tab to switch to other windows when switch window popup diff --git a/kiran-menu_change-filemanager-in-taskbar-fixed-apps.patch b/kiran-menu_change-filemanager-in-taskbar-fixed-apps.patch deleted file mode 100644 index 9692062..0000000 --- a/kiran-menu_change-filemanager-in-taskbar-fixed-apps.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/com.unikylin.Kiran.TaskBar.gschema.xml.in b/data/com.unikylin.Kiran.TaskBar.gschema.xml.in -index 32b125a..0c5ac45 100644 ---- a/data/com.unikylin.Kiran.TaskBar.gschema.xml.in -+++ b/data/com.unikylin.Kiran.TaskBar.gschema.xml.in -@@ -2,7 +2,7 @@ - - - -- ['caja-browser.desktop', 'firefox.desktop', 'mate-terminal.desktop', 'org.gnome.Software.desktop'] -+ ['caja.desktop', 'firefox.desktop', 'mate-terminal.desktop', 'org.gnome.Software.desktop'] - - - diff --git a/logo.svg b/logo.svg deleted file mode 100644 index ef764ba..0000000 --- a/logo.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - -