diff --git a/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch b/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch deleted file mode 100644 index 4d7817a..0000000 --- a/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 69d7fe7218644b286c2ba093976d93594d9da576 Mon Sep 17 00:00:00 2001 -From: kylinsecos_admin -Date: Mon, 24 Jan 2022 14:05:06 +0800 -Subject: [PATCH] fix(build): fix incomplete type 'class QPainterPath' build - ---- - src/category-widget.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/category-widget.cpp b/src/category-widget.cpp -index be89521..a481beb 100644 ---- a/src/category-widget.cpp -+++ b/src/category-widget.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #define ROLE_CATEGORY_INDEX Qt::UserRole - -@@ -175,4 +176,4 @@ void CategoryWidget::setCurrentCategory(int index) - { - auto item = ui->categorys->item(index); - ui->categorys->setCurrentItem(item); --} -\ No newline at end of file -+} --- -1.8.3.1 - diff --git a/kiran-control-panel-2.2.0.tar.gz b/kiran-control-panel-2.2.0.tar.gz deleted file mode 100644 index 24e6734..0000000 Binary files a/kiran-control-panel-2.2.0.tar.gz and /dev/null differ diff --git a/kiran-control-panel-2.4.0.tar.gz b/kiran-control-panel-2.4.0.tar.gz new file mode 100644 index 0000000..10baef2 Binary files /dev/null and b/kiran-control-panel-2.4.0.tar.gz differ diff --git a/kiran-control-panel.spec b/kiran-control-panel.spec index c587b18..ec6ef44 100644 --- a/kiran-control-panel.spec +++ b/kiran-control-panel.spec @@ -1,30 +1,67 @@ Name: kiran-control-panel -Version: 2.2.0 -Release: 2.kb3 +Version: 2.4.0 +Release: 1 Summary: Kiran Control Panel Summary(zh_CN): Kiran桌面控制面板 -License: Mulan PSL v2 +License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz -Patch0: 0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch - BuildRequires: gcc-c++ BuildRequires: cmake >= 3.2 +BuildRequires: glib2-devel +BuildRequires: upower-devel +BuildRequires: zeromq-devel +BuildRequires: libnotify-devel +BuildRequires: pam-devel +BuildRequires: cryptopp-devel + BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-qtmultimedia-devel BuildRequires: qt5-linguist +BuildRequires: kf5-networkmanager-qt-devel + BuildRequires: kiran-log-qt5-devel BuildRequires: kiran-widgets-qt5-devel -BuildRequires: glib2-devel +BuildRequires: kiran-qt5-integration-devel +BuildRequires: kiran-qdbusxml2cpp +BuildRequires: kiran-cc-daemon-devel Requires: qt5-qtbase +Requires: qt5-qtbase-gui Requires: qt5-qtx11extras Requires: qt5-qtsvg +Requires: qt5-qtmultimedia +Requires: kf5-networkmanager-qt + Requires: kiran-log-qt5 -Requires: kiran-widgets-qt5 +Requires: kiran-widgets-qt5 >= 2.4 +Requires: kiran-qt5-integration >= 2.4 +Requires: kiran-system-daemon >= 2.4 +Requires: kiran-session-daemon >= 2.4 + Requires: glib2 +Requires: upower +Requires: zeromq +Requires: libnotify +Requires: pam +Requires: cryptopp + +Requires: NetworkManager-l2tp +#Requires: NetworkManager-pptp + +Obsoletes: kiran-cpanel-account +Obsoletes: kiran-cpanel-appearance +Obsoletes: kiran-cpanel-display +Obsoletes: kiran-cpanel-keybinding +Obsoletes: kiran-cpanel-keyboard +Obsoletes: kiran-cpanel-mouse +Obsoletes: kiran-cpanel-power +Obsoletes: kiran-cpanel-system +Obsoletes: kiran-cpanel-timedate + %description Kiran Control Panel @@ -39,14 +76,17 @@ BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-linguist BuildRequires: kiran-log-qt5-devel -BuildRequires: kiran-widgets-qt5-devel +BuildRequires: kiran-widgets-qt5-devel >= 2.4 BuildRequires: glib2-devel +BuildRequires: kiran-qt5-integration-devel >= 2.4 + Requires: qt5-qtbase Requires: qt5-qtx11extras Requires: qt5-qtsvg Requires: kiran-log-qt5 -Requires: kiran-widgets-qt5 +Requires: kiran-widgets-qt5 >= 2.4 Requires: glib2 +Requires: kiran-qt5-integration >= 2.4 %description -n kiran-cpanel-launcher %{summary}. @@ -68,16 +108,29 @@ make %{?_smp_mflags} %make_install %files +#主面板 %dir %{_datadir}/kiran-control-panel %{_bindir}/kiran-control-panel -%{_datadir}/icons/hicolor/kiran-control-panel.svg %{_datadir}/kiran-control-panel/* -%exclude %{_datadir}/kiran-control-panel/translations/kiran-cpanel-launcher* +%{_datadir}/icons/hicolor/* %exclude %{_datadir}/applications/kiran-control-panel.desktop +#account +%{_sysconfdir}/kiran-cpanel-account/ +%{_libexecdir}/kiran-avatar-editor +%{_datadir}/kiran-cpanel-account/* + +#audio +%{_sysconfdir}/xdg/autostart/kiran-audio-status-icon.desktop +%{_bindir}/kiran-audio-status-icon + +#network +%{_sysconfdir}/xdg/autostart/kiran-network-status-icon.desktop +%{_bindir}/kiran-network-status-icon +/etc/NetworkManager/conf.d/00-server.conf + %files -n kiran-cpanel-launcher %{_bindir}/kiran-cpanel-launcher -%{_datadir}/kiran-control-panel/translations/kiran-cpanel-launcher* %files devel %dir %{_includedir}/kiran-control-panel @@ -88,6 +141,87 @@ make %{?_smp_mflags} rm -rf %{buildroot} %changelog +* Thu Nov 03 2022 liuxinhao - 2.4.0-1 +- KYOS-F: release 2.4,new plugin interface,using color block design + +* Tue Sep 06 2022 luoqing - 2.3.5-2 +- KYOS-F: Fix V-P-N self-test defects + +* Mon Sep 05 2022 luoqing - 2.3.5-1 +- KYOS-F: Fix the network connection status does not change after unplugging the network cable (#I5I0AA) +- KYOS-F: Fix network tay crash (#I5OKBR) +- KYOS-F: Optimized prompt pop-up box, consistent with the overall style (#I5O86G) +- KYOS-F: Re add the network profile during installation to overwrite the original configuration + +* Mon Sep 05 2022 liuxinhao - 2.3.4-10 +- KYOS-F: move some account management controls to common component library + +* Thu Aug 25 2022 luoqing - 2.3.4-9 +- KYOS-F: Add labels to volume and network plugins to support automated testing +- KYOS-F: Temporarily do not overwrite the NetworkManager configuration and optimize the code + +* Thu Aug 25 2022 liuxinhao - 2.3.4-8 +- KYOS-F: updates accessiblename,support automated testing + +* Tue Aug 23 2022 luoqing - 2.3.4-7 +- KYOS-F: fix the problem of network and details corresponding error(#I5M0L9) +- KYOS-F: Add error prompt box when saving configuration(#I5GYQD) +- KYOS-F: fix invalid configuration created for the first time +- KYOS-F: fix crash and wireless network disable function defects + +* Thu Aug 18 2022 liuxinhao - 2.3.4-6 +- KYOS-F: account the connection singleton in the signal slot is not automatically disconnected because the receiver parameter is not added, resulting in a crash(#I5HRYF) +- KYOS-F: power ,remove invalid idle shutdown display option(#I5M336) + +* Wed Aug 10 2022 liuxinhao - 2.3.4-5 +- KYOS-B: error prompt box is added with the default disappearance time(#I5HR61) +- KYOS-B: when the relevant setting interface cannot be searched, a prompt will be added(#I5H192) + +* Tue Aug 09 2022 liuxinhao - 2.3.4-4 +- KYOS-F: set panel creategory widget auto fill background + +* Fri Aug 05 2022 luoqing - 2.3.4-3 +- KYOS-B: fix not searching the wireless network for a long time after the WiFi connection is successful(#I5IPVO) + +* Thu Aug 04 2022 liuxinhao - 2.3.4-2 +- KYOS-B: update systeminfo plugin dialog style(#I5H3YX) +- KYOS-B: buttons on system information page are not fully dispalyed(#I5H229) + +* Mon Aug 01 2022 luoqing - 2.3.4-1 +- KYOS-B: fix no notification when connecting to the hidden network(#I5IS25) +- KYOS-B: the tray network icon changes as the primary connection changes(#I5IPBG) +- KYOS-B: fix the lack of operation buttons and button translation in more interfaces connected to WiFi(#I5IQ03,#I5IPY3) + +* Fri Jul 29 2022 liuxinhao - 2.3.3-1 +- KYOS-B: fix the error in the animation display of the Create Account button(#I5HR7F) +- KYOS-B: forbidden to create users with uid less than 1000(#I5HZQF) +- KYOS-B: fix the problem that the user-defined shortcut key type is wrong due to adding shortcut keys(#I5IE4B) + +* Fri Jul 22 2022 luoqing - 2.3.2-1 +- KYOS-B: fix some bugs of network and audio plugins + +* Tue Jul 12 2022 liuxinhao - 2.3.1-4 +- KYOS-B: fix kiran control panel translator + +* Mon Jul 11 2022 liuxinhao - 2.3.1-3 +- KYOS-B: fix system infomation plugin build require + +* Mon Jul 11 2022 luoqing - 2.3.1-2 +- KYOS-B: fix unplugging headphones causes crash + +* Sat Jul 09 2022 liuxinhao - 2.3.1-1 +- KYOS-F: add network plugin +- KYOS-F: fix kiran-control-panel titlebar translation + +* Fri Jul 08 2022 liuxinhao - 2.3.0-3 +- KYOS-F: remove useless pkgconfig file + +* Fri Jul 08 2022 liuxinhao - 2.3.0-2 +- KYOS-F: temporarily shield the network plugin + +* Thu Jul 07 2022 liuxinhao - 2.3.0-1 +- KYOS-F: release kiran-control-panel 2.3 + * Mon Jan 24 2022 longcheng - 2.2.0-2.kb3 - KYOS-B: fix(build): fix incomplete type 'class QPainterPath' build diff --git a/kiran-control-panel.yaml b/kiran-control-panel.yaml new file mode 100644 index 0000000..0640149 --- /dev/null +++ b/kiran-control-panel.yaml @@ -0,0 +1,4 @@ +version_control: gitee +src_repo: https://gitee.com/openeuler/kiran-control-panel.git +tag_prefix: "v" +seperator: "."