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 0000000000000000000000000000000000000000..5bb6d74520c3bb1dbafa8f90f4239e2dd4a9f471 --- /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/kiran-widgets-qt5-2.1.2.tar.gz b/kiran-widgets-qt5-2.1.2.tar.gz deleted file mode 100644 index 692d9d8e38c897af787fe427846cac2ca817a8ed..0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..7100867000cac9eeb4dd3d6ab7af6597070cbe03 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 5295b5eed1854612f5a28ca6d3f3f7c1048369e6..2a800ae277f7efaeceac107999a92ff921995f5a 100644 --- a/kiran-widgets-qt5.spec +++ b/kiran-widgets-qt5.spec @@ -1,12 +1,12 @@ Name: kiran-widgets-qt5 -Version: 2.1.2 -Release: 2%{?dist} +Version: 2.2.0 +Release: 2.kb3 Summary: Encapsulated QT Widget Summary(zh_CN): 封装的Qt小部件 License: Mulan PSL v2 -#URL: Source0: %{name}-%{version}.tar.gz +Patch0001: 0000-fix-build-fix-compilation-errors-on-OpenEuler-c0d33c40.patch BuildRequires: cmake >= 3.5 BuildRequires: gcc-c++ @@ -28,12 +28,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 +57,6 @@ make %{?_smp_mflags} %install %make_install - %files %{_libdir}/libkiranwidgets-qt5.so* %{_datadir}/kiranwidgets-qt5/translations/* @@ -70,10 +72,34 @@ make %{?_smp_mflags} rm -rf %{buildroot} %changelog -* Mon Oct 18 2021 xiewenhao - 2.1.2-1 -- KYOS: rebuild for KiranUI-2.1-OE (#43502) +* Thu Jan 20 2022 liuxinhao - 2.2.0-2.kb4 +- KYOS-B: fix compilation errors on OpenEuler + +* 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 +* 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