!10 [sync] PR-9: update to 5.1.19
From: @openeuler-sync-bot Reviewed-by: @HelloWorld_lvcongqing Signed-off-by: @HelloWorld_lvcongqing
This commit is contained in:
commit
d641cee745
@ -1,27 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
BIN
dde-qt5integration-5.1.19.tar.gz
Normal file
BIN
dde-qt5integration-5.1.19.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,6 +1,7 @@
|
|||||||
# Run tests in check section
|
# Run tests in check section
|
||||||
# disable for bootstrapping
|
# disable for bootstrapping
|
||||||
|
|
||||||
|
%global repo dde-qt5integration
|
||||||
%bcond_with check
|
%bcond_with check
|
||||||
%global with_debug 1
|
%global with_debug 1
|
||||||
|
|
||||||
@ -9,26 +10,46 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: dde-qt5integration
|
Name: dde-qt5integration
|
||||||
Version: 5.1.12.3
|
Version: 5.1.19
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: Qt platform theme integration plugins for DDE
|
Summary: Qt platform theme integration plugins for DDE
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Source0: qt5integration-%{version}.orig.tar.xz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
Patch0001: 0001-fix-test-case-build-error.patch
|
|
||||||
|
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: qt5-qtbase-private-devel
|
BuildRequires: pkgconfig(atk)
|
||||||
BuildRequires: qt5-qtbase-static
|
|
||||||
BuildRequires: dtkcore-devel
|
BuildRequires: dtkcore-devel
|
||||||
BuildRequires: dtkwidget-devel
|
BuildRequires: dtkwidget-devel
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkgconfig(fontconfig)
|
||||||
BuildRequires: qt5-qtx11extras-devel
|
BuildRequires: pkgconfig(freetype2)
|
||||||
BuildRequires: qt5-qtsvg-devel
|
BuildRequires: pkgconfig(gtk+-2.0)
|
||||||
BuildRequires: mtdev-devel
|
BuildRequires: pkgconfig(glib-2.0)
|
||||||
BuildRequires: qt5-qtmultimedia-devel
|
BuildRequires: gdk-pixbuf-xlib
|
||||||
BuildRequires: libqtxdg libqtxdg-devel
|
BuildRequires: pkgconfig(ice)
|
||||||
|
BuildRequires: pkgconfig(libinput)
|
||||||
|
BuildRequires: pkgconfig(libudev)
|
||||||
|
BuildRequires: pkgconfig(pango)
|
||||||
|
BuildRequires: pkgconfig(Qt5Core)
|
||||||
|
BuildRequires: pkgconfig(Qt5OpenGL)
|
||||||
|
BuildRequires: pkgconfig(Qt5Svg)
|
||||||
|
BuildRequires: pkgconfig(Qt5Xdg) >= 3.0.0
|
||||||
|
BuildRequires: pkgconfig(Qt5X11Extras)
|
||||||
|
BuildRequires: pkgconfig(x11)
|
||||||
|
BuildRequires: pkgconfig(xext)
|
||||||
|
BuildRequires: pkgconfig(xrender)
|
||||||
|
BuildRequires: pkgconfig(xcb)
|
||||||
|
BuildRequires: pkgconfig(mtdev)
|
||||||
|
BuildRequires: pkgconfig(Qt5Multimedia)
|
||||||
|
BuildRequires: pkgconfig(Qt5MultimediaWidgets)
|
||||||
|
BuildRequires: qt5-qtbase-common
|
||||||
BuildRequires: gtest-devel
|
BuildRequires: gtest-devel
|
||||||
BuildRequires: libqtxdg-devel
|
BuildRequires: gmock-devel
|
||||||
|
|
||||||
|
# for libQt5ThemeSupport.a
|
||||||
|
BuildRequires: qt5-qtbase-static
|
||||||
|
BuildRequires: qt5-qtbase-private-devel
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
|
|
||||||
Requires: libqtxdg-devel
|
Requires: libqtxdg-devel
|
||||||
|
|
||||||
@ -37,18 +58,14 @@ Qt platform theme integration plugins for DDE
|
|||||||
Multiple Qt plugins to provide better Qt5 integration for DDE is included.
|
Multiple Qt plugins to provide better Qt5 integration for DDE is included.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n qt5integration-%{version} -p1
|
%autosetup -n %{repo}-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir build && cd build
|
%qmake_qt5 PREFIX=%{_prefix} BASED_DTK_DIR=based-dtk
|
||||||
%{_libdir}/qt5/bin/qmake ..
|
%make_build
|
||||||
%{__make}
|
|
||||||
cd -
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
pushd %{_builddir}/qt5integration-%{version}/build
|
|
||||||
%make_install INSTALL_ROOT=%{buildroot}
|
%make_install INSTALL_ROOT=%{buildroot}
|
||||||
popd
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README.md
|
%doc README.md
|
||||||
@ -58,8 +75,19 @@ popd
|
|||||||
%{_libdir}/qt5/plugins/platformthemes/libqdeepin.so
|
%{_libdir}/qt5/plugins/platformthemes/libqdeepin.so
|
||||||
%{_libdir}/qt5/plugins/iconengines/libdtkbuiltin.so
|
%{_libdir}/qt5/plugins/iconengines/libdtkbuiltin.so
|
||||||
%{_libdir}/qt5/plugins/styles/libchameleon.so
|
%{_libdir}/qt5/plugins/styles/libchameleon.so
|
||||||
|
# target
|
||||||
|
%{_qt5_plugindir}/platformthemes/based-dtk/libqdeepin.so
|
||||||
|
%{_qt5_plugindir}/iconengines/based-dtk/libdsvgicon.so
|
||||||
|
%{_qt5_plugindir}/imageformats/based-dtk/libdsvg.so
|
||||||
|
%{_qt5_plugindir}/iconengines/based-dtk/libdtkbuiltin.so
|
||||||
|
%{_qt5_plugindir}/styles/based-dtk/libchameleon.so
|
||||||
|
%{_libdir}/qt5/plugins/iconengines/based-dtk/libxdgicon.so
|
||||||
|
%{_libdir}/qt5/plugins/iconengines/libxdgicon.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 03 2023 liweiganga <liweiganga@uniontech.com> - 5.1.19-1
|
||||||
|
- update: update to 5.1.19
|
||||||
|
|
||||||
* Fri Feb 25 2022 liweigang <liweiganga@uniontech.com> - 5.1.12.3-1
|
* Fri Feb 25 2022 liweigang <liweiganga@uniontech.com> - 5.1.12.3-1
|
||||||
- update to 5.1.12.3
|
- update to 5.1.12.3
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user