This commit is contained in:
tanyulong2021 2022-03-02 15:22:59 +08:00
parent eaff9ce976
commit 2a8071dc5e
3 changed files with 8 additions and 36 deletions

View File

@ -1,25 +0,0 @@
From 073ba16c85607ccb52bb747225f3ab468aa78778 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Wed, 26 Jan 2022 10:13:54 +0800
Subject: [PATCH] fix xdgiconloader version path error
---
qt5-ukui-platformtheme/qt5-ukui-platform-theme.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qt5-ukui-platformtheme/qt5-ukui-platform-theme.cpp b/qt5-ukui-platformtheme/qt5-ukui-platform-theme.cpp
index 0d836de..c925954 100644
--- a/qt5-ukui-platformtheme/qt5-ukui-platform-theme.cpp
+++ b/qt5-ukui-platformtheme/qt5-ukui-platform-theme.cpp
@@ -30,7 +30,7 @@
#include <QApplication>
#include <QTimer>
-#include <qt5xdgiconloader/3.4.0/private/xdgiconloader/xdgiconloader_p.h>
+#include <qt5xdgiconloader/3.7.1/private/xdgiconloader/xdgiconloader_p.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
#include <QFileInfo>
--
2.33.0

Binary file not shown.

View File

@ -1,12 +1,11 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: qt5-ukui-platformtheme Name: qt5-ukui-platformtheme
Version: 1.0.8 Version: 1.0.8
Release: 1 Release: 2
Summary: Qt5 QPA platform theme of UKUI Summary: Qt5 QPA platform theme of UKUI
License: LGPL-3.0+ GPL-3.0+ License: LGPL-3.0+ GPL-3.0+
URL: http://www.ukui.org URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch0: 0001-fix-xdgiconloader-version-path-error.patch
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtx11extras-devel
@ -19,7 +18,6 @@ BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-private-devel
BuildRequires: qt5-qttools-devel BuildRequires: qt5-qttools-devel
BuildRequires: qtchooser BuildRequires: qtchooser
BuildRequires: qtchooser
BuildRequires: kf5-kwayland-devel BuildRequires: kf5-kwayland-devel
BuildRequires: libqtxdg-devel BuildRequires: libqtxdg-devel
BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-static
@ -86,7 +84,6 @@ Provides: libqt5-ukui-style
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
mkdir build && cd build mkdir build && cd build
@ -104,8 +101,8 @@ make INSTALL_ROOT=%{buildroot} install
mkdir -p %{buildroot}/usr/include/qt5-ukui/ 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/
#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/
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -113,6 +110,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%doc debian/changelog debian/copyright %doc debian/changelog debian/copyright
%{_libdir}/qt5/plugins/platformthemes/*.so %{_libdir}/qt5/plugins/platformthemes/*.so
/opt/messagebox/bin/messagebox
%files -n qt5-styles-ukui %files -n qt5-styles-ukui
%{_libdir}/qt5/plugins/styles/*.so %{_libdir}/qt5/plugins/styles/*.so
@ -122,15 +120,14 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/share/glib-2.0/schemas/org.ukui.style.gschema.xml %{_prefix}/share/glib-2.0/schemas/org.ukui.style.gschema.xml
%files -n libqt5-ukui-style-dev %files -n libqt5-ukui-style-dev
#libqt5-ukui-style/*.h usr/include/qt5-ukui %{_prefix}/include/qt5-ukui/*
#libqt5-ukui-style/*/*.h usr/include/qt5-ukui
#libqt5-ukui-style/*/*/*.h usr/include/qt5-ukui
#%{_prefix}/include/qt5-ukui/*
/opt/messagebox/bin/messagebox
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so %{_libdir}/*.so
%changelog %changelog
* Wed Mar 02 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.8-2
- rebuild
* Tue Jan 25 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.8 * Tue Jan 25 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.8
- update version 1.0.8-1 - update version 1.0.8-1