diff --git a/recipes-games/freeciv/freeciv.inc b/recipes-games/freeciv/freeciv.inc index 39d72bf..fe45afa 100644 --- a/recipes-games/freeciv/freeciv.inc +++ b/recipes-games/freeciv/freeciv.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "games" -FREECIV_GUI = "gtk3.22,qt,sdl2" +FREECIV_GUI = "gtk3.22,gtk4,qt,sdl2" DEPENDS = "readline bzip2 curl xz libsdl2-mixer gtk+3 qtbase virtual/gettext qttools-native libsdl2-image libsdl2-ttf libsdl2-gfx freetype" @@ -35,7 +35,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}-gtk3.22 ${PN}-qt ${PN}-sdl2" +${PN}-gtk3.22 ${PN}-gtk4 ${PN}-qt ${PN}-sdl2" do_install:append() { rm -Rf ${D}/${datadir}/appdata @@ -89,6 +89,13 @@ ${datadir}/freeciv/themes/gui-gtk-3.22 \ ${datadir}/freeciv/gtk3.22_menus.xml \ " +RDEPENDS:${PN}-gtk4 = "freeciv-common freeciv-client-common" +RPROVIDES:${PN}-gtk4 = "freeciv-client" +FILES:${PN}-gtk4 = "\ +${bindir}/freeciv-gtk4 \ +${datadir}/freeciv/themes/gtk4 \ +" + RDEPENDS:${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins" RPROVIDES:${PN}-qt = "freeciv-client" FILES:${PN}-qt = "\ diff --git a/recipes-games/freeciv/freeciv_3.1.0.bb b/recipes-games/freeciv/freeciv_3.1.0.bb index cea59bb..9e91f10 100644 --- a/recipes-games/freeciv/freeciv_3.1.0.bb +++ b/recipes-games/freeciv/freeciv_3.1.0.bb @@ -9,14 +9,3 @@ file://allow-root-S3_1.patch \ " SRC_URI[sha256sum] = "d746a883937b955b0ee1d1eba8b4e82354f7f72051ac4f514de7ab308334506e" - -FREECIV_GUI += "gtk4" - -PACKAGES += "${PN}-gtk4" - -RDEPENDS:${PN}-gtk4 = "freeciv-common freeciv-client-common" -RPROVIDES:${PN}-gtk4 = "freeciv-client" -FILES:${PN}-gtk4 = "\ -${bindir}/freeciv-gtk4 \ -${datadir}/freeciv/themes/gtk4 \ -"