!25 update to upstream 5.6.13

From: @xzyangha 
Reviewed-by: @yeqinglong01 
Signed-off-by: @yeqinglong01
This commit is contained in:
openeuler-ci-bot 2022-11-03 02:10:23 +00:00 committed by Gitee
commit cb9cbf8728
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 25 additions and 65 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,23 +1,32 @@
%global debug_package %{nil}
%define specrelease 1%{?dist}
%if 0%{?openeuler}
%define specrelease 1
%endif
Name: dde-introduction
Version: 5.6.0.7
Release: 3
Version: 5.6.13
Release: %{specrelease}
Summary: Introduction for UOS
License: GPLv3+
URL: https://github.com/linuxdeepin/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: modify-QPainterPath-error.patch
Patch1: fix-not-open.patch
BuildRequires: gcc-c++
BuildRequires: cmake3
BuildRequires: qt5-devel
BuildRequires: qt5-qtbase-private-devel
BuildRequires: dtkcore-devel dtkwidget-devel
BuildRequires: dtkwidget-devel
BuildRequires: pkgconfig(dtkgui)
BuildRequires: pkgconfig(dtkcore)
BuildRequires: pkgconfig(dframeworkdbus)
#BuildRequires: pkgconfig(libdmr)
# BuildRequires: pkgconfig(libdmr)
BuildRequires: pkgconfig(gsettings-qt)
#BuildRequires: ffmpegthumbnailer-devel
BuildRequires: deepin-desktop-base
BuildRequires: ffmpegthumbnailer-devel
BuildRequires: gtest-devel
BuildRequires: gmock-devel
BuildRequires: qt5-qtbase-private-devel
BuildRequires: deepin-desktop-server
Requires: deepin-desktop-server
@ -28,7 +37,7 @@ Watch the introduction video to get new features, customize your desktop, enable
effect and know more about UnionTech OS.
%prep
%autosetup -p1
%autosetup
# disable dmr lib
sed -i 's/contains(TARGET_ARCH, x86_64)/contains(TARGET_ARCH, mips)/' introduction.pro
@ -36,9 +45,10 @@ sed -i 's/contains(TARGET_ARCH, x86_64)/contains(TARGET_ARCH, mips)/' introducti
%build
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
export PATH=%{_qt5_bindir}:$PATH
mkdir build && pushd build
%qmake_qt5 ../ VERSION=%{version} DEFINES+="VERSION=%{version}"
%make_build
sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt")
mkdir build && pushd build
%cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version}
%make_build
popd
%install
@ -57,8 +67,8 @@ popd
%{_datadir}/%{name}/
%changelog
* Wed Mar 16 2022 liweigang <liweiganga@uniontech.com> - 5.6.0.7-3
- fix open fail
* Mon Jul 18 2022 konglidong <konglidong@uniontech.com> - 5.6.13-1
- update version to 5.6.13
* Tue Feb 08 2022 liweigang <liweiganga@uniontech.com> - 5.6.0.7-2
- fix build error

View File

@ -1,17 +0,0 @@
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 739060c..f8a4472 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -33,8 +33,10 @@ MainWindow::MainWindow(DWidget *parent)
QDBusConnection::sessionBus(), this))
{
bool isx86 = QSysInfo::currentCpuArchitecture().startsWith("x86");
- isx86 && (DSysInfo::uosEditionType() != DSysInfo::UosEdition::UosEnterpriseC) ?
- m_useVideo = true : m_useVideo = false;
+ //isx86 && (DSysInfo::uosEditionType() != DSysInfo::UosEdition::UosEnterpriseC) ?
+ // m_useVideo = true : m_useVideo = false;
+
+ m_useVideo = false;
connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this,
&MainWindow::slotTheme);

View File

@ -1,33 +0,0 @@
diff --color -Naur a/src/dvideowidget.h b/src/dvideowidget.h
--- a/src/dvideowidget.h 2022-02-08 10:58:23.000430309 +0800
+++ b/src/dvideowidget.h 2022-02-08 11:00:21.694887451 +0800
@@ -28,6 +28,7 @@
#include <QMediaPlayer>
#include <QMediaPlaylist>
#include <QPainter>
+#include <QPainterPath>
#include <QPointer>
#include <DObjectPrivate>
diff --color -Naur a/src/widgets/closebutton.h b/src/widgets/closebutton.h
--- a/src/widgets/closebutton.h 2022-02-08 10:58:23.004430302 +0800
+++ b/src/widgets/closebutton.h 2022-02-08 10:59:16.412344856 +0800
@@ -3,6 +3,7 @@
#include <QPushButton>
#include <QPainter>
+#include <QPainterPath>
#include <DGuiApplicationHelper>
#include <QKeyEvent>
#include <QMouseEvent>
diff --color -Naur a/src/widgets/navigationbutton.h b/src/widgets/navigationbutton.h
--- a/src/widgets/navigationbutton.h 2022-02-08 10:58:23.004430302 +0800
+++ b/src/widgets/navigationbutton.h 2022-02-08 10:59:40.029104263 +0800
@@ -22,6 +22,7 @@
#include <QGraphicsDropShadowEffect>
#include <QHBoxLayout>
#include <QPainter>
+#include <QPainterPath>
#include <QKeyEvent>
#include <DGuiApplicationHelper>