diff --git a/0001-fix-build-Adapt-to-kiran-widgets-qt5-interface-upgra.patch b/0001-fix-build-Adapt-to-kiran-widgets-qt5-interface-upgra.patch new file mode 100644 index 0000000..ff41d7b --- /dev/null +++ b/0001-fix-build-Adapt-to-kiran-widgets-qt5-interface-upgra.patch @@ -0,0 +1,29 @@ +From 3d4832b7c8e4329324f1423d97be68d8de6e19e8 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Fri, 4 Nov 2022 10:16:31 +0800 +Subject: [PATCH] fix(build): Adapt to kiran-widgets-qt5 interface upgrade +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 适配kiran-widgets-qt5接口升级,解决编译问题 +--- + src/widgets/lineedit-with-checkicon.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/widgets/lineedit-with-checkicon.cpp b/src/widgets/lineedit-with-checkicon.cpp +index ede5cbb..7728e1d 100644 +--- a/src/widgets/lineedit-with-checkicon.cpp ++++ b/src/widgets/lineedit-with-checkicon.cpp +@@ -47,7 +47,7 @@ void LineEditWithCheckIcon::initUI() + { + setContextMenuPolicy(Qt::NoContextMenu); + setIconSize(QSize(16, 16)); +- setIconPosition(Kiran::ICON_POSITION_RIGHT); ++ setIconPosition(KiranIconLineEdit::ICON_POSITION_RIGHT); + setAlignment(Qt::AlignLeft | Qt::AlignVCenter); + connect(this, &QLineEdit::textChanged, [this](const QString &text) { + ///密码框输入密码不为空的情况下调整字体和字间距 +-- +2.33.0 + diff --git a/kiran-cpanel-account.spec b/kiran-cpanel-account.spec index f6d2020..4e85bfb 100644 --- a/kiran-cpanel-account.spec +++ b/kiran-cpanel-account.spec @@ -1,6 +1,6 @@ Name: kiran-cpanel-account Version: 2.2.0 -Release: 6 +Release: 7 Summary: Kiran Account Manager Summary(zh_CN): 用户管理工具 @@ -11,6 +11,8 @@ Patch0001: 0000-fix-control-center-fix-kiran-session-account-managem-97343173.pa Patch0002: 0002-fix-create-user-the-user-was-created-successfully-bu-60fd3816.patch Patch0003: 0003-fix-build-fix-incomplete-type-class-QPainterPath-bui-8c9d4052.patch Patch0004: 0004-fix-create-user-Remove-the-prefix-Create-User-Failed-dfba753b.patch +Patch0005: 0001-fix-build-Adapt-to-kiran-widgets-qt5-interface-upgra.patch + BuildRequires: cmake BuildRequires: gcc-c++ @@ -87,6 +89,9 @@ fi rm -rf %{buildroot} %changelog +* Fri Nov 04 2022 liuxinhao - 2.2.0-7 +- KYOS-F: fix build error,adapt to kiran-widgets-qt5 interface upgrade + * Wed Aug 10 2022 luoqing - 2.2.0-6 - KYOS-F: Modify license.