From df419a4ca083a4a3346deb0c8216328976dad334 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 16 Jun 2016 05:05:53 +0300
Subject: [PATCH] freeciv: Move stuff from version specific recipes to
 freeciv.inc

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 recipes-games/freeciv/freeciv.inc      | 24 +++++++++++++++++++++---
 recipes-games/freeciv/freeciv_2.5.4.bb | 23 -----------------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc
index 8289f53..0c5e000 100644
--- a/recipes-games/freeciv/freeciv.inc
+++ b/recipes-games/freeciv/freeciv.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SECTION = "games"
 
-DEPENDS = "gtk+ readline bzip2 curl xz"
+DEPENDS = "gtk+ readline bzip2 curl xz libsdl2-mixer gtk+3 qtbase"
 
 SRC_URI = "\
 file://allow-root.patch \
@@ -25,13 +25,16 @@ inherit autotools pkgconfig
 EXTRA_OECONF = "\
 --enable-shared --without-ggz-dir --enable-client=${FREECIV_GUI} \
 --disable-mapimg \
---disable-sdltest \
 --disable-sdl2test \
+--with-qt5-includes=${STAGING_INCDIR}/qt5 \
+--with-qt5-libs=${STAGING_LIBDIR}/qt5 \
+MOCCMD=${STAGING_BINDIR_NATIVE}/qt5/moc \
+SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \
 "
 
 acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4"
 
-PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common ${PN}-gtk2"
+PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common ${PN}-gtk2 ${PN}-gtk3 ${PN}-qt"
 
 do_install_append() {
         rm -Rf ${D}/${datadir}/appdata
@@ -73,3 +76,18 @@ ${bindir}/freeciv-gtk2 \
 ${datadir}/freeciv/themes/gui-gtk-2.0 \
 ${datadir}/freeciv/gtk_menus.xml \
 "
+
+RDEPENDS_${PN}-gtk3 = "freeciv-common freeciv-client-common"
+RPROVIDES_${PN}-gtk3 = "freeciv-client"
+FILES_${PN}-gtk3 = "\
+${bindir}/freeciv-gtk3 \
+${datadir}/freeciv/themes/gui-gtk-3.0 \
+${datadir}/freeciv/gtk_menus.xml \
+"
+
+RDEPENDS_${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
+RPROVIDES_${PN}-qt = "freeciv-client"
+FILES_${PN}-qt = "\
+${bindir}/freeciv-qt \
+${datadir}/freeciv/themes/gui-qt \
+"
diff --git a/recipes-games/freeciv/freeciv_2.5.4.bb b/recipes-games/freeciv/freeciv_2.5.4.bb
index 2a43b41..b6b822e 100644
--- a/recipes-games/freeciv/freeciv_2.5.4.bb
+++ b/recipes-games/freeciv/freeciv_2.5.4.bb
@@ -2,13 +2,7 @@ FREECIV_GUI = "gtk2,gtk3,qt"
 
 require freeciv.inc
 
-DEPENDS += "libsdl2-mixer gtk+3 qtbase"
-
 EXTRA_OECONF += "\
---with-qt5-includes=${STAGING_INCDIR}/qt5 \
---with-qt5-libs=${STAGING_LIBDIR}/qt5 \
-MOCCMD=${STAGING_BINDIR_NATIVE}/qt5/moc \
-SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \
 --enable-sdl-mixer=sdl2 \
 "
 
@@ -18,20 +12,3 @@ ${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
 
 SRC_URI[md5sum] = "f2b2e1f0afc7daecc9050bf6ceadb1d8"
 SRC_URI[sha256sum] = "9e64ef047fd0d2f8e9aa1da01586dea7cfe63a36b15875c168ada555c2e6634b"
-
-PACKAGES =+ "${PN}-gtk3 ${PN}-qt"
-
-RDEPENDS_${PN}-gtk3 = "freeciv-common freeciv-client-common"
-RPROVIDES_${PN}-gtk3 = "freeciv-client"
-FILES_${PN}-gtk3 = "\
-${bindir}/freeciv-gtk3 \
-${datadir}/freeciv/themes/gui-gtk-3.0 \
-${datadir}/freeciv/gtk_menus.xml \
-"
-
-RDEPENDS_${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
-RPROVIDES_${PN}-qt = "freeciv-client"
-FILES_${PN}-qt = "\
-${bindir}/freeciv-qt \
-${datadir}/freeciv/themes/gui-qt \
-"