freeciv-3.1: Drop

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>

conf/layer.conf

@@ -8,5 +8,5 @@ BBFILE_COLLECTIONS += "games-layer"
 BBFILE_PATTERN_games-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_games-layer = "15"
 
-LAYERDEPENDS_games-layer = "core openembedded-layer filesystems-layer gnome-layer networking-layer multimedia-layer meta-python qt5-layer"
-LAYERSERIES_COMPAT_games-layer = "mickledore kirkstone langdale"
+LAYERDEPENDS_games-layer = "core openembedded-layer filesystems-layer gnome-layer networking-layer multimedia-layer meta-python qt6-layer"
+LAYERSERIES_COMPAT_games-layer = "whinlatter"

dependencies/freealut/freealut_1.1.0.bb

@@ -4,13 +4,10 @@ SECTION = "libs"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7ec51bd663119a90c3d50704d6051fae"
 
-PR = "r1"
-
 DEPENDS = "openal-soft"
 
-SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-${PV}.tar.gz/e089b28a0267faabdb6c079ee173664a/${BPN}-${PV}.tar.gz"
+SRC_URI = "https://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-${PV}.tar.gz/e089b28a0267faabdb6c079ee173664a/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "e089b28a0267faabdb6c079ee173664a"
 SRC_URI[sha256sum] = "60d1ea8779471bb851b89b49ce44eecb78e46265be1a6e9320a28b100c8df44f"
 
 inherit autotools binconfig

dependencies/libsdl2-gfx/libsdl2-gfx/acinclude2m4.patch

@@ -1,22 +1,13 @@
-diff -Nurd SDL2_gfx-1.0.1/autogen.sh SDL2_gfx-1.0.1/autogen.sh
---- SDL2_gfx-1.0.1/autogen.sh	2012-09-05 04:51:19.000000000 +0300
-+++ SDL2_gfx-1.0.1/autogen.sh	2016-09-18 18:21:14.113749811 +0300
-@@ -1,6 +1,6 @@
- #!/bin/sh
- #
--aclocal -I acinclude
-+aclocal -I m4
- automake --foreign --include-deps --add-missing --copy
- autoconf
- 
-diff -Nurd SDL2_gfx-1.0.1/configure.in SDL2_gfx-1.0.1/configure.in
---- SDL2_gfx-1.0.1/configure.in	2014-06-19 09:11:23.000000000 +0300
-+++ SDL2_gfx-1.0.1/configure.in	2016-09-18 18:21:59.205661379 +0300
+Upstream-Status: Inactive-Upstream
+
+diff -Nurd SDL2_gfx-1.0.4/configure.in SDL2_gfx-1.0.4/configure.in
+--- SDL2_gfx-1.0.4/configure.in	2024-05-30 03:24:19.046203935 +0300
++++ SDL2_gfx-1.0.4/configure.in	2024-05-30 03:25:04.462372638 +0300
 @@ -44,6 +44,8 @@
  dnl Setup for automake
  AM_INIT_AUTOMAKE(SDL2_gfx, $VERSION)
  
-+AC_CONFIG_MACRO_DIRS([m4])
++AC_CONFIG_MACRO_DIRS([acinclude])
 +
  dnl Check for tools
  AC_PROG_LIBTOOL

dependencies/libsdl2-gfx/libsdl2-gfx_1.0.4.bb

@@ -16,7 +16,7 @@ SRC_URI = "\
 SRC_URI[md5sum] = "15f9866c6464ca298f28f62fe5b36d9f"
 SRC_URI[sha256sum] = "63e0e01addedc9df2f85b93a248f06e8a04affa014a835c2ea34bfe34e576262"
 
-S = "${WORKDIR}/SDL2_gfx-${PV}"
+S = "${UNPACKDIR}/SDL2_gfx-${PV}"
 
 inherit autotools pkgconfig
 
@@ -27,7 +27,3 @@ EXTRA_OECONF += "--disable-mmx"
 EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "m32", "--enable-mmx", "", d)}"
 EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "m64", "--enable-mmx", "", d)}"
 EXTRA_OECONF += "${@bb.utils.contains("AVAILTUNES", "powerpc", "--disable-mmx", "", d)}"
-
-do_unpack:append() {
-    os.rename("SDL2_gfx-1.0.4/acinclude", "SDL2_gfx-1.0.4/m4")
-}

dependencies/tolua/tolua/01-tolua_tolua_open-proto-before-need.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inactive-Upstream
+
 diff -Nurd tolua-5.2/src/bin/tolua.c tolua-5.2/src/bin/tolua.c
 --- tolua-5.2/src/bin/tolua.c	2022-09-26 18:11:41.769267668 +0300
 +++ tolua-5.2/src/bin/tolua.c	2020-02-22 14:33:47.775736302 +0200

dependencies/tolua/tolua/02-fix-use-after-free.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inactive-Upstream
+
 diff -Nurd tolua-5.2/src/lib/tolua_event.c tolua-5.2/src/lib/tolua_event.c
 --- tolua-5.2/src/lib/tolua_event.c	2022-09-26 18:17:40.544835582 +0300
 +++ tolua-5.2/src/lib/tolua_event.c	2022-08-29 15:10:32.145383356 +0300

dependencies/tolua/tolua/03-tolua_bnd_takeownership-prototype.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inactive-Upstream
+
 diff -Nurd tolua-5.2/src/lib/tolua_map.c tolua-5.2/src/lib/tolua_map.c
 --- tolua-5.2/src/lib/tolua_map.c	2022-09-26 18:19:26.145867532 +0300
 +++ tolua-5.2/src/lib/tolua_map.c	2020-02-22 14:33:47.779735894 +0200

dependencies/tolua/tolua/04-include-tolua_event.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inactive-Upstream
+
 diff -Nurd tolua-5.2/src/lib/tolua_event.c tolua-5.2/src/lib/tolua_event.c
 --- tolua-5.2/src/lib/tolua_event.c	2022-09-26 18:20:52.710709210 +0300
 +++ tolua-5.2/src/lib/tolua_event.c	2022-09-26 18:18:49.593511033 +0300

dependencies/tolua/tolua/05-gen-code-fix-null-dereferences.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inactive-Upstream
+
 diff -Nurd tolua-5.2/src/bin/lua/variable.lua tolua-5.2/src/bin/lua/variable.lua
 --- tolua-5.2/src/bin/lua/variable.lua	2022-09-26 18:23:47.772402128 +0300
 +++ tolua-5.2/src/bin/lua/variable.lua	2022-08-29 15:10:32.145383356 +0300

dependencies/tolua/tolua/06-gen-code-no-trailing-spaces.patch

@@ -0,0 +1,23 @@
+Upstream-Status: Inactive-Upstream
+
+diff -Nurd tolua-5.2/src/bin/lua/function.lua tolua-5.2/src/bin/lua/function.lua
+--- tolua-5.2/src/bin/lua/function.lua	2024-04-19 20:03:11.818328350 +0300
++++ tolua-5.2/src/bin/lua/function.lua	2024-04-19 20:11:14.294719921 +0300
+@@ -85,7 +85,7 @@
+ 		 func = 'tolua_isusertable'
+ 			type = self.parent.type
+ 		end
+-		output('     !'..func..'(tolua_S,1,"'..type..'",0,&tolua_err) || \n') 
++		output('     !'..func..'(tolua_S,1,"'..type..'",0,&tolua_err) ||\n') 
+  end
+  -- check args
+  local vararg = false
+@@ -94,7 +94,7 @@
+   while self.args[i] and self.args[i].type ~= "..." do
+ 		 local btype = isbasic(self.args[i].type) 
+ 			if btype ~= 'state' then
+-    output('     !'..self.args[i]:outchecktype(narg,false)..' || \n')
++    output('     !'..self.args[i]:outchecktype(narg,false)..' ||\n')
+    end
+ 			if btype ~= 'state' then
+         narg = narg+1

dependencies/tolua/tolua/AllLuaPath.patch

@@ -1,7 +1,8 @@
 Look for lua files from under share
 
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+Upstream-Status: Inappropriate
 
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
 diff -Nurd tolua-5.2.4/src/bin/tolua.c tolua-5.2.4/src/bin/tolua.c
 --- tolua-5.2.4/src/bin/tolua.c	2015-11-03 00:54:03.000000000 +0200
 +++ tolua-5.2.4/src/bin/tolua.c	2018-04-02 10:30:44.572922804 +0300

dependencies/tolua/tolua/MakefileFix.patch

@@ -1,7 +1,8 @@
 Make tolua to compile on OpenEmbedded
 
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+Upstream-Status: Inappropriate
 
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
 diff -Nurd tolua-5.2.4/config tolua-5.2.4/config
 --- tolua-5.2.4/config	2015-11-03 00:54:03.000000000 +0200
 +++ tolua-5.2.4/config	2018-04-02 10:31:14.296753597 +0300

dependencies/tolua/tolua_5.2.4.bb

@@ -7,7 +7,7 @@ functions, classes, and methods to Lua."
 HOMEPAGE = "http://webserver2.tecgraf.puc-rio.br/~celes/tolua/"
 SECTION = "console/utils"
 
-DEPENDS= "lua-native"
+DEPENDS = "lua-native"
 BBCLASSEXTEND = "native"
 
 LICENSE = "GPL-2.0-or-later"
@@ -23,6 +23,7 @@ SRC_URI = "\
  file://03-tolua_bnd_takeownership-prototype.patch \
  file://04-include-tolua_event.patch \
  file://05-gen-code-fix-null-dereferences.patch \
+ file://06-gen-code-no-trailing-spaces.patch \
 "
 
 B = "${S}"

recipes-gamelib/sfml/sfml/Remove-Libs.private-from-pc.patch

@@ -0,0 +1,35 @@
+Fix openembedded warnings about generated .pc files
+referencing TMPDIR.
+
+Upstream-status: Pending
+
+diff -Nurd SFML-2.6.0/tools/pkg-config/sfml-audio.pc.in SFML-2.6.0/tools/pkg-config/sfml-audio.pc.in
+--- SFML-2.6.0/tools/pkg-config/sfml-audio.pc.in	2023-06-21 00:44:57.000000000 +0300
++++ SFML-2.6.0/tools/pkg-config/sfml-audio.pc.in	2023-06-24 00:38:13.479694289 +0300
+@@ -10,6 +10,4 @@
+ Requires: sfml-system
+ Requires.private: openal, vorbisenc, vorbisfile, vorbis, ogg, flac
+ Libs: -L${libdir} -lsfml-audio
+-# openal may be a system framework
+-Libs.private: @OPENAL_LIBRARY@
+ Cflags: -I${includedir}
+diff -Nurd SFML-2.6.0/tools/pkg-config/sfml-graphics.pc.in SFML-2.6.0/tools/pkg-config/sfml-graphics.pc.in
+--- SFML-2.6.0/tools/pkg-config/sfml-graphics.pc.in	2023-06-21 00:44:57.000000000 +0300
++++ SFML-2.6.0/tools/pkg-config/sfml-graphics.pc.in	2023-06-24 00:38:26.547833127 +0300
+@@ -10,6 +10,4 @@
+ Requires: sfml-window
+ Requires.private: sfml-system, freetype2
+ Libs: -L${libdir} -lsfml-graphics
+-# gl may not be in pkg-config
+-Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@
+ Cflags: -I${includedir}
+diff -Nurd SFML-2.6.0/tools/pkg-config/sfml-window.pc.in SFML-2.6.0/tools/pkg-config/sfml-window.pc.in
+--- SFML-2.6.0/tools/pkg-config/sfml-window.pc.in	2023-06-21 00:44:57.000000000 +0300
++++ SFML-2.6.0/tools/pkg-config/sfml-window.pc.in	2023-06-24 00:38:34.723919934 +0300
+@@ -9,6 +9,4 @@
+ Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
+ Requires: sfml-system
+ Libs: -L${libdir} -lsfml-window
+-# gl may not be in pkg-config
+-Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@
+ Cflags: -I${includedir}

recipes-gamelib/sfml/sfml_2.5.1.bb

@@ -1,19 +0,0 @@
-DESCRIPTION = "Simple and Fast Multimedia Library"
-HOMEPAGE = "https://www.sfml-dev.org/"
-SECTION = "libs"
-
-LICENSE = "SFML"
-LIC_FILES_CHKSUM = "file://license.md;md5=7019c1b3f42a8b324fe092a4967cbb31"
-
-DEPENDS = "openal-soft glibc gcc-runtime freetype mesa xcb-util-image libjpeg-turbo libxrandr"
-
-SRC_URI = "http://www.sfml-dev.org/files/SFML-${PV}-sources.zip"
-
-SRC_URI[md5sum] = "8533b22888102b4f0883311385fb1c71"
-SRC_URI[sha256sum] = "bf1e0643acb92369b24572b703473af60bac82caf5af61e77c063b779471bb7f"
-
-S = "${WORKDIR}/SFML-${PV}"
-
-inherit cmake
-
-FILES:${PN} =+ "${datadir}/SFML"

recipes-gamelib/sfml/sfml_2.6.1.bb

@@ -0,0 +1,21 @@
+DESCRIPTION = "Simple and Fast Multimedia Library"
+HOMEPAGE = "https://www.sfml-dev.org/"
+SECTION = "libs"
+
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://license.md;md5=3ddaca891aa952cf42b3ba95d3b853e7"
+
+DEPENDS = "openal-soft glibc gcc-runtime freetype mesa xcb-util-image libjpeg-turbo libxrandr libxcursor"
+
+SRC_URI = "\
+https://www.sfml-dev.org/files/SFML-${PV}-sources.zip \
+file://Remove-Libs.private-from-pc.patch \
+"
+
+SRC_URI[sha256sum] = "5bf19e5c303516987f7f54d4ff1b208a0f9352ffa1cd55f992527016de0e8cb7"
+
+S = "${WORKDIR}/SFML-${PV}"
+
+inherit cmake
+
+FILES:${PN} =+ "${datadir}/SFML"

recipes-games/etr/etr_0.8.4.bb

@@ -12,7 +12,7 @@ SRC_URI = " \
     file://simple-configure.patch \
 "
 
-SRC_URI[sha256sum] = "1c874965e9e249533bf15c08dabc61e60c05bb3fd578917880117ff8a910cd4e"
+SRC_URI[sha256sum] = "fa3285cc0c755a5aff529f3f2cea3516481114c6b4b8e1ec0769feeff04773e5"
 
 DEPENDS = "sfml virtual/libgl libglu"
 

recipes-games/freeciv/freeciv-qt6.inc

@@ -0,0 +1,10 @@
+
+require freeciv.inc
+
+inherit qt6-paths
+
+EXTRA_OECONF += "\
+--with-qtver=qt6 \
+--with-qt6-includes=${STAGING_DIR_HOST}${QT6_INSTALL_INCLUDEDIR} \
+--with-qt6-libs=${STAGING_DIR_HOST}${QT6_INSTALL_LIBDIR} \
+"

recipes-games/freeciv/freeciv.inc

@@ -11,11 +11,11 @@ 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"
+DEPENDS = "readline bzip2 curl xz zstd libsdl2-mixer gtk+3 gtk4 qtbase virtual/gettext qttools-native libsdl2-image libsdl2-ttf libsdl2-gfx freetype"
 
-S = "${WORKDIR}/freeciv-${PV}"
+S = "${UNPACKDIR}/freeciv-${PV}"
 B = "${WORKDIR}/build-${PV}"
 
 inherit autotools pkgconfig gettext
@@ -25,16 +25,21 @@ ac_cv_working_gettimeofday=yes \
 ac_cv_func_working_vsnprintf=yes \
 --enable-patient-connect \
 --enable-shared --enable-client=${FREECIV_GUI} \
+--disable-ruledit \
 --disable-mapimg \
 --disable-sdl2test \
 --with-sqlite3-prefix=${STAGING_DIR} \
 SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \
 "
 
+EXTRANATIVEPATH = "\
+../libexec \
+"
+
 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
@@ -88,6 +93,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 = "\

recipes-games/freeciv/freeciv/0019-Qt-Work-around-Qt-6.9-theming-issue.patch

@@ -0,0 +1,92 @@
+Upstream-Status: Backport
+
+From 48875b712fe1b5009a80a1fb4280fe1904677012 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Sun, 2 Nov 2025 09:14:58 +0200
+Subject: [PATCH 19/20] Qt: Work around Qt-6.9 theming issue
+
+See RM #1697
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+---
+ client/gui-qt/citydlg.cpp |  2 ++
+ client/gui-qt/gui_main.h  |  2 ++
+ client/gui-qt/themes.cpp  | 17 ++++++++++++++---
+ 3 files changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/client/gui-qt/citydlg.cpp b/client/gui-qt/citydlg.cpp
+index 1d569b8a8d..b2c6d5a6f7 100644
+--- a/client/gui-qt/citydlg.cpp
++++ b/client/gui-qt/citydlg.cpp
+@@ -2044,6 +2044,8 @@ city_dialog::city_dialog(QWidget *parent): qfc_dialog(parent)
+   installEventFilter(this);
+ 
+   ::city_dlg_created = true;
++
++  set_theme_style();
+ }
+ 
+ /************************************************************************//**
+diff --git a/client/gui-qt/gui_main.h b/client/gui-qt/gui_main.h
+index d825cba768..94d3a0d20f 100644
+--- a/client/gui-qt/gui_main.h
++++ b/client/gui-qt/gui_main.h
+@@ -23,4 +23,6 @@ QApplication *current_app();
+ #define CAPTURE_DEFAULT_THIS [=]
+ #endif // FREECIV_HAVE_CXX20_CAPTURE_THIS
+ 
++void set_theme_style();
++
+ #endif // FC__GUI_MAIN_H
+diff --git a/client/gui-qt/themes.cpp b/client/gui-qt/themes.cpp
+index 79092d65b2..6e4e5bdf3c 100644
+--- a/client/gui-qt/themes.cpp
++++ b/client/gui-qt/themes.cpp
+@@ -38,6 +38,8 @@ extern QString current_theme;
+ static QString def_app_style;
+ static QString stylestring;
+ 
++static QStyle *current_style = nullptr;
++
+ /*************************************************************************//**
+   Loads a qt theme directory/theme_name
+ *****************************************************************************/
+@@ -76,16 +78,17 @@ void qtg_gui_load_theme(const char *directory, const char *theme_name)
+   stylestring.replace(lnb, fake_dir + "/" + theme_name + "/");
+ 
+   if (QString(theme_name) == QString("System")) {
+-    QApplication::setStyle(QStyleFactory::create(def_app_style));
++    current_style = QStyleFactory::create(def_app_style);
+   } else {
+     QStyle *fstyle = QStyleFactory::create("Fusion");
+ 
+     if (fstyle != nullptr) {
+-      QApplication::setStyle(fstyle);
++      current_style = fstyle;
+     } else {
+-      QApplication::setStyle(QStyleFactory::create(def_app_style));
++      current_style = QStyleFactory::create(def_app_style);
+     }
+   }
++  QApplication::setStyle(current_style);
+ 
+   current_theme = theme_name;
+   QPixmapCache::clear();
+@@ -98,6 +101,14 @@ void qtg_gui_load_theme(const char *directory, const char *theme_name)
+   QApplication::setPalette(pal);
+ }
+ 
++/*************************************************************************//**
++  Set theme style again, to work around Qt theming bug.
++*****************************************************************************/
++void set_theme_style()
++{
++  QApplication::setStyle(current_style);
++}
++
+ /*************************************************************************//**
+   Clears a theme (sets default system theme)
+ *****************************************************************************/
+-- 
+2.51.0
+

recipes-games/freeciv/freeciv/allow-root-S3_1.patch

@@ -1,25 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 4fa608e29b..7f4b94166b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -793,6 +793,8 @@ if test "x$emscripten" = "xyes" ; then
-   AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - emscripten])
- fi
- 
-+AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - OpenEmbedded])
-+
- dnl Settings specific to host OS
- case "$host_os" in
- 
-diff --git a/meson.build b/meson.build
-index f746126902..7f50fc258e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -120,6 +120,7 @@ else
-     priv_conf_data.set('ALWAYS_ROOT', 1)
-   else
-     pub_conf_data.set('FREECIV_HAVE_PTHREAD', 1)
-+    priv_conf_data.set('ALWAYS_ROOT', 1)
-     net_dep = []
-   endif
- endif

recipes-games/freeciv/freeciv/allow-root-S3_2.patch

@@ -0,0 +1,31 @@
+Upstream-Status: Inappropriate
+
+diff --git a/configure.ac b/configure.ac
+index e7289e51e5..673e254ed7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -721,6 +721,8 @@ dnl Defaults to override with host specific values
+ HOST_PATH_SEPARATOR=":"
+ HOST_DIR_SEPARATOR="/"
+ 
++AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - OpenEmbedded])
++
+ dnl Settings specific to host OS
+ case "$host_os" in
+ 
+diff --git a/meson.build b/meson.build
+index dab9d6d93c..3111fcec4f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -328,9 +328,10 @@ else
+     threads='pthread'
+   endif
+ 
++  priv_conf_data.set('ALWAYS_ROOT', 1)
++
+   if host_system == 'haiku'
+     net_dep = c_compiler.find_library('network')
+-    priv_conf_data.set('ALWAYS_ROOT', 1)
+   else
+     net_dep = []
+   endif

recipes-games/freeciv/freeciv/allow-root.patch

@@ -1,17 +0,0 @@
-Allow root to run freeciv
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-
-diff --git a/configure.ac b/configure.ac
-index f2ca1f093d..555f23e0b6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -678,6 +678,8 @@ dnl Defaults to override with host specific values
- HOST_PATH_SEPARATOR=":"
- HOST_DIR_SEPARATOR="/"
- 
-+AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - OpenEmbedded])
-+
- dnl Settings specific to host OS
- case "$host_os" in
- 

recipes-games/freeciv/freeciv/dummy-qtver-S2_6.patch

@@ -1,20 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e7651bea3e..a36dad82b1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -658,6 +658,15 @@ if test "x$XMLREGISTRY" = "xyes" ; then
-   AC_DEFINE([FREECIV_HAVE_XML_REGISTRY], [1], [Build xml-backend for registry])
- fi
- 
-+dnl Dummy configure option for OpenEmbedded build of older branches
-+dnl to avoid unrecognised option error
-+AC_ARG_WITH([qtver],
-+  AS_HELP_STRING([--with-qtver], [which Qt version to build against [qt5]]),
-+[case "${withval}" in
-+ qt5|Qt5) ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --with-qtver]) ;;
-+esac])
-+
- dnl Set debug flags supported by compiler
- EXTRA_DEBUG_CFLAGS=""
- EXTRA_DEBUG_CXXFLAGS=""

recipes-games/freeciv/freeciv/dummy-qtver.patch

@@ -1,20 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d26b8fdf28..8daa054344 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -612,6 +612,15 @@ PKG_CHECK_MODULES([ICU], [icu-uc],,
- UTILITY_CFLAGS="${UTILITY_CFLAGS} ${ICU_CFLAGS}"
- UTILITY_LIBS="${UTILITY_LIBS} ${ICU_LIBS}"
- 
-+dnl Dummy configure option for OpenEmbedded build of older branches
-+dnl to avoid unrecognised option error
-+AC_ARG_WITH([qtver],
-+  AS_HELP_STRING([--with-qtver], [which Qt version to build against [qt5]]),
-+[case "${withval}" in
-+ qt5|Qt5) ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --with-qtver]) ;;
-+esac])
-+
- dnl Set debug flags supported by compiler
- EXTRA_DEBUG_CFLAGS=""
- EXTRA_DEBUG_CXXFLAGS=""

recipes-games/freeciv/freeciv_2.6.8.bb

@@ -1,10 +0,0 @@
-
-require freeciv-qt5.inc
-
-SRC_URI += "\
-${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
-file://allow-root.patch \
-file://dummy-qtver-S2_6.patch \
-"
-
-SRC_URI[sha256sum] = "5a2476d11aea7712fdeaa6bb440b8396cf6cb74509b3f0b01947d3da180622be"

recipes-games/freeciv/freeciv_3.0.6.bb

@@ -1,10 +0,0 @@
-
-require freeciv-qt5.inc
-
-SRC_URI += "\
-${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
-file://allow-root.patch \
-file://dummy-qtver.patch \
-"
-
-SRC_URI[sha256sum] = "40e701157b957a2eb3c4548e5b819d06521c2ad1d47ae926be5117c7d6ace442"

recipes-games/freeciv/freeciv_3.2.1.bb

@@ -0,0 +1,12 @@
+
+require freeciv-qt6.inc
+
+DEPENDS += "lua"
+
+SRC_URI += "\
+${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
+file://allow-root-S3_2.patch \
+file://0019-Qt-Work-around-Qt-6.9-theming-issue.patch \
+"
+
+SRC_URI[sha256sum] = "3fc01ef55bfc9b9c2d71432d22a9fc5ab5892285d15d3dc888ec4bb288d21caa"

recipes-games/freeciv/freeciv_S3-1-git.bb

@@ -1,27 +0,0 @@
-
-require freeciv-qt5.inc
-
-DEFAULT_PREFERENCE = "-2"
-
-DEPENDS += "tolua-native lua gtk4"
-
-SRC_URI += "\
-git://github.com/freeciv/freeciv.git;protocol=https;branch=S3_1 \
-file://allow-root-S3_1.patch \
-"
-
-SRCREV="8d7cdf503164f296990c68e27a4fe3e2a87eb909"
-PN = "freeciv"
-PV = "3.1.0-alpha5"
-S = "${WORKDIR}/git"
-
-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 \
-"

recipes-games/gnome-games/gnome-chess_3.24.1.bb

@@ -5,7 +5,7 @@ LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "libgames-support glib-2.0 gtk+3 librsvg libcanberra intltool-native itstool-native"
 
-GNOME_COMPRESS_TYPE="xz"
+GNOME_COMPRESS_TYPE = "xz"
 
 inherit gnomebase gettext
 

recipes-games/gnome-games/gnome-robots_3.22.1.bb

@@ -5,7 +5,7 @@ LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "libgnome-games-support glib-2.0 gtk+3 librsvg libcanberra intltool-native itstool-native"
 
-GNOME_COMPRESS_TYPE="xz"
+GNOME_COMPRESS_TYPE = "xz"
 
 inherit gnomebase
 

recipes-games/supertux/supertux2_0.6.3.bb

@@ -1,6 +1,6 @@
 SUMMARY = "SuperTux is a classic 2D jump'n run sidescroller game"
 DESCRIPTION = "SuperTux is a classic 2D jump'n run sidescroller game in a style similar to the original Super Mario games covered under the GPL"
-HOMEAPAGE = "https://www.supertux.org/"
+HOMEPAGE = "https://www.supertux.org/"
 SECTION = "x11/application"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"

recipes-games/wesnoth/files/cstdint_include.patch

@@ -0,0 +1,25 @@
+
+Upstream-Status: Pending
+
+diff -Nurd wesnoth-1.16.9/src/deprecation.hpp wesnoth-1.16.9/src/deprecation.hpp
+--- wesnoth-1.16.9/src/deprecation.hpp	2023-04-16 04:16:27.000000000 +0300
++++ wesnoth-1.16.9/src/deprecation.hpp	2023-06-20 07:52:11.725014316 +0300
+@@ -15,6 +15,7 @@
+ #pragma once
+ 
+ #include <string>
++#include <cstdint>
+ 
+ /** See https://wiki.wesnoth.org/CompatibilityStandards for more info. */
+ enum class DEP_LEVEL : uint8_t { INDEFINITE = 1, PREEMPTIVE, FOR_REMOVAL, REMOVED };
+diff -Nurd wesnoth-1.16.9/src/serialization/base64.hpp wesnoth-1.16.9/src/serialization/base64.hpp
+--- wesnoth-1.16.9/src/serialization/base64.hpp	2023-04-16 04:16:27.000000000 +0300
++++ wesnoth-1.16.9/src/serialization/base64.hpp	2023-06-20 08:13:30.857173165 +0300
+@@ -17,6 +17,7 @@
+ 
+ #include <string_view>
+ #include <vector>
++#include <cstdint>
+ 
+ namespace utils
+ {

recipes-games/wesnoth/wesnoth_1.16.9.bb

@@ -4,7 +4,7 @@ SECTION = "games"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://copyright;md5=794c9526b4086a97155c27908976bbfd"
 
-DEPENDS = "asio freetype libsdl2-image libsdl2-mixer libsdl2-net libsdl2-ttf zlib boost pango libpng"
+DEPENDS = "asio freetype libsdl2-image libsdl2-mixer libsdl2-net libsdl2-ttf zlib boost pango libpng readline"
 
 SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
@@ -13,9 +13,10 @@ SRC_URI = " \
     file://0001-Find-sdl-CFLAGS-with-pkg-config-sdl-config-is-not-us.patch \
     file://0002-Do-not-do-the-ar-ranlib-configure-dance-it-won-t-wor.patch \
     file://0003-Do-not-adjust-compiler-flags.patch \
+    file://cstdint_include.patch \
 "
 
-SRC_URI[sha256sum] = "85c5ece5eb55807b9f155d7189bad21a1bd40f055a378bfb6e4d63e22cc16e7c"
+SRC_URI[sha256sum] = "3ded6938fb24100b9884ab5a902711f6c7a25cef65aafddb3e3b8a15b7652386"
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -140,7 +141,7 @@ FILES:${PN}-l = "\
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-l.mo \
 "
 
-FILES:${PN}-low ="\
+FILES:${PN}-low = "\
 	${datadir}/wesnoth/data/campaigns/Legend_of_Wesmere \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-low.mo \
 "