!9 添加网络插件,修复控制面板翻译问题
From: @liubuguiii Reviewed-by: @tangjie02 Signed-off-by: @tangjie02
This commit is contained in:
commit
005753acdf
@ -1,30 +0,0 @@
|
|||||||
From 931d1ebefe488cec59e7b0bb6930481ff0a4ef55 Mon Sep 17 00:00:00 2001
|
|
||||||
From: liuxinhao <liuxinhao@kylinsec.com.cn>
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
From 16c73eb8c1d943d4c07a4c81224eca4d641a8785 Mon Sep 17 00:00:00 2001
|
|
||||||
From: liuxinhao <liuxinhao@kylinsec.com.cn>
|
|
||||||
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
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
kiran-control-panel-2.3.1.tar.gz
Normal file
BIN
kiran-control-panel-2.3.1.tar.gz
Normal file
Binary file not shown.
@ -1,15 +1,12 @@
|
|||||||
Name: kiran-control-panel
|
Name: kiran-control-panel
|
||||||
Version: 2.3.0
|
Version: 2.3.1
|
||||||
Release: 3
|
Release: 1
|
||||||
Summary: Kiran Control Panel
|
Summary: Kiran Control Panel
|
||||||
Summary(zh_CN): Kiran桌面控制面板
|
Summary(zh_CN): Kiran桌面控制面板
|
||||||
|
|
||||||
License: Mulan PSL v2
|
License: Mulan PSL v2
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
|
|
||||||
Patch0001: 0001-refactor-network-temporarily-shield-the-network-plug.patch
|
|
||||||
Patch0002: 0002-build-pkgconfig-remove-useless-pkgconfig-file.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: cmake >= 3.2
|
BuildRequires: cmake >= 3.2
|
||||||
BuildRequires: glib2-devel
|
BuildRequires: glib2-devel
|
||||||
@ -49,6 +46,9 @@ Requires: zeromq
|
|||||||
Requires: libnotify
|
Requires: libnotify
|
||||||
Requires: pam
|
Requires: pam
|
||||||
|
|
||||||
|
#Requires: NetworkManager-pptp
|
||||||
|
#Requires: NetworkManager-l2tp
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Kiran Control Panel
|
Kiran Control Panel
|
||||||
|
|
||||||
@ -113,6 +113,11 @@ make %{?_smp_mflags}
|
|||||||
%{_bindir}/kiran-audio-status-icon
|
%{_bindir}/kiran-audio-status-icon
|
||||||
%{_datadir}/kiran-cpanel-audio/translations/*
|
%{_datadir}/kiran-cpanel-audio/translations/*
|
||||||
|
|
||||||
|
#network
|
||||||
|
%{_sysconfdir}/xdg/autostart/kiran-network-status-icon.desktop
|
||||||
|
%{_bindir}/kiran-network-status-icon
|
||||||
|
%{_datadir}/kiran-control-panel/translations/*
|
||||||
|
|
||||||
#display
|
#display
|
||||||
%{_datadir}/kiran-cpanel-display/translations/*
|
%{_datadir}/kiran-cpanel-display/translations/*
|
||||||
|
|
||||||
@ -138,6 +143,10 @@ make %{?_smp_mflags}
|
|||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jul 09 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.3.1-1
|
||||||
|
- KYOS-F: add network plugin
|
||||||
|
- KYOS-F: fix kiran-control-panel titlebar translation
|
||||||
|
|
||||||
* Fri Jul 08 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.3.0-3
|
* Fri Jul 08 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.3.0-3
|
||||||
- KYOS-F: remove useless pkgconfig file
|
- KYOS-F: remove useless pkgconfig file
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user