build(system): change system information build requires
- 修改系统信息插件构建依赖库PrintSupport
This commit is contained in:
parent
309179d968
commit
2020de33fa
@ -0,0 +1,37 @@
|
||||
From ff0fefbe49bf121cbb35d83913e1b1a1b5e1fb50 Mon Sep 17 00:00:00 2001
|
||||
From: liuxinhao <liuxinhao@kylinsec.com.cn>
|
||||
Date: Mon, 11 Jul 2022 17:42:51 +0800
|
||||
Subject: [PATCH] build(system): add system plugin build library printsupport
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- 系统信息页编译加入Qt PrintSupport支持
|
||||
---
|
||||
plugins/system/CMakeLists.txt | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugins/system/CMakeLists.txt b/plugins/system/CMakeLists.txt
|
||||
index 7609e37..04b4b89 100644
|
||||
--- a/plugins/system/CMakeLists.txt
|
||||
+++ b/plugins/system/CMakeLists.txt
|
||||
@@ -7,7 +7,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
find_package(PkgConfig REQUIRED)
|
||||
-find_package(Qt5 COMPONENTS Widgets Svg DBus LinguistTools)
|
||||
+find_package(Qt5 COMPONENTS Widgets Svg DBus LinguistTools PrintSupport)
|
||||
pkg_search_module(KLOG_QT5 REQUIRED klog-qt5)
|
||||
pkg_search_module(KIRAN_CC_DAEMON REQUIRED kiran-cc-daemon)
|
||||
pkg_search_module(KIRAN_STYLE_HELPER REQUIRED kiran-style-helper)
|
||||
@@ -37,6 +37,7 @@ target_link_libraries(${TARGET_NAME}
|
||||
Qt5::Widgets
|
||||
Qt5::DBus
|
||||
Qt5::Svg
|
||||
+ Qt5::PrintSupport
|
||||
${KIRAN_WIDGETS_QT5_LIBRARIES}
|
||||
${KLOG_QT5_LIBRARIES}
|
||||
${KIRAN_STYLE_HELPER_LIBRARIES})
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: kiran-control-panel
|
||||
Version: 2.3.1
|
||||
Release: 2
|
||||
Release: 3
|
||||
Summary: Kiran Control Panel
|
||||
Summary(zh_CN): Kiran桌面控制面板
|
||||
|
||||
@ -8,6 +8,7 @@ License: Mulan PSL v2
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
Patch0001: 0001-feature-audio-fix-unplugging-headphones-causes-crash.patch
|
||||
Patch0002: 0001-build-system-add-system-plugin-build-library-printsu.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake >= 3.2
|
||||
@ -31,6 +32,7 @@ BuildRequires: kiran-qdbusxml2cpp
|
||||
BuildRequires: kiran-cc-daemon-devel
|
||||
|
||||
Requires: qt5-qtbase
|
||||
Requires: qt5-qtbase-gui
|
||||
Requires: qt5-qtx11extras
|
||||
Requires: qt5-qtsvg
|
||||
Requires: qt5-qtmultimedia
|
||||
@ -48,6 +50,16 @@ Requires: zeromq
|
||||
Requires: libnotify
|
||||
Requires: pam
|
||||
|
||||
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
|
||||
|
||||
#Requires: NetworkManager-pptp
|
||||
#Requires: NetworkManager-l2tp
|
||||
|
||||
@ -145,6 +157,9 @@ make %{?_smp_mflags}
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%changelog
|
||||
* Mon Jul 11 2022 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.3.1-3
|
||||
- KYOS-B: fix system infomation plugin build require
|
||||
|
||||
* Mon Jul 11 2022 luoqing <luoqing@kylinsec.com.cn> - 2.3.1-2
|
||||
- KYOS-B: fix unplugging headphones causes crash
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user