!6 Fix compilation errors

From: @weidongkl
Reviewed-by: @panchenbo
Signed-off-by: @panchenbo
This commit is contained in:
openeuler-ci-bot 2020-10-15 18:41:27 +08:00 committed by Gitee
commit e9d92a5649
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 5ba0df319351e42065b742c24315f3cf9264c590 Mon Sep 17 00:00:00 2001
From: weidong <weidong@uniontech.com>
Date: Thu, 15 Oct 2020 18:34:47 +0800
Subject: [PATCH] Fix compilation errors
---
introduction.pro | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/introduction.pro b/introduction.pro
index 39d97c1..ed10cdf 100644
--- a/introduction.pro
+++ b/introduction.pro
@@ -71,14 +71,10 @@ SOURCES += \
RESOURCES += \
dde-introduction.qrc
-contains(TARGET_ARCH, x86_64) {
-
-}else{
DEFINES += DISABLE_VIDEO
HEADERS -= src/modules/videowidget.h
SOURCES -= src/modules/videowidget.cpp
- # PKGCONFIG -= libdmr
-}
+ PKGCONFIG -= libdmr
desktop.path = $$PREFIX/share/applications/
--
2.18.4

View File

@ -2,11 +2,12 @@
%global debug_package %{nil}
Name: dde-introduction
Version: 5.5.6.1
Release: 3
Release: 4
Summary: Qt platform theme integration plugins
License: GPLv3+
Source0: %{name}-%{version}.orig.tar.xz
Patch0: Fix-compilation-errors.patch
Patch1: Fix-compilation-errors-02.patch
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-linguist
@ -45,6 +46,9 @@ popd
%changelog
* Thu Oct 15 2020 weidong <weidong@openeuler.org> - 5.5.6.1-4
- Fix compilation errors
* Thu Oct 15 2020 weidong <weidong@openeuler.org> - 5.5.6.1-3
- Fix compilation errors