diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc index c24b9eb..407b4c0 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 libsdl2-mixer gtk+3 qtbase virtual/gettext" +DEPENDS = "readline bzip2 curl xz libsdl2-mixer gtk+3 qtbase virtual/gettext" SRC_URI = "\ file://allow-root.patch \ @@ -34,7 +34,7 @@ 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 ${PN}-gtk3 ${PN}-qt" +PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common ${PN}-gtk3 ${PN}-qt" do_install_append() { rm -Rf ${D}/${datadir}/appdata @@ -69,14 +69,6 @@ ${datadir}/freeciv/stdsounds \ ${datadir}/icons/hicolor/*/*/freeciv-modpack.png \ " -RDEPENDS_${PN}-gtk2 = "freeciv-common freeciv-client-common" -RPROVIDES_${PN}-gtk2 = "freeciv-client" -FILES_${PN}-gtk2 = "\ -${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 = "\ diff --git a/recipes-games/freeciv/freeciv_2.5.5.bb b/recipes-games/freeciv/freeciv_2.5.5.bb index 1670fa0..0cf6af7 100644 --- a/recipes-games/freeciv/freeciv_2.5.5.bb +++ b/recipes-games/freeciv/freeciv_2.5.5.bb @@ -2,6 +2,8 @@ FREECIV_GUI = "gtk2,gtk3,qt" require freeciv.inc +DEPENDS =+ "gtk+" + EXTRA_OECONF += "\ --enable-sdl-mixer=sdl2 \ " @@ -12,3 +14,13 @@ ${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \ SRC_URI[md5sum] = "0370ca429f634a72e5f821a2a44e2e77" SRC_URI[sha256sum] = "5622f2142637057f7e47b1eda764c4e131222fab4d5bb42cd59fbd58ba3db1d4" + +PACKAGES =+ "${PN}-gtk2" + +RDEPENDS_${PN}-gtk2 = "freeciv-common freeciv-client-common" +RPROVIDES_${PN}-gtk2 = "freeciv-client" +FILES_${PN}-gtk2 = "\ +${bindir}/freeciv-gtk2 \ +${datadir}/freeciv/themes/gui-gtk-2.0 \ +${datadir}/freeciv/gtk_menus.xml \ +"