Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
35c9c55997
!49 add build debuginfo and debugsource
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2023-02-08 09:11:08 +00:00
peijiankang
2286ea7cbd add build debuginfo and debugsource 2023-02-08 14:12:29 +08:00
openeuler-ci-bot
af76bb3be3
!48 update to 3.1.4
From: @jackssir 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2023-01-09 06:14:45 +00:00
lvfei
72501b347e update to 3.1.4 2022-12-29 02:55:38 -05:00
openeuler-ci-bot
73d1d5a110
!46 Improve the project according to the requirements of compliance improvement
From: @tanyulong2021 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2022-12-15 05:41:58 +00:00
tanyulong2021
9e6d574f97 Improve the project according to the requirements of compliance improvement 2022-12-15 11:24:03 +08:00
openeuler-ci-bot
23e07bc1f9
!44 update upstream version 3.1.3
From: @tanyulong2021 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-12-15 03:07:19 +00:00
tanyulong2021
6f848fa32d update upstream version 3.1.3 2022-12-12 10:31:48 +08:00
openeuler-ci-bot
a832b8c906
!40 update version to 1.0.8
From: @peijiankang 
Reviewed-by: @tanyulong2021 
Signed-off-by: @tanyulong2021
2022-07-12 08:18:10 +00:00
peijiankang
4768c44fe8 update version to 1.0.8 2022-07-12 15:54:26 +08:00
7 changed files with 26 additions and 130 deletions

View File

@ -1,26 +0,0 @@
From a4243af27423d085a875f24ef02ba998a0aef6b5 Mon Sep 17 00:00:00 2001
From: huayadong <huayadong@kylinos.cn>
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

View File

@ -1,32 +0,0 @@
From 63efc3ee8bb71fc840a0a33bb708a548fdb88ad4 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
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

View File

@ -1,25 +0,0 @@
From 8251bc4568146c53f94948981d21c7f8dcbd7a37 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
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 @@
<schemalist>
<schema id="org.ukui.style" path="/org/ukui/style/" gettext-domain="style">
<key type="s" name="style-name">
- <default>"ukui-default"</default>
+ <default>"ukui"</default>
<summary>Current Qt Style</summary>
<description>Set default style for UKUI desktop environment.</description>
</key>
--
2.30.0

View File

@ -1,25 +0,0 @@
From a7cbad6a7099568acfba5c3877864e3cdfd13874 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
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

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,6 @@
%define debug_package %{nil}
Name: qt5-ukui-platformtheme
Version: 1.0.5
Release: 7
Version: 3.1.4
Release: 2
Summary: Qt5 QPA platform theme of UKUI
License: LGPL-3.0-or-later and GPL-3.0-or-later
URL: http://www.ukui.org
@ -12,22 +11,19 @@ BuildRequires: qt5-qtx11extras-devel
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: gsettings-qt-devel
BuildRequires: pkgconf
#BuildRequires: qt5-qmake
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
BuildRequires: qt5-qtdeclarative-devel qt5-qtquickcontrols2-devel
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,15 +83,11 @@ Provides: libqt5-ukui-style
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
mkdir build && cd build
qmake-qt5 ..
make
%{qmake_qt5} ..
%{make_build}
%post
glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null ||:
@ -104,10 +96,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas &> /dev/null ||:
rm -rf $RPM_BUILD_ROOT
cd %{_builddir}/%{name}-%{version}/build
make INSTALL_ROOT=%{buildroot} install
%{make_install} INSTALL_ROOT=%{buildroot}
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/
@ -117,6 +108,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 +118,26 @@ 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
* Wed Feb 08 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.4-2
- add build debuginfo and debugsource
* Tue Dec 27 2022 lvfei<lvfei@kylinos.cn> - 3.1.4-1
- update upstream version 3.1.4
* Thu Dec 15 2022 tanyulong<tanyulong@kylinos.cn> - 3.1.3-2
- Improve the project according to the requirements of compliance improvement
* Mon Nov 21 2022 tanyulong <tanyulong@kylinos.cn> - 3.1.3-1
- update upstream version 3.1.3
* Tue Jul 12 2022 peijiankang <peijiankang@kylinos.cn> - 1.0.8-4
- update version to 1.0.8
* Thu May 19 2022 tanyulong<tanyulong@kylinos.cn> - 1.0.5-7
- Improve the project according to the requirements of compliance improvement