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/0001-refactor-network-temporarily-shield-the-network-plug.patch b/0001-refactor-network-temporarily-shield-the-network-plug.patch new file mode 100644 index 0000000..66335b9 --- /dev/null +++ b/0001-refactor-network-temporarily-shield-the-network-plug.patch @@ -0,0 +1,30 @@ +From 931d1ebefe488cec59e7b0bb6930481ff0a4ef55 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Thu, 7 Jul 2022 15:32:24 +0800 +Subject: [PATCH 1/2] refactor(network): temporarily shield the network plug-in +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 暂时屏蔽掉network插件 +--- + plugins/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt +index b477d54..d96632f 100644 +--- a/plugins/CMakeLists.txt ++++ b/plugins/CMakeLists.txt +@@ -8,7 +8,7 @@ add_subdirectory(audio) + add_subdirectory(account) + add_subdirectory(keyboard) + add_subdirectory(timedate) +-add_subdirectory(network) ++#add_subdirectory(network) + add_subdirectory(display) + add_subdirectory(keybinding) + add_subdirectory(appearance) +\ No newline at end of file +-- +2.33.0 + diff --git a/0002-build-pkgconfig-remove-useless-pkgconfig-file.patch b/0002-build-pkgconfig-remove-useless-pkgconfig-file.patch new file mode 100644 index 0000000..157929f --- /dev/null +++ b/0002-build-pkgconfig-remove-useless-pkgconfig-file.patch @@ -0,0 +1,27 @@ +From 16c73eb8c1d943d4c07a4c81224eca4d641a8785 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Fri, 8 Jul 2022 10:30:12 +0800 +Subject: [PATCH 2/2] build(pkgconfig): remove useless pkgconfig file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 移除掉无用的pkgconfig文件 +--- + data/CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt +index 1bbde27..c798986 100644 +--- a/data/CMakeLists.txt ++++ b/data/CMakeLists.txt +@@ -1,6 +1 @@ +-#pkgconfig +-configure_file(kiran-control-panel.pc.in kiran-control-center.pc @ONLY) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kiran-control-center.pc +- DESTINATION ${INSTALL_LIBDIR}/pkgconfig/) +- + install(DIRECTORY hicolor DESTINATION ${INSTALL_DATADIR}/icons/) +-- +2.33.0 + 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.3.0.tar.gz b/kiran-control-panel-2.3.0.tar.gz new file mode 100644 index 0000000..30bf001 Binary files /dev/null and b/kiran-control-panel-2.3.0.tar.gz differ diff --git a/kiran-control-panel.spec b/kiran-control-panel.spec index c587b18..fc078c5 100644 --- a/kiran-control-panel.spec +++ b/kiran-control-panel.spec @@ -1,30 +1,53 @@ Name: kiran-control-panel -Version: 2.2.0 -Release: 2.kb3 +Version: 2.3.0 +Release: 3 Summary: Kiran Control Panel Summary(zh_CN): Kiran桌面控制面板 -License: Mulan PSL v2 +License: Mulan PSL v2 Source0: %{name}-%{version}.tar.gz -Patch0: 0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch +Patch0001: 0001-refactor-network-temporarily-shield-the-network-plug.patch +Patch0002: 0002-build-pkgconfig-remove-useless-pkgconfig-file.patch BuildRequires: gcc-c++ BuildRequires: cmake >= 3.2 +BuildRequires: glib2-devel +BuildRequires: upower-devel +BuildRequires: zeromq-devel +BuildRequires: libnotify-devel +BuildRequires: pam-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-qtx11extras Requires: qt5-qtsvg +Requires: qt5-qtmultimedia +Requires: kf5-networkmanager-qt + Requires: kiran-log-qt5 Requires: kiran-widgets-qt5 +Requires: kiran-qt5-integration +Requires: kiran-system-daemon +Requires: kiran-session-daemon + Requires: glib2 +Requires: upower +Requires: zeromq +Requires: libnotify +Requires: pam %description Kiran Control Panel @@ -41,12 +64,15 @@ BuildRequires: qt5-linguist BuildRequires: kiran-log-qt5-devel BuildRequires: kiran-widgets-qt5-devel BuildRequires: glib2-devel +BuildRequires: kiran-qt5-integration-devel + Requires: qt5-qtbase Requires: qt5-qtx11extras Requires: qt5-qtsvg Requires: kiran-log-qt5 Requires: kiran-widgets-qt5 Requires: glib2 +Requires: kiran-qt5-integration %description -n kiran-cpanel-launcher %{summary}. @@ -68,13 +94,37 @@ 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/* +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/* %exclude %{_datadir}/kiran-control-panel/translations/kiran-cpanel-launcher* %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 +%{_datadir}/kiran-cpanel-audio/translations/* + +#display +%{_datadir}/kiran-cpanel-display/translations/* + +#mouse +%{_datadir}/kiran-cpanel-mouse/translations/* + +#power +%{_datadir}/kiran-cpanel-power/translations/* + +#system +%{_datadir}/kiran-cpanel-system/translations/* + %files -n kiran-cpanel-launcher %{_bindir}/kiran-cpanel-launcher %{_datadir}/kiran-control-panel/translations/kiran-cpanel-launcher* @@ -88,6 +138,15 @@ make %{?_smp_mflags} rm -rf %{buildroot} %changelog +* 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