!5 Fix compilation errors
From: @weidongkl Reviewed-by: @panchenbo Signed-off-by: @panchenbo
This commit is contained in:
commit
67d653b26a
34
Fix-compilation-errors.patch
Normal file
34
Fix-compilation-errors.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From 1615aa6f28f48959511597094c6ec388431effe6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: weidong <weidong@uniontech.com>
|
||||||
|
Date: Thu, 15 Oct 2020 18:14:41 +0800
|
||||||
|
Subject: [PATCH] Fix compilation errors
|
||||||
|
|
||||||
|
---
|
||||||
|
introduction.pro | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/introduction.pro b/introduction.pro
|
||||||
|
index e739018..39d97c1 100644
|
||||||
|
--- a/introduction.pro
|
||||||
|
+++ b/introduction.pro
|
||||||
|
@@ -3,7 +3,7 @@ TEMPLATE = app
|
||||||
|
QT = core gui widgets dbus multimedia multimediawidgets
|
||||||
|
CONFIG += link_pkgconfig c++11
|
||||||
|
QT += dtkwidget
|
||||||
|
-PKGCONFIG += dframeworkdbus libdmr gsettings-qt
|
||||||
|
+PKGCONFIG += dframeworkdbus gsettings-qt
|
||||||
|
DESTDIR = $$_PRO_FILE_PWD_
|
||||||
|
|
||||||
|
#load(dtk_qmake)
|
||||||
|
@@ -77,7 +77,7 @@ contains(TARGET_ARCH, x86_64) {
|
||||||
|
DEFINES += DISABLE_VIDEO
|
||||||
|
HEADERS -= src/modules/videowidget.h
|
||||||
|
SOURCES -= src/modules/videowidget.cpp
|
||||||
|
- PKGCONFIG -= libdmr
|
||||||
|
+ # PKGCONFIG -= libdmr
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
2.18.4
|
||||||
|
|
||||||
@ -2,10 +2,11 @@
|
|||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
Name: dde-introduction
|
Name: dde-introduction
|
||||||
Version: 5.5.6.1
|
Version: 5.5.6.1
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Qt platform theme integration plugins
|
Summary: Qt platform theme integration plugins
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Source0: %{name}-%{version}.orig.tar.xz
|
Source0: %{name}-%{version}.orig.tar.xz
|
||||||
|
Patch0: Fix-compilation-errors.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtbase-devel
|
BuildRequires: qt5-qtbase-devel
|
||||||
BuildRequires: qt5-linguist
|
BuildRequires: qt5-linguist
|
||||||
@ -16,7 +17,6 @@ BuildRequires: dde-qt-dbus-factory-devel
|
|||||||
BuildRequires: gsettings-qt-devel
|
BuildRequires: gsettings-qt-devel
|
||||||
BuildRequires: qt5-qtmultimedia-devel
|
BuildRequires: qt5-qtmultimedia-devel
|
||||||
BuildRequires: qt5-qtx11extras-devel
|
BuildRequires: qt5-qtx11extras-devel
|
||||||
BuildRequires: libdmr-devel
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Qt platform theme integration plugins for DDE
|
Qt platform theme integration plugins for DDE
|
||||||
@ -45,6 +45,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 15 2020 weidong <weidong@openeuler.org> - 5.5.6.1-3
|
||||||
|
- Fix compilation errors
|
||||||
|
|
||||||
* Thu Oct 15 2020 weidong <weidong@openeuler.org> - 5.5.6.1-2
|
* Thu Oct 15 2020 weidong <weidong@openeuler.org> - 5.5.6.1-2
|
||||||
- add buildrequires
|
- add buildrequires
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user