diff --git a/0001-feature-menu-Hide-the-search-file-tool-on-start-menu.patch b/0001-feature-menu-Hide-the-search-file-tool-on-start-menu.patch deleted file mode 100644 index f65f0bb..0000000 --- a/0001-feature-menu-Hide-the-search-file-tool-on-start-menu.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 80277a6d3742c478932bd23ac2ab58efdd2490d8 Mon Sep 17 00:00:00 2001 -From: tangjie02 -Date: Thu, 3 Mar 2022 10:13:06 +0800 -Subject: [PATCH] feature(menu): Hide the search file tool on start menu. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 隐藏开始菜单中的搜索文件按钮 - -Signed-off-by: tangjie02 ---- - src/menu/menu-applet-window.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/menu/menu-applet-window.cpp b/src/menu/menu-applet-window.cpp -index 2c96254..1266b2d 100644 ---- a/src/menu/menu-applet-window.cpp -+++ b/src/menu/menu-applet-window.cpp -@@ -655,10 +655,10 @@ void MenuAppletWindow::add_sidebar_buttons() - "mate-panel --run-dialog"); - side_box->add(*launcher_btn); - -- launcher_btn = create_launcher_button("kiran-menu-search-files-symbolic", -+ /*launcher_btn = create_launcher_button("kiran-menu-search-files-symbolic", - _("Search Files"), - "mate-search-tool"); -- side_box->add(*launcher_btn); -+ side_box->add(*launcher_btn);*/ - - launcher_btn = create_launcher_button("kiran-menu-home-dir-symbolic", - _("Home Directory"), --- -2.18.1 - diff --git a/0002-feature-tray-Add-fcitx-to-bottom-panel.patch b/0002-feature-tray-Add-fcitx-to-bottom-panel.patch deleted file mode 100644 index 669fe25..0000000 --- a/0002-feature-tray-Add-fcitx-to-bottom-panel.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9f8ff27ee3f8aa000fa005ccb6268ff1425a2033 Mon Sep 17 00:00:00 2001 -From: tangjie02 -Date: Tue, 21 Dec 2021 21:40:58 +0800 -Subject: [PATCH 2/2] feature(tray): Add fcitx to bottom panel. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 添加Fcitx到底部面板 - -Signed-off-by: tangjie02 ---- - data/com.kylinsec.kiran.tray.gschema.xml.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/com.kylinsec.kiran.tray.gschema.xml.in b/data/com.kylinsec.kiran.tray.gschema.xml.in -index 04c5163..d31bbfe 100644 ---- a/data/com.kylinsec.kiran.tray.gschema.xml.in -+++ b/data/com.kylinsec.kiran.tray.gschema.xml.in -@@ -2,7 +2,7 @@ - - - -- ['~01-keyboard', '~02-volume', '~04-network', '~05-battery', 'kiran-flameshot'] -+ ['~01-keyboard', '~02-volume', '~04-network', '~05-battery', 'kiran-flameshot', 'Fcitx'] - The notify icon which show in the panel - The notify icon show which in the panel. - --- -2.27.0 - diff --git a/kiran-menu-2.2.6.tar.gz b/kiran-menu-2.2.6.tar.gz deleted file mode 100644 index 204c601..0000000 Binary files a/kiran-menu-2.2.6.tar.gz and /dev/null differ diff --git a/kiran-menu-2.3.0.tar.gz b/kiran-menu-2.3.0.tar.gz new file mode 100644 index 0000000..d774231 Binary files /dev/null and b/kiran-menu-2.3.0.tar.gz differ diff --git a/kiran-menu.spec b/kiran-menu.spec index f4f4ba3..2d502c3 100644 --- a/kiran-menu.spec +++ b/kiran-menu.spec @@ -1,16 +1,12 @@ Name: kiran-menu -Version: 2.2.6 -Release: 7 +Version: 2.3.0 +Release: 1 Summary: Applets for mate panel from Kiran Desktop License: Mulan PSL v2 Source0: %{name}-%{version}.tar.gz -Patch1000: 0001-feature-menu-Hide-the-search-file-tool-on-start-menu.patch -Patch1001: 0002-feature-tray-Add-fcitx-to-bottom-panel.patch - - BuildRequires: cmake > 3.0 BuildRequires: gcc-c++ BuildRequires: gtkmm30-devel @@ -56,7 +52,7 @@ Redesigned panel applets for Mate Desktop %autosetup -p1 %build -%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_WITH_KIRANACCOUNTS:BOOL=ON -DKIRAN_DESKTOP:BOOL=TRUE +%cmake -DBUILD_SHARED_LIBS:BOOL=OFF make %{?_smp_mflags} @@ -79,6 +75,8 @@ make install DESTDIR=%{buildroot} %{_datadir}/kiran-applet/menu-menu.ui.xml %{_datadir}/kiran-applet/tasklist-menu.ui.xml %{_datadir}/kiran-applet/workspace-switcher-menu.ui.xml +%{_includedir}/kiran-applet/tray-i.h +%{_libdir}/pkgconfig/kiran-applet.pc %post -n kiran-applets glib-compile-schemas /usr/share/glib-2.0/schemas/ @@ -86,6 +84,9 @@ gtk-update-icon-cache -f /usr/share/icons/hicolor/ %changelog +* Fri Jul 08 2022 tangjie02 - 2.3.0-1 +- KYOS-F: Update to version 2.3 and adapt new control panel. + * Wed Mar 09 2022 tangjie02 - 2.2.6-7 - KYOS-F: Add fcitx to bottom panel. diff --git a/workspace-switcher.svg b/workspace-switcher.svg deleted file mode 100644 index 6de12c6..0000000 --- a/workspace-switcher.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -