update to 5.1.12.3

This commit is contained in:
liweiganga 2022-02-25 13:57:57 +08:00
parent 18651a466e
commit cb9e021695
3 changed files with 44 additions and 10 deletions

View File

@ -0,0 +1,27 @@
From eae277082ff987b88287ea0db2becb5a72760b76 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Thu, 24 Feb 2022 20:29:00 +0800
Subject: [PATCH] fix test case build error
---
tests/styleplugins/chameleon/ut_chameleonstyle.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/styleplugins/chameleon/ut_chameleonstyle.cpp b/tests/styleplugins/chameleon/ut_chameleonstyle.cpp
index d7dab01..0e009c0 100644
--- a/tests/styleplugins/chameleon/ut_chameleonstyle.cpp
+++ b/tests/styleplugins/chameleon/ut_chameleonstyle.cpp
@@ -183,8 +183,8 @@ TEST_P(TestForQtStandardPixmapParam, StandardPixmap)
ChameleonStyle *style = new ChameleonStyle;
int param = GetParam();
- qDebug() << "QStyle::standardIcon:" << param << " isNull: " << (style->standardIcon(QStyle::StandardPixmap(param)).isNull());
- qDebug() << "QStyle::standardPixmap:" << param << " isNull: " << (style->standardPixmap(QStyle::StandardPixmap(param)).isNull());
+ //qDebug() << "QStyle::standardIcon:" << param << " isNull: " << (style->standardIcon(QStyle::StandardPixmap(param)).isNull());
+ //qDebug() << "QStyle::standardPixmap:" << param << " isNull: " << (style->standardPixmap(QStyle::StandardPixmap(param)).isNull());
}
class TestForDrawUtil : public ::testing::Test
--
2.33.0

Binary file not shown.

View File

@ -1,4 +1,6 @@
%global repo qt5integration
# Run tests in check section
# disable for bootstrapping
%bcond_with check
%global with_debug 1
@ -7,32 +9,35 @@
%endif
Name: dde-qt5integration
Version: 5.0.16
Release: 3
Version: 5.1.12.3
Release: 1
Summary: Qt platform theme integration plugins for DDE
License: GPLv3+
Source0: %{repo}_%{version}.orig.tar.xz
Patch0: fix-qtbase-QPainterPath.patch
Source0: qt5integration-%{version}.orig.tar.xz
Patch0001: 0001-fix-test-case-build-error.patch
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtbase-private-devel
BuildRequires: qt5-qtbase-static
BuildRequires: dtkwidget-devel
BuildRequires: dtkcore-devel
BuildRequires: dtkwidget-devel
BuildRequires: pkg-config
BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: mtdev-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: libqtxdg libqtxdg-devel
BuildRequires: qt5-qtbase-private-devel
BuildRequires: gtest-devel
BuildRequires: libqtxdg-devel
Requires: libqtxdg-devel
%description
Qt platform theme integration plugins for DDE
Multiple Qt plugins to provide better Qt5 integration for DDE is included.
%prep
%autosetup -n %{repo}-%{version} -p1
%autosetup -n qt5integration-%{version} -p1
%build
mkdir build && cd build
@ -41,7 +46,7 @@ mkdir build && cd build
cd -
%install
pushd %{_builddir}/%{repo}-%{version}/build
pushd %{_builddir}/qt5integration-%{version}/build
%make_install INSTALL_ROOT=%{buildroot}
popd
@ -51,11 +56,13 @@ popd
%{_libdir}/qt5/plugins/iconengines/libdsvgicon.so
%{_libdir}/qt5/plugins/imageformats/libdsvg.so
%{_libdir}/qt5/plugins/platformthemes/libqdeepin.so
%{_libdir}/qt5/plugins/styles/libdstyleplugin.so
%{_libdir}/qt5/plugins/iconengines/libdtkbuiltin.so
%{_libdir}/qt5/plugins/styles/libchameleon.so
%changelog
* Fri Feb 25 2022 liweigang <liweiganga@uniontech.com> - 5.1.12.3-1
- update to 5.1.12.3
* Fri Feb 11 2022 liweigang <liweiganga@uniontech.com> - 5.0.16-3
- fix buildRequires and build error