aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi-demo/recipes-qt/qt5/qtwayland/0007-Fixed-build-when-with-x-and-with-wayland-is-set.patch
blob: b529b5b3000f7f41de9587dedcb19b8565ac0ea1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From ffa203ba4b9c58f8d8025688299a3f8fe8a7f257 Mon Sep 17 00:00:00 2001
From: Tomasz Olszak <olszak.tomasz@gmail.com>
Date: Fri, 17 Jan 2014 23:01:02 +0100
Subject: [PATCH 07/21] Fixed build when %{with x} and %{with wayland} is set.

Tizen-Bug: TIVI-2416

Change-Id: Ic807646eaf04bfc08e47067c4be63cdebf58da66
Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
---
 packaging/qt5-qtwayland.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packaging/qt5-qtwayland.spec b/packaging/qt5-qtwayland.spec
index c4ace9d..0033da2 100644
--- a/packaging/qt5-qtwayland.spec
+++ b/packaging/qt5-qtwayland.spec
@@ -23,6 +23,7 @@
 # This file is based on qtwayland.spec from Mer project
 # http://merproject.org
 %bcond_with wayland
+%bcond_with x
 
 Name:       qt5-qtwayland
 Summary:    Qt Wayland compositor
@@ -37,6 +38,9 @@ BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5OpenGL)
 BuildRequires:  pkgconfig(Qt5PlatformSupport)
+%if %{with x}
+BuildRequires:  pkgconfig(Qt5DBus)
+%endif
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-egl)
-- 
1.9.1