From 856e66d193e98549eb0f41a44384059c7fdcbf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 8 May 2021 18:21:44 +0200 Subject: [PATCH 1/2] wesnoth: Add gettext to inherit to get translations back MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-games/wesnoth/wesnoth_1.15.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-games/wesnoth/wesnoth_1.15.12.bb b/recipes-games/wesnoth/wesnoth_1.15.12.bb index 5a3bcb4..08fe0af 100644 --- a/recipes-games/wesnoth/wesnoth_1.15.12.bb +++ b/recipes-games/wesnoth/wesnoth_1.15.12.bb @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "bc591dda4b0f8ff013bb44baadfc622e81548ab6a8fa98d844908e435c ARM_INSTRUCTION_SET = "arm" -inherit cmake pkgconfig +inherit cmake pkgconfig gettext EXTRA_OECMAKE = "\ -DENABLE_LOW_MEM=ON \ From 291ea0cd84e06c1009191450b60abca713142700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 8 May 2021 17:33:23 +0200 Subject: [PATCH 2/2] wesnoth: Fix/rework campaign packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * An_Orcish_Incursion (aoi) is gone * New campaign packages added * sort campaigns alphabetically Checked: * All campaign packages have contents / do_rootfs passed * Adding wesnoth-all-campaigns adds all campaign packages to image * No campaigns except 'tutorial' slipped into package wesnoth-data Signed-off-by: Andreas Müller --- recipes-games/wesnoth/wesnoth_1.15.12.bb | 57 +++++++++++++++--------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/recipes-games/wesnoth/wesnoth_1.15.12.bb b/recipes-games/wesnoth/wesnoth_1.15.12.bb index 08fe0af..0be5bd9 100644 --- a/recipes-games/wesnoth/wesnoth_1.15.12.bb +++ b/recipes-games/wesnoth/wesnoth_1.15.12.bb @@ -29,9 +29,9 @@ EXTRA_OECMAKE = "\ " PACKAGES = "${PN}-doc ${PN}-music ${PN}-sounds \ - ${PN}-aoi ${PN}-did ${PN}-ei ${PN}-httt ${PN}-l \ - ${PN}-nr ${PN}-sof ${PN}-sotbe ${PN}-thot ${PN}-trow \ - ${PN}-tsg ${PN}-tb ${PN}-utbs ${PN}-low\ + ${PN}-dw ${PN}-dm ${PN}-did ${PN}-ei ${PN}-httt ${PN}-l ${PN}-low \ + ${PN}-nr ${PN}-sof ${PN}-sota ${PN}-sotbe ${PN}-thot ${PN}-trow \ + ${PN}-tsg ${PN}-tb ${PN}-utbs ${PN}-wc \ ${PN}-data \ ${PN}-all-campaigns \ ${PN}-all \ @@ -74,9 +74,9 @@ RDEPENDS_${PN} = "${PN}-data tremor" RDEPENDS_${PN}-data = "bash python3" RDEPENDS_${PN}-all-campaigns = "${PN} \ - ${PN}-aoi ${PN}-did ${PN}-ei ${PN}-httt ${PN}-l \ - ${PN}-nr ${PN}-sof ${PN}-sotbe ${PN}-thot ${PN}-trow \ - ${PN}-tsg ${PN}-tb ${PN}-utbs ${PN}-low" + ${PN}-did ${PN}-dm ${PN}-dw ${PN}-ei ${PN}-httt \ + ${PN}-l ${PN}-low ${PN}-nr ${PN}-sof ${PN}-sota ${PN}-sotbe \ + ${PN}-tb ${PN}-thot ${PN}-trow ${PN}-tsg ${PN}-utbs ${PN}-wc" # Installing wesnoth-all should pull everything in (like in Debian). RDEPENDS_${PN}-all = "${PN} ${PN}-all-campaigns ${PN}-sounds ${PN}-music" @@ -113,21 +113,21 @@ FILES_${PN}-server = "\ ${localstatedir}/run/wesnothd \ " -FILES_${PN}-low ="\ - ${datadir}/wesnoth/data/campaigns/Legend_of_Wesmere \ - ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-aoi.mo \ -" - -FILES_${PN}-aoi = "\ - ${datadir}/wesnoth/data/campaigns/An_Orcish_Incursion \ - ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-aoi.mo \ -" - FILES_${PN}-did = "\ ${datadir}/wesnoth/data/campaigns/Descent_Into_Darkness \ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-did.mo \ " +FILES_${PN}-dm = "\ + ${datadir}/wesnoth/data/campaigns/Delfadors_Memoirs \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-dm.mo \ +" + +FILES_${PN}-dw = "\ + ${datadir}/wesnoth/data/campaigns/Dead_Water \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-dw.mo \ +" + FILES_${PN}-ei = "\ ${datadir}/wesnoth/data/campaigns/Eastern_Invasion \ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-ei.mo \ @@ -143,6 +143,11 @@ FILES_${PN}-l = "\ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-l.mo \ " +FILES_${PN}-low ="\ + ${datadir}/wesnoth/data/campaigns/Legend_of_Wesmere \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-low.mo \ +" + FILES_${PN}-nr = "\ ${datadir}/wesnoth/data/campaigns/Northern_Rebirth \ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-nr.mo \ @@ -153,11 +158,21 @@ FILES_${PN}-sof = "\ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sof.mo \ " +FILES_${PN}-sota = "\ + ${datadir}/wesnoth/data/campaigns/Secrets_of_the_Ancients \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sota.mo \ +" + FILES_${PN}-sotbe = "\ ${datadir}/wesnoth/data/campaigns/Son_Of_The_Black_Eye \ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sotbe.mo \ " +FILES_${PN}-tb = "\ + ${datadir}/wesnoth/data/campaigns/Two_Brothers \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tb.mo \ +" + FILES_${PN}-thot = "\ ${datadir}/wesnoth/data/campaigns/The_Hammer_of_Thursagan \ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-thot.mo \ @@ -173,12 +188,12 @@ FILES_${PN}-tsg = "\ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tsg.mo \ " -FILES_${PN}-tb = "\ - ${datadir}/wesnoth/data/campaigns/Two_Brothers \ - ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-tb.mo \ -" - FILES_${PN}-utbs = "\ ${datadir}/wesnoth/data/campaigns/Under_the_Burning_Suns \ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-utbs.mo \ " + +FILES_${PN}-wc = "\ + ${datadir}/wesnoth/data/campaigns/World_Conquest \ + ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-wc.mo \ +"