diff --git a/0001-change-libqt5-ukui-style-Requires-Qt5Widgets-Version.patch b/0001-change-libqt5-ukui-style-Requires-Qt5Widgets-Version.patch deleted file mode 100644 index fa218cc..0000000 --- a/0001-change-libqt5-ukui-style-Requires-Qt5Widgets-Version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a4243af27423d085a875f24ef02ba998a0aef6b5 Mon Sep 17 00:00:00 2001 -From: huayadong -Date: Fri, 4 Jun 2021 15:22:53 +0800 -Subject: [PATCH] change libqt5-ukui-style Requires Qt5Widgets Version - restrictions - ---- - libqt5-ukui-style/development-files/qt5-ukui.pc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libqt5-ukui-style/development-files/qt5-ukui.pc b/libqt5-ukui-style/development-files/qt5-ukui.pc -index 6c41464..6e9ae5a 100755 ---- a/libqt5-ukui-style/development-files/qt5-ukui.pc -+++ b/libqt5-ukui-style/development-files/qt5-ukui.pc -@@ -1,7 +1,7 @@ - Name: libqt5-ukui-style - Description: UKUI style API for secondary development. - Home Page: https://github.com/ukui/qt5-ukui-platformtheme --Requires: Qt5Widgets >= 5.12.1 glib-2.0 gio-2.0 gsettings-qt -+Requires: Qt5Widgets glib-2.0 gio-2.0 gsettings-qt - Version: 1.0.0 - Libs: -L/usr/lib -L/usr/lib/x86_64-linux-gnu -lqt5-ukui-style - Cflags: -I/usr/include/qt5-ukui --- -2.27.0 - diff --git a/0002-Fix-return-type-errors.patch b/0002-Fix-return-type-errors.patch deleted file mode 100644 index dda0c85..0000000 --- a/0002-Fix-return-type-errors.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 63efc3ee8bb71fc840a0a33bb708a548fdb88ad4 Mon Sep 17 00:00:00 2001 -From: tanyulong -Date: Tue, 2 Nov 2021 11:37:02 +0800 -Subject: [PATCH] Fix return type errors - ---- - libqt5-ukui-style/gestures/ukui-two-finger-slide-gesture.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libqt5-ukui-style/gestures/ukui-two-finger-slide-gesture.cpp b/libqt5-ukui-style/gestures/ukui-two-finger-slide-gesture.cpp -index bbe5562..81ac373 100755 ---- a/libqt5-ukui-style/gestures/ukui-two-finger-slide-gesture.cpp -+++ b/libqt5-ukui-style/gestures/ukui-two-finger-slide-gesture.cpp -@@ -46,6 +46,7 @@ int TwoFingerSlideGesture::delta() - case Invalid: - return 0; - } -+ return 0; - } - - int TwoFingerSlideGesture::totalDelta() -@@ -58,6 +59,7 @@ int TwoFingerSlideGesture::totalDelta() - case Invalid: - return 0; - } -+ return 0; - } - - TwoFingerSlideGestureRecognizer::TwoFingerSlideGestureRecognizer() : QGestureRecognizer() --- -2.30.0 - diff --git a/0003-Modify-the-default-themename-is-ukui.patch b/0003-Modify-the-default-themename-is-ukui.patch deleted file mode 100644 index 723e0c0..0000000 --- a/0003-Modify-the-default-themename-is-ukui.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8251bc4568146c53f94948981d21c7f8dcbd7a37 Mon Sep 17 00:00:00 2001 -From: tanyulong -Date: Fri, 5 Nov 2021 15:06:34 +0800 -Subject: [PATCH] Modify the default themename is ukui - ---- - libqt5-ukui-style/settings/org.ukui.style.gschema.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libqt5-ukui-style/settings/org.ukui.style.gschema.xml b/libqt5-ukui-style/settings/org.ukui.style.gschema.xml -index d1ec892..36a6e93 100755 ---- a/libqt5-ukui-style/settings/org.ukui.style.gschema.xml -+++ b/libqt5-ukui-style/settings/org.ukui.style.gschema.xml -@@ -1,7 +1,7 @@ - - - -- "ukui-default" -+ "ukui" - Current Qt Style - Set default style for UKUI desktop environment. - --- -2.30.0 - diff --git a/0004-Modify-the-disable-status-font-alpha.patch b/0004-Modify-the-disable-status-font-alpha.patch deleted file mode 100644 index 45b0fbe..0000000 --- a/0004-Modify-the-disable-status-font-alpha.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a7cbad6a7099568acfba5c3877864e3cdfd13874 Mon Sep 17 00:00:00 2001 -From: tanyulong -Date: Mon, 8 Nov 2021 16:43:26 +0800 -Subject: [PATCH] Modify the disable status font alpha - ---- - ukui-styles/qt5-style-ukui/qt5-ukui-style.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ukui-styles/qt5-style-ukui/qt5-ukui-style.cpp b/ukui-styles/qt5-style-ukui/qt5-ukui-style.cpp -index b76d1cc..bf3001b 100755 ---- a/ukui-styles/qt5-style-ukui/qt5-ukui-style.cpp -+++ b/ukui-styles/qt5-style-ukui/qt5-ukui-style.cpp -@@ -399,7 +399,7 @@ QPalette Qt5UKUIStyle::standardPalette() const - font_br_bg.setRgb(255,255,255); - font_br_bg.setAlphaF(0.9); - font_di_bg.setRgb(255,255,255); -- font_di_bg.setAlphaF(0.1); -+ font_di_bg.setAlphaF(0.3); - button_bg.setRgb(61,61,65); - button_ac_bg.setRgb(48,48,51); - button_di_bg.setRgb(48,48,51); --- -2.30.0 - diff --git a/qt5-ukui-platformtheme-1.0.5.tar.gz b/qt5-ukui-platformtheme-1.0.5.tar.gz deleted file mode 100644 index 65b7427..0000000 Binary files a/qt5-ukui-platformtheme-1.0.5.tar.gz and /dev/null differ diff --git a/qt5-ukui-platformtheme-1.0.8.tar.gz b/qt5-ukui-platformtheme-1.0.8.tar.gz new file mode 100644 index 0000000..68c7c7b Binary files /dev/null and b/qt5-ukui-platformtheme-1.0.8.tar.gz differ diff --git a/qt5-ukui-platformtheme.spec b/qt5-ukui-platformtheme.spec index 1f2322d..ab6b8b5 100644 --- a/qt5-ukui-platformtheme.spec +++ b/qt5-ukui-platformtheme.spec @@ -1,9 +1,9 @@ %define debug_package %{nil} Name: qt5-ukui-platformtheme -Version: 1.0.5 -Release: 7 +Version: 1.0.8 +Release: 4 Summary: Qt5 QPA platform theme of UKUI -License: LGPL-3.0-or-later and GPL-3.0-or-later +License: LGPL-3.0+ GPL-3.0+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz @@ -17,17 +17,15 @@ BuildRequires: qt5-qtbase-devel #BuildRequires: qtbase5-dev-tools BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qttools-devel -BuildRequires: qt5-qtbase-static BuildRequires: qtchooser +BuildRequires: kf5-kwayland-devel +BuildRequires: libqtxdg-devel +BuildRequires: qt5-qtbase-static + Requires: libqt5-ukui-style1 Requires: qt5-styles-ukui Requires: glib2 -patch0: 0001-change-libqt5-ukui-style-Requires-Qt5Widgets-Version.patch -patch1: 0002-Fix-return-type-errors.patch -patch2: 0003-Modify-the-default-themename-is-ukui.patch -patch3: 0004-Modify-the-disable-status-font-alpha.patch - %description qt5-ukui-platformtheme is official platform theme of UKUI desktop environment. It also provides the common metadatas for ukui-styles @@ -87,10 +85,6 @@ Provides: libqt5-ukui-style %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build mkdir build && cd build @@ -107,7 +101,7 @@ cd %{_builddir}/%{name}-%{version}/build make INSTALL_ROOT=%{buildroot} install mkdir -p %{buildroot}/usr/include/qt5-ukui/ -cp -rf %{_builddir}/%{name}-%{version}/libqt5-ukui-style/*.h %{buildroot}/usr/include/qt5-ukui/ +#cp -rf %{_builddir}/%{name}-%{version}/libqt5-ukui-style/*.h %{buildroot}/usr/include/qt5-ukui/ cp -rf %{_builddir}/%{name}-%{version}/libqt5-ukui-style/*/*.h %{buildroot}/usr/include/qt5-ukui/ cp -rf %{_builddir}/%{name}-%{version}/libqt5-ukui-style/*/*/*.h %{buildroot}/usr/include/qt5-ukui/ @@ -117,6 +111,7 @@ rm -rf $RPM_BUILD_ROOT %files %doc debian/changelog debian/copyright %{_libdir}/qt5/plugins/platformthemes/*.so +/opt/messagebox/bin/messagebox %files -n qt5-styles-ukui %{_libdir}/qt5/plugins/styles/*.so @@ -126,14 +121,14 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/share/glib-2.0/schemas/org.ukui.style.gschema.xml %files -n libqt5-ukui-style-dev -#libqt5-ukui-style/*.h usr/include/qt5-ukui -#libqt5-ukui-style/*/*.h usr/include/qt5-ukui -#libqt5-ukui-style/*/*/*.h usr/include/qt5-ukui %{_prefix}/include/qt5-ukui/* %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %changelog +* Tue Jul 12 2022 peijiankang - 1.0.8-4 +- update version to 1.0.8 + * Thu May 19 2022 tanyulong - 1.0.5-7 - Improve the project according to the requirements of compliance improvement