update to upstream version 5.3.16

This commit is contained in:
leeffo 2022-10-19 16:04:43 +08:00
parent d3e04570f2
commit 80d19ec011
4 changed files with 13 additions and 26 deletions

View File

@ -1,3 +1,6 @@
# Run tests in check section
# disable for bootstrapping
%bcond_with check %bcond_with check
%global with_debug 1 %global with_debug 1
@ -6,13 +9,12 @@
%endif %endif
Name: dde-clipboard Name: dde-clipboard
Version: 5.3.0.3 Version: 5.3.16
Release: 2 Release: 1
Summary: Qt platform theme integration plugins for DDE Summary: Qt platform theme integration plugins for DDE
License: GPLv3+ License: GPLv3+
URL: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNjU3NQ/pool/main/d/dde-clipboard/ URL: http://shuttle.corp.deepin.com/cache/repos/eagle/release-candidate/RERFNS4wLjAuNjU3NQ/pool/main/d/dde-clipboard/
Source0: %{name}_%{version}.orig.tar.xz Source0: %{name}_%{version}.orig.tar.xz
Patch0: modify-QPainterPath-error.patch
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-linguist BuildRequires: qt5-linguist
@ -22,6 +24,7 @@ BuildRequires: dtkwidget
BuildRequires: libgio-qt BuildRequires: libgio-qt
BuildRequires: libgio-qt-devel BuildRequires: libgio-qt-devel
BuildRequires: pkgconfig(dframeworkdbus) >= 2.0 BuildRequires: pkgconfig(dframeworkdbus) >= 2.0
BuildRequires: gtest-devel
BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-private-devel
%description %description
@ -30,7 +33,7 @@ Qt platform theme integration plugins for DDE
%prep %prep
%autosetup -p1 %autosetup
%build %build
export PATH=$PATH:/usr/lib64/qt5/bin export PATH=$PATH:/usr/lib64/qt5/bin
@ -49,8 +52,13 @@ popd
%{_bindir}/%{name}loader %{_bindir}/%{name}loader
%{_datadir}/dbus-1/services/com.deepin.dde.Clipboard.service %{_datadir}/dbus-1/services/com.deepin.dde.Clipboard.service
%{_datadir}/%{name}/translations/ %{_datadir}/%{name}/translations/
%{_datadir}/applications/dde-clipboard.desktop
%changelog %changelog
* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.3.16-1
- Update to 5.3.16
* Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.3.0.3-2 * Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.3.0.3-2
- fix build error - fix build error
@ -65,3 +73,4 @@ popd
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.0.0.3-1 * Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.0.0.3-1
- Package init - Package init

Binary file not shown.

Binary file not shown.

View File

@ -1,22 +0,0 @@
diff --color -Naur a/dde-clipboard/itemwidget.cpp b/dde-clipboard/itemwidget.cpp
--- a/dde-clipboard/itemwidget.cpp 2022-02-08 10:47:33.813745658 +0800
+++ b/dde-clipboard/itemwidget.cpp 2022-02-08 10:48:08.837654756 +0800
@@ -24,6 +24,7 @@
#include "refreshtimer.h"
#include <QPainter>
+#include <QPainterPath>
#include <QTextOption>
#include <QHBoxLayout>
#include <QVBoxLayout>
diff --color -Naur a/dde-clipboard/pixmaplabel.cpp b/dde-clipboard/pixmaplabel.cpp
--- a/dde-clipboard/pixmaplabel.cpp 2022-02-08 10:47:33.817745648 +0800
+++ b/dde-clipboard/pixmaplabel.cpp 2022-02-08 11:05:26.072647168 +0800
@@ -22,6 +22,7 @@
#include "constants.h"
#include <QPainter>
+#include <QPainterPath>
#include <QDebug>
#include <QTextLayout>
#include <QTextOption>