From 5aa561fa3edd9a77e3adffb0e2b52a9105192c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 30 Oct 2018 18:34:22 +0100
Subject: [PATCH] freeciv: Fix build with changes in meta-qt5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

meta-qt5 commit b716195f6 dropped the qt5 directory from path. To be compatible
set path from meta-qt5.

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 recipes-games/freeciv/freeciv.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc
index 9e75d3f..fe3304e 100644
--- a/recipes-games/freeciv/freeciv.inc
+++ b/recipes-games/freeciv/freeciv.inc
@@ -20,15 +20,15 @@ file://wait-server-start.patch \
 S = "${WORKDIR}/freeciv-${PV}"
 B = "${WORKDIR}/build-${PV}"
 
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext qmake5_paths
 
 EXTRA_OECONF = "\
 --enable-shared --enable-client=${FREECIV_GUI} \
 --disable-mapimg \
 --disable-sdl2test \
---with-qt5-includes=${STAGING_INCDIR}/qt5 \
---with-qt5-libs=${STAGING_LIBDIR}/qt5 \
-MOCCMD=${STAGING_BINDIR_NATIVE}/qt5/moc \
+--with-qt5-includes=${STAGING_INCDIR}${QT_DIR_NAME} \
+--with-qt5-libs=${STAGING_LIBDIR}${QT_DIR_NAME} \
+MOCCMD=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \
 SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \
 "