diff --git a/0000-fix-build-fix-compilation-errors-on-OpenEuler-c0d33c40.patch b/0000-fix-build-fix-compilation-errors-on-OpenEuler-c0d33c40.patch new file mode 100644 index 0000000..5bb6d74 --- /dev/null +++ b/0000-fix-build-fix-compilation-errors-on-OpenEuler-c0d33c40.patch @@ -0,0 +1,30 @@ +From c0d33c40612d05f4b46474566300fd62fb379da4 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Thu, 20 Jan 2022 15:29:42 +0800 +Subject: [PATCH] fix(build): fix compilation errors on OpenEuler +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修复位于OpenEluer上的编译错误 + +Signed-off-by: liuxinhao +--- + src/widgets/kiran-titlebar-window/global_define.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/widgets/kiran-titlebar-window/global_define.h b/src/widgets/kiran-titlebar-window/global_define.h +index e9d9d7c..6361a0e 100644 +--- a/src/widgets/kiran-titlebar-window/global_define.h ++++ b/src/widgets/kiran-titlebar-window/global_define.h +@@ -21,7 +21,7 @@ + #define DEFAULT_THEME_PATH ":/kiranwidgets-qt5/themes/kiran-titlebar-window_black.qss" + + namespace Kiran { +- ++ Q_NAMESPACE + enum CursorPositionEnum{ + CursorPosition_None = 0x00000000, + CursorPosition_Top = 0x00000001, +-- +2.27.0 diff --git a/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch b/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch new file mode 100644 index 0000000..5736cef --- /dev/null +++ b/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch @@ -0,0 +1,109 @@ +From 50c6ad957b53138a6d37b462219cf44a5604f5a1 Mon Sep 17 00:00:00 2001 +From: kylinsecos_admin +Date: Sat, 22 Jan 2022 16:09:15 +0800 +Subject: [PATCH] fix(build): fix incomplete type 'class QPainterPath' build + error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 修复编译时未正确引入QPainterPath的问题 +--- + src/kiran-style/draw-helper/draw-button-helper.cpp | 1 + + src/kiran-style/draw-helper/draw-combo-box-helper.cpp | 3 ++- + src/kiran-style/draw-helper/draw-common-helper.cpp | 3 ++- + src/kiran-style/draw-helper/draw-image-selector-helper.cpp | 2 +- + src/kiran-style/draw-helper/draw-slider-helper.cpp | 1 + + src/kiran-style/draw-helper/draw-tab-bar-helper.cpp | 1 + + 6 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/kiran-style/draw-helper/draw-button-helper.cpp b/src/kiran-style/draw-helper/draw-button-helper.cpp +index 02c1eda..a7073a0 100644 +--- a/src/kiran-style/draw-helper/draw-button-helper.cpp ++++ b/src/kiran-style/draw-helper/draw-button-helper.cpp +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #include "style.h" + #include "draw-common-helper.h" +diff --git a/src/kiran-style/draw-helper/draw-combo-box-helper.cpp b/src/kiran-style/draw-helper/draw-combo-box-helper.cpp +index cdded8c..93e5492 100644 +--- a/src/kiran-style/draw-helper/draw-combo-box-helper.cpp ++++ b/src/kiran-style/draw-helper/draw-combo-box-helper.cpp +@@ -17,6 +17,7 @@ + #include "draw-common-helper.h" + #include "style.h" + ++#include + #include + #include + #include +@@ -248,4 +249,4 @@ bool DrawComboBoxHelper::drawComboBoxMenuItem(const Kiran::Style *style, const Q + } + + return true; +-} +\ No newline at end of file ++} +diff --git a/src/kiran-style/draw-helper/draw-common-helper.cpp b/src/kiran-style/draw-helper/draw-common-helper.cpp +index 1a64cd4..171854d 100644 +--- a/src/kiran-style/draw-helper/draw-common-helper.cpp ++++ b/src/kiran-style/draw-helper/draw-common-helper.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + using namespace Kiran; + +@@ -483,4 +484,4 @@ void DrawCommonHelper::renderProgressBarGroove(QPainter* painter, const QRect& r + painter->setBrush( color ); + painter->drawRect( baseRect.translated(0.5, 0.5) ); + } +-} +\ No newline at end of file ++} +diff --git a/src/kiran-style/draw-helper/draw-image-selector-helper.cpp b/src/kiran-style/draw-helper/draw-image-selector-helper.cpp +index c7a075b..29d21bf 100644 +--- a/src/kiran-style/draw-helper/draw-image-selector-helper.cpp ++++ b/src/kiran-style/draw-helper/draw-image-selector-helper.cpp +@@ -21,7 +21,7 @@ + #include + #include + #include +- ++#include + void Kiran::DrawImageSelectorHelper::drawPEKiranImageSelector(const Kiran::Style *style, const QStyleOption *opt, + QPainter *p, Kiran::StyleDetailFetcher *fetcher, + const QWidget *widget) { +diff --git a/src/kiran-style/draw-helper/draw-slider-helper.cpp b/src/kiran-style/draw-helper/draw-slider-helper.cpp +index 38597ee..c8b6a30 100644 +--- a/src/kiran-style/draw-helper/draw-slider-helper.cpp ++++ b/src/kiran-style/draw-helper/draw-slider-helper.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + bool Kiran::DrawSliderHelper::drawSliderComplexControl(const Kiran::Style * style, + const QStyleOptionComplex *opt, +diff --git a/src/kiran-style/draw-helper/draw-tab-bar-helper.cpp b/src/kiran-style/draw-helper/draw-tab-bar-helper.cpp +index 81875dd..eef9f10 100644 +--- a/src/kiran-style/draw-helper/draw-tab-bar-helper.cpp ++++ b/src/kiran-style/draw-helper/draw-tab-bar-helper.cpp +@@ -18,6 +18,7 @@ + #include "kiran-style-private-defines.h" + + #include ++#include + #include + #include + +-- +1.8.3.1 + diff --git a/kiran-widgets-qt5-2.1.2.tar.gz b/kiran-widgets-qt5-2.1.2.tar.gz deleted file mode 100644 index 692d9d8..0000000 Binary files a/kiran-widgets-qt5-2.1.2.tar.gz and /dev/null differ diff --git a/kiran-widgets-qt5-2.2.0.tar.gz b/kiran-widgets-qt5-2.2.0.tar.gz new file mode 100644 index 0000000..7100867 Binary files /dev/null and b/kiran-widgets-qt5-2.2.0.tar.gz differ diff --git a/kiran-widgets-qt5.spec b/kiran-widgets-qt5.spec index 5295b5e..b0a9c4c 100644 --- a/kiran-widgets-qt5.spec +++ b/kiran-widgets-qt5.spec @@ -1,13 +1,15 @@ Name: kiran-widgets-qt5 -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.2.0 +Release: 2.kb4 Summary: Encapsulated QT Widget Summary(zh_CN): 封装的Qt小部件 License: Mulan PSL v2 -#URL: Source0: %{name}-%{version}.tar.gz +Patch1: 0000-fix-build-fix-compilation-errors-on-OpenEuler-c0d33c40.patch +Patch2: 0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch + BuildRequires: cmake >= 3.5 BuildRequires: gcc-c++ BuildRequires: libX11-devel @@ -19,6 +21,7 @@ BuildRequires: gsettings-qt-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qt5-linguist BuildRequires: gsettings-qt +BuildRequires: qt5-qtbase-private-devel Requires: libX11 Requires: libxcb @@ -28,12 +31,15 @@ Requires: qt5-qtx11extras Requires: qt5-qtsvg Requires: gsettings-qt +Obsoletes: kiranwidgets-qt5 + %description %{summary}. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: kiranwidgets-qt5-devel %description devel %{summary}. @@ -54,7 +60,6 @@ make %{?_smp_mflags} %install %make_install - %files %{_libdir}/libkiranwidgets-qt5.so* %{_datadir}/kiranwidgets-qt5/translations/* @@ -70,10 +75,35 @@ make %{?_smp_mflags} rm -rf %{buildroot} %changelog -* Mon Oct 18 2021 xiewenhao - 2.1.2-1 -- KYOS: rebuild for KiranUI-2.1-OE (#43502) +* Fri Jan 21 2022 liuxinhao - 2.2.0-2.kb4 +- KYOS-B: add BuildRequires: qt5-qtbase-private-devel +- KYOS-B: fix compilation errors on OpenEuler -* Fri Sep 17 2021 liuxinhao - 2.1.2.kb1 +* Tue Jan 11 2022 caoyuanji - 2.2.0-2.kb3 +- rebuild for KY3.4-5-Kiran-base-2.2 + +* Tue Jan 11 2022 caoyuanji - 2.2.0-2.kb2 +- rebuild for KY3.4-5-Kiran-base-2.2 + +* Wed Dec 29 2021 kpkg - 2.2.0-2.kb1 +- rebuild for KY3.4-MATE-modules-dev + +* Wed Dec 29 2021 caoyuanji - 2.2.0-2 +- Upgrade version number for easy upgrade + +* Mon Dec 20 2021 caoyuanji - 2.2.0-1.kb4 +- rebuild for KY3.4-4-KiranUI-2.2 + +* Mon Dec 20 2021 caoyuanji - 2.2.0-1.kb3 +- rebuild for KY3.4-4-KiranUI-2.2 + +* Mon Nov 08 2021 liuxinhao - 2.2.0-1.kb2 +- KYBD: set kiranwidgets-qt5 obsoleted + +* Thu Nov 04 2021 liuxinhao - 2.2.0-1.kb1 +- KYBD: rebuild + +* Fri Sep 17 2021 liuxinhao - 2.1.2.kb1 - KYOS-B: add interface to set titlebar height * Fri Jul 16 2021 liuxinhao - 2.1.1.kb1