freeciv-3.0: Backport savegame loading fix

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"
-LAYERSERIES_COMPAT_games-layer = "dunfell gatesgarth hardknott honister kirkstone"
+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 nanbield"

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_1.0.4.bb

@@ -1,6 +1,8 @@
 DESCRIPTION = "SDL2 graphics drawing primitives and other support functions."
 SECTION = "libs"
 
+HOMEPAGE = "https://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
+
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e04e1feb331457e9da15e0c88d0e8097"
 

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

@@ -0,0 +1,21 @@
+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
+@@ -22,6 +22,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#ifndef LUA_SOURCE
++int tolua_tolua_open(lua_State *L);
++#endif
+ 
+ static void help (void)
+ {
+@@ -106,7 +109,6 @@
+ 
+ #ifndef LUA_SOURCE
+  {
+-  int tolua_tolua_open (lua_State* L);
+   tolua_tolua_open(L);
+  }
+ #else

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

@@ -0,0 +1,13 @@
+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
+@@ -393,8 +393,8 @@
+       }
+       else if (lua_isuserdata(L,-1) && *((void**)lua_touserdata(L,-1))==NULL) {
+         /* free object */
+-        free(u);
+         tolua_release(L,u);                /* unmap from tolua tables */
++        free(u);
+       }
+     }
+     lua_settop(L,top);

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

@@ -0,0 +1,11 @@
+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
+@@ -21,6 +21,7 @@
+ #include <stdlib.h>
+ #include <math.h>
+ 
++int tolua_bnd_takeownership(lua_State *L);
+ 
+ static char toluaname[128] = "tolua.";
+ static const char* TOLUANAME (const char* n)  

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

@@ -0,0 +1,12 @@
+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
+@@ -18,6 +18,8 @@
+ 
+ #include "tolua.h"
+ 
++#include "tolua_event.h"
++
+ /* Store at peer
+ 	* It stores, creating the corresponding table if needed,
+ 	* the pair key/value in the corresponding peer table

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

@@ -0,0 +1,27 @@
+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
+@@ -116,7 +116,10 @@
+  -- check self value
+  if class and static==nil then
+ 	 output('#ifndef TOLUA_RELEASE\n')
+-  output('  if (!self) tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);');
++	 output('  if (!self) {\n')
++	 output('    tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);\n')
++	 output('    return 0;\n')
++	 output('  }\n')
+ 		output('#endif\n')
+  end
+ 
+@@ -163,7 +166,10 @@
+ 		output('#ifndef TOLUA_RELEASE\n')
+ 		output('  tolua_Error tolua_err;')
+   if class and static==nil then
+-   output('  if (!self) tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);');
++   output('  if (!self) {\n')
++   output('    tolua_error(tolua_S,"invalid \'self\' in accessing variable \''..self.name..'\'",NULL);\n')
++   output('    return 0;\n')
++   output('  }\n')
+   elseif static then
+    _,_,self.mod = strfind(self.mod,'^%s*static%s%s*(.*)')
+   end

dependencies/tolua/tolua_5.2.4.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Lua binding generator for C/C++"
-DESCRIPTION = " tolua is a tool that greatly simplifies the integration of \
+DESCRIPTION = "Tolua is a tool that greatly simplifies the integration of \
 C/C++ code with Lua. Based on a cleaned header file, tolua automatically \
 generates the binding code to access C/C++ features from Lua. Using Lua API \
 and tag method facilities, tolua maps C/C++ constants, external variables, \
@@ -13,15 +13,20 @@ BBCLASSEXTEND = "native"
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://include/tolua.h;beginline=9;endline=12;md5=4a3fbc0759a4b8318d99f3d71a773105"
 
+# 0?- patches are from freeciv source tree. https://www.freeciv.org/
 SRC_URI = "\
  http://webserver2.tecgraf.puc-rio.br/~celes/tolua/tolua-${PV}.tar.gz \
  file://MakefileFix.patch \
  file://AllLuaPath.patch \
+ file://01-tolua_tolua_open-proto-before-need.patch \
+ file://02-fix-use-after-free.patch \
+ file://03-tolua_bnd_takeownership-prototype.patch \
+ file://04-include-tolua_event.patch \
+ file://05-gen-code-fix-null-dereferences.patch \
 "
 
 B = "${S}"
 
-SRC_URI[md5sum] = "c8dcf13555df45bdcd792981d7356997"
 SRC_URI[sha256sum] = "c5a6b701b3ced9a66e7a9881c9d94430f8612040827650abe1aa3c5c3fc95bf2"
 
 EXTRA_OEMAKE = "STAGING_DIR_NATIVE=${STAGING_DIR_NATIVE}"

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 = "http://www.sfml-dev.org/index.php"
-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/atanks/atanks_6.6.bb

@@ -1,5 +1,5 @@
 DESCRIPTION = "Annihilate the other tanks to earn money, then spend it on bigger and better shields and weapons to wipe out the opposition."
-HOMEPAGE = "http://atanks.sourceforge.net/"
+HOMEPAGE = "https://atanks.sourceforge.net/"
 SECTION = "games"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bfbc31ee85cf099e77a598c8a66dd124"
@@ -11,7 +11,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz
 
 inherit autotools-brokensep
 
-SRC_URI[md5sum] = "3182d080ea71c3837af57f3651b55025"
-SRC_URI[sha256sum] = "32182b2752a77ff362c378fc04b7c51fc15345caa4c8deaad59cc850dad2322e"
+SRC_URI[sha256sum] = "bc6b1efc9fc7e7624fad1d8352d72e927be0fba2160bb25bb6b8bd6c6370bf43"
 
 FILES:${PN} += "${datadir}"

recipes-games/etr/etr_0.8.3.bb

@@ -1,5 +1,6 @@
 SUMMARY = "High speed arctic racing game based on Tux Racer."
 DESCRIPTION = " "
+HOMEPAGE = "https://sourceforge.net/projects/extremetuxracer/"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
@@ -11,7 +12,7 @@ SRC_URI = " \
     file://simple-configure.patch \
 "
 
-SRC_URI[sha256sum] = "92da963ed32ab9bff126346edfb9549e871d7c3cec753f4ac5098e0d53c38341"
+SRC_URI[sha256sum] = "2ee42f3f5fc2f8d49aa75056eb116f6cab84d6564120e6961ae5927367245113"
 
 DEPENDS = "sfml virtual/libgl libglu"
 
@@ -20,5 +21,5 @@ B = "${WORKDIR}/build"
 inherit autotools
 
 do_install:append() {
-        rm -Rf ${D}/${datadir}/appdata
+        rm -Rf ${D}/${datadir}/metainfo
 }

recipes-games/freeciv/freeciv.inc

@@ -4,7 +4,7 @@ DESCRIPTION = "Freeciv is distributed under the GPL and implemented for X. \
  each player becomes leader of a civilization, fighting to obtain \
  the ultimate goal: The extinction of all other civilizations. \
  "
-HOMEPAGE = "http://www.freeciv.org/"
+HOMEPAGE = "https://www.freeciv.org/"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
@@ -15,18 +15,17 @@ FREECIV_GUI = "gtk3.22,qt,sdl2"
 
 DEPENDS = "readline bzip2 curl xz libsdl2-mixer gtk+3 qtbase virtual/gettext qttools-native libsdl2-image libsdl2-ttf libsdl2-gfx freetype"
 
-SRC_URI = "\
-file://allow-root.patch \
-"
-
 S = "${WORKDIR}/freeciv-${PV}"
 B = "${WORKDIR}/build-${PV}"
 
 inherit autotools pkgconfig gettext
 
 EXTRA_OECONF = "\
+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} \
@@ -40,6 +39,7 @@ ${PN}-gtk3.22 ${PN}-qt ${PN}-sdl2"
 
 do_install:append() {
         rm -Rf ${D}/${datadir}/appdata
+        rm -Rf ${D}/${datadir}/metainfo
         rm -Rf ${D}/${datadir}/icons/hicolor/*/*/freeciv-ruledit.png
 }
 
@@ -84,6 +84,7 @@ RDEPENDS:${PN}-gtk3.22 = "freeciv-common freeciv-client-common"
 RPROVIDES:${PN}-gtk3.22 = "freeciv-client"
 FILES:${PN}-gtk3.22 = "\
 ${bindir}/freeciv-gtk3.22 \
+${datadir}/freeciv/themes/gtk3.22 \
 ${datadir}/freeciv/themes/gui-gtk-3.22 \
 ${datadir}/freeciv/gtk3.22_menus.xml \
 "

recipes-games/freeciv/freeciv/0002-Reserve-space-for-terminating-NULL-on-astr_buffer.patch

@@ -0,0 +1,36 @@
+From 03df29aaa12892b851d13f291977be3e7679e560 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Mon, 27 Nov 2023 01:29:52 +0200
+Subject: [PATCH 2/3] Reserve space for terminating NULL on astr_buffer
+
+Growing the buffer was always considered a failure,
+as it was one byte too small even after giving out
+the requested size.
+
+Reported by Giacomo Mulas
+
+Debian Bug#1056916
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com><
+---
+ utility/astring.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/utility/astring.c b/utility/astring.c
+index 44d39f582c..cfcb67565f 100644
+--- a/utility/astring.c
++++ b/utility/astring.c
+@@ -234,8 +234,8 @@ static inline void astr_vadd_at(struct astring *astr, size_t at,
+   va_copy(copy, ap);
+ 
+   req_len = fc_vsnprintf(buffer, buffer_size, format, ap);
+-  if (req_len > buffer_size) {
+-    buffer = astr_buffer_grow(req_len, &buffer_size);
++  if (req_len + 1 > buffer_size) {
++    buffer = astr_buffer_grow(req_len + 1, &buffer_size);
+     /* Even if buffer is *still* too small, we fill what we can */
+     req_len = fc_vsnprintf(buffer, buffer_size, format, copy);
+     if (req_len > buffer_size) {
+-- 
+2.42.0
+

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

@@ -0,0 +1,25 @@
+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/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_2.6.6.bb

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

recipes-games/freeciv/freeciv_3.0.0.bb

@@ -1,11 +0,0 @@
-
-require freeciv-qt5.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI += "\
-${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
-file://dummy-qtver.patch \
-"
-
-SRC_URI[sha256sum] = "ea2a8782d4fdfef2471e05b74569b4a69cc60a41ab279427860dafdac128a0b2"

recipes-games/freeciv/freeciv_3.0.9.bb

@@ -0,0 +1,11 @@
+
+require freeciv-qt5.inc
+
+SRC_URI += "\
+${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
+file://allow-root.patch \
+file://dummy-qtver.patch \
+file://0002-Reserve-space-for-terminating-NULL-on-astr_buffer.patch \
+"
+
+SRC_URI[sha256sum] = "16c46a9c378b4a511c1e3d3a7c435a78230a432d8b852202aaf5d5d584962742"

recipes-games/freeciv/freeciv_3.1.0-beta3.bb

@@ -0,0 +1,24 @@
+
+require freeciv-qt5.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS += "lua gtk4 zstd"
+
+SRC_URI += "\
+${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
+file://allow-root-S3_1.patch \
+"
+
+SRC_URI[sha256sum] = "2fc4ad1f5833b60e18286e6dc5107ef9104d6d81a0e634b5448abdb73636d54e"
+
+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/maelstrom/maelstrom/0001-Use-pkg-config-to-find-sdl.patch

@@ -9,26 +9,19 @@ Content-Transfer-Encoding: 8bit
 Upstream-Status: Inappropriate [OE specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- configure.in | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index 0170f4b..a6f76ac 100644
---- a/configure.in
-+++ b/configure.in
-@@ -47,10 +47,7 @@ AC_SUBST(INETLIB)
+diff -Nurd Maelstrom-3.0.7/configure.in Maelstrom-3.0.7/configure.in
+--- Maelstrom-3.0.7/configure.in	2021-02-04 19:17:55.000000000 +0200
++++ Maelstrom-3.0.7/configure.in	2022-08-24 23:12:31.161825755 +0300
+@@ -47,10 +47,7 @@
  
  dnl Check for SDL
- SDL_VERSION=1.2.0
--AM_PATH_SDL($SDL_VERSION,
+ SDL_VERSION=2.0.14
+-AM_PATH_SDL2($SDL_VERSION,
 -            :,
 -            AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
 -)
-+PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION], [HAVE_SDL=yes], [AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])])
++PKG_CHECK_MODULES([SDL], [sdl2 >= $SDL_VERSION], [HAVE_SDL=yes], [AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])])
  CFLAGS="$CFLAGS $SDL_CFLAGS"
  LIBS="$LIBS $SDL_LIBS"
  
--- 
-2.20.1
-

recipes-games/maelstrom/maelstrom/0003-Fix-install-dir.patch

@@ -1,44 +0,0 @@
-From b051343fcac17227369bc4c7e0b0b00811500e24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Tue, 12 Feb 2019 15:06:01 +0100
-Subject: [PATCH] Fix install dir
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [Configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- Makefile.am  | 2 +-
- configure.in | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 4a9e949..a3194fc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -65,7 +65,7 @@ DIST_SUBDIRS = $(SUBDIRS) Images Docs
- 
- # Special install rule for the game
- install:
--	make install_gamedata target=@GAME_INSTALLDIR@
-+	make install_gamedata target=$(DESTDIR)@GAME_INSTALLDIR@
- 
- install_gamedata:
- 	sh mkinstalldirs $(target)/
-diff --git a/configure.in b/configure.in
-index a6f76ac..e158dd2 100644
---- a/configure.in
-+++ b/configure.in
-@@ -105,6 +105,7 @@ case "$target" in
-         GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
-         ;;
- esac
-+GAME_INSTALLDIR="\$(datadir)/$PACKAGE"
- AC_SUBST(GAME_INSTALLDIR)
- CFLAGS="$CFLAGS -DLIBDIR=\\\"$GAME_INSTALLDIR\\\""
- 
--- 
-2.20.1
-

recipes-games/maelstrom/maelstrom/0004-Maelstrom-3.0.6-setgid.patch

@@ -13,22 +13,16 @@ Upstream-Status: Pending
 [1] https://src.fedoraproject.org/cgit/rpms/Maelstrom.git/tree/Maelstrom-3.0.6-setgid.patch
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- main.cpp   |  8 +++++
- scores.cpp | 87 ++++++++++++++++++++++++++++++++++--------------------
- scores.h   |  1 +
- 3 files changed, 64 insertions(+), 32 deletions(-)
 
-diff --git a/main.cpp b/main.cpp
-index 7728c0b..851cf01 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -170,12 +170,20 @@ int main(int argc, char *argv[])
+diff -Nurd Maelstrom-3.0.7/main.cpp Maelstrom-3.0.7/main.cpp
+--- Maelstrom-3.0.7/main.cpp	2021-02-04 18:50:27.000000000 +0200
++++ Maelstrom-3.0.7/main.cpp	2022-08-24 22:46:23.571071218 +0300
+@@ -170,12 +170,20 @@
  	/* Command line flags */
  	int doprinthigh = 0;
  	int speedtest = 0;
 +	gid_t gid;
- 	Uint32 video_flags = SDL_SWSURFACE;
+ 	Uint32 video_flags = SDL_WINDOW_FULLSCREEN_DESKTOP;
  
  	/* Normal variables */
  	SDL_Event event;
@@ -44,10 +38,9 @@ index 7728c0b..851cf01 100644
  #ifndef __WIN95__
  	/* The first thing we do is calculate our checksum */
  	(void) checksum();
-diff --git a/scores.cpp b/scores.cpp
-index 1633e8f..c8b53b5 100644
---- a/scores.cpp
-+++ b/scores.cpp
+diff -Nurd Maelstrom-3.0.7/scores.cpp Maelstrom-3.0.7/scores.cpp
+--- Maelstrom-3.0.7/scores.cpp	2021-02-06 07:35:46.000000000 +0200
++++ Maelstrom-3.0.7/scores.cpp	2022-08-24 22:53:05.896048770 +0300
 @@ -4,6 +4,8 @@
  */
  
@@ -57,7 +50,7 @@ index 1633e8f..c8b53b5 100644
  #include <sys/types.h>
  #include <sys/stat.h>
  #endif
-@@ -15,11 +17,11 @@
+@@ -15,7 +17,7 @@
  #include "load.h"
  #include "dialog.h"
  
@@ -66,11 +59,6 @@ index 1633e8f..c8b53b5 100644
  #define NUM_SCORES		10		// Do not change this!
  
  /* Everyone can write to scores file if defined to 0 */
--#define SCORES_PERMMASK		0
-+#define SCORES_PERMMASK		002
- 
- #define CLR_DIALOG_WIDTH	281
- #define CLR_DIALOG_HEIGHT	111
 @@ -27,10 +29,31 @@
  Bool gNetScores = 0;
  Scores hScores[NUM_SCORES];
@@ -100,12 +88,12 @@ index 1633e8f..c8b53b5 100644
 +
  void LoadScores(void)
  {
--	LibPath path;
+-	SavePath path;
 -	SDL_RWops *scores_src;
  	int i;
  
  	/* Try to load network scores, if we can */
-@@ -44,50 +67,50 @@ void LoadScores(void)
+@@ -44,50 +67,50 @@
  	}
  	memset(&hScores, 0, sizeof(hScores));
  
@@ -135,7 +123,7 @@ index 1633e8f..c8b53b5 100644
  
  void SaveScores(void)
  {
--	LibPath path;
+-	SavePath path;
 -	SDL_RWops *scores_src;
  	int i;
 -#ifdef unix
@@ -184,10 +172,9 @@ index 1633e8f..c8b53b5 100644
  }
  
  /* Just show the high scores */
-diff --git a/scores.h b/scores.h
-index 4126260..4716751 100644
---- a/scores.h
-+++ b/scores.h
+diff -Nurd Maelstrom-3.0.7/scores.h Maelstrom-3.0.7/scores.h
+--- Maelstrom-3.0.7/scores.h	1998-07-14 04:50:17.000000000 +0300
++++ Maelstrom-3.0.7/scores.h	2022-08-24 22:44:34.517672737 +0300
 @@ -2,6 +2,7 @@
  // Functions from scores.cc
  extern void	LoadScores(void);
@@ -196,6 +183,3 @@ index 4126260..4716751 100644
  extern int	ZapHighScores(void);
  extern int	GetStartLevel(void);
  extern void	PrintHighScores(void);
--- 
-2.20.1
-

recipes-games/maelstrom/maelstrom/0005-SDL_FrameBuf.cpp-Fix-build-for-64Bit-targets.patch

@@ -1,37 +0,0 @@
-From da490238ae606cc4dcb704fb739d3e6f523b1976 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Tue, 27 Oct 2020 19:50:25 +0100
-Subject: [PATCH] SDL_FrameBuf.cpp: Fix build for 64Bit targets
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Stolen from [1]
-
-[1] https://src.fedoraproject.org/rpms/Maelstrom/blob/master/f/Maelstrom-3.0.6-64bit.patch
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- screenlib/SDL_FrameBuf.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/screenlib/SDL_FrameBuf.cpp b/screenlib/SDL_FrameBuf.cpp
-index d1e087f..430e903 100644
---- a/screenlib/SDL_FrameBuf.cpp
-+++ b/screenlib/SDL_FrameBuf.cpp
-@@ -848,8 +848,8 @@ FrameBuf:: AddDirtyRect(SDL_Rect *rect)
- 			for ( i=0; i<dirtymaplen; ++i ) {
- 				if ( dirtymap[i] != NULL ) {
- 					dirtymap[i] = (SDL_Rect *)(
--					((int)dirtymap[i]-(int)updatelist) +
--								(int)newlist
-+					((long)dirtymap[i]-(long)updatelist) +
-+								(long)newlist
- 					);
- 				}
- 			}
--- 
-2.26.2
-

recipes-games/maelstrom/maelstrom_3.0.7.bb

@@ -1,32 +1,34 @@
 SUMMARY = "Maelstrom is a GPL'd port of the shareware game for the Macintosh"
 LICENSE = "GPL-2.0-only & CC-BY-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0642955deaee2fa53c36bc592dc1ef25"
+LIC_FILES_CHKSUM = "\
+ file://COPYING.GPL;md5=d368405f1c604912f51ba286eed9944a \
+ file://COPYING.txt;md5=1ade764d012d246f775dc01dc4f7c1af \
+"
+
 HOMEPAGE = "https://www.libsdl.org/projects/Maelstrom/"
 
 inherit autotools-brokensep pkgconfig gettext gtk-icon-cache
 
 DEPENDS += " \
-    libsdl-net \
+    libsdl2-net \
 "
 
 SRC_URI = " \
     https://www.libsdl.org/projects/Maelstrom/src/Maelstrom-${PV}.tar.gz \
     file://0001-Use-pkg-config-to-find-sdl.patch \
     file://0002-buttonlist.h-Fix-build-with-recent-gcc-s.patch \
-    file://0003-Fix-install-dir.patch \
     file://0004-Maelstrom-3.0.6-setgid.patch \
-    file://0005-SDL_FrameBuf.cpp-Fix-build-for-64Bit-targets.patch \
     file://0006-scores.cpp-Fix-build-with-hardened-security-flags.patch \
     file://maelstrom.png \
     file://Maelstrom.desktop \
 "
-SRC_URI[md5sum] = "96aa6359538a6bd60b4198a792de578b"
-SRC_URI[sha256sum] = "e7983c2c7376cdcca1944db1706d92aedd529638cf13358c88a60df982ba7b46"
+
+SRC_URI[sha256sum] = "93680322f4b04d4727ea8e0b461f259b604dc69e7465cb91d2b9aad378a9a036"
 
 S = "${WORKDIR}/Maelstrom-${PV}"
 
 do_configure:prepend() {
-    touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog
+    touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/COPYING ${S}/README
 }
 
 do_install() {
@@ -39,7 +41,6 @@ do_install() {
     install -m 644 ${WORKDIR}/maelstrom.png ${D}/${datadir}/icons/hicolor/48x48/apps
 
     install -d ${D}/${localstatedir}/lib/games
-    mv ${D}${datadir}/Maelstrom/*Scores ${D}/${localstatedir}/lib/games
 }
 
-FILES:${PN} += "${datadir}/Maelstrom"
+FILES:${PN} += "/usr/games/Maelstrom"

recipes-games/pingus/pingus_0.7.6.bb

@@ -2,7 +2,7 @@ DESCRIPTION = "Pingus is a free Lemmings clone."
 DEPENDS = "virtual/libiconv boost libpng libglu libsdl-mixer libsdl-image"
 LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-HOMEPAGE = "http://pingus.seul.org/"
+HOMEPAGE = "https://pingus.gitlab.io/"
 
 RDEPENDS:${PN} += "libmikmod bash"
 

recipes-games/supertux/files/0004-Fix-missing-include-with-latest-glibc.patch

@@ -0,0 +1,34 @@
+From ee4ffc159acfb34dd47b1810448ee567fdfb427d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 21 Sep 2022 23:29:10 +0200
+Subject: [PATCH] Fix missing include with latest glibc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+| SuperTux-v0.6.3-Source/external/partio_zip/zip_manager.hpp:70:10: error: 'unique_ptr' in namespace 'std' does not name a template type
+|    70 |     std::unique_ptr<std::ostream> Add_File(const std::string& filename,const bool binary=true);
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ external/partio_zip/zip_manager.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/external/partio_zip/zip_manager.hpp b/external/partio_zip/zip_manager.hpp
+index 666884d..5cc6ff8 100644
+--- a/external/partio_zip/zip_manager.hpp
++++ b/external/partio_zip/zip_manager.hpp
+@@ -47,6 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ #include <string>
+ #include <stdexcept>
+ #include <vector>
++#include <memory>
+ 
+ namespace Partio{
+ struct ZipFileHeader;
+-- 
+2.35.3
+

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 = "http://supertux.lethargik.org"
+HOMEPAGE = "https://www.supertux.org/"
 SECTION = "x11/application"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
@@ -20,6 +20,7 @@ SRC_URI = " \
     file://0001-CMakeLists.txt-Pin-PHYSFS_getPrefDir-autodetection-d.patch \
     file://0002-do-not-set-included-paths-as-system-causes-trouble-w.patch \
     file://0003-Set-DCMAKE_MAKE_PROGRAM-make-explicitly-for-external.patch \
+    file://0004-Fix-missing-include-with-latest-glibc.patch \
 "
 
 SRC_URI[sha256sum] = "f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6"

recipes-games/supertuxkart/supertuxkart/0001-Fix-MIPS-compilation.patch

@@ -1,50 +0,0 @@
-From 1cce43b2fa368152b83b12c21b3183c7affc9fa9 Mon Sep 17 00:00:00 2001
-From: Benau <Benau@users.noreply.github.com>
-Date: Thu, 7 Oct 2021 16:30:32 +0800
-Subject: [PATCH] Fix MIPS compilation
-
----
- src/graphics/sp/sp_texture.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/graphics/sp/sp_texture.cpp b/src/graphics/sp/sp_texture.cpp
-index 383db7030..000d66cff 100644
---- a/src/graphics/sp/sp_texture.cpp
-+++ b/src/graphics/sp/sp_texture.cpp
-@@ -797,27 +797,27 @@ std::vector<std::pair<core::dimension2du, unsigned> >
-     assert(c->getReferenceCount() == 1);
-     std::shared_ptr<video::IImage> compressed(c);
- 
--    uint8_t* mips = new uint8_t[image->getDimension().getArea() * 4]();
--    uint8_t* mips_loc = mips;
-+    uint8_t* mipmaps = new uint8_t[image->getDimension().getArea() * 4]();
-+    uint8_t* mipmaps_loc = mipmaps;
-     uint8_t* compressed_loc = (uint8_t*)compressed->lock();
-     squishCompressImage((uint8_t*)image->lock(),
-         mipmap_sizes[0].first.Width, mipmap_sizes[0].first.Height,
-         mipmap_sizes[0].first.Width * 4, compressed->lock(), tc_flag);
- 
-     // Now compress mipmap
--    generateHQMipmap(image->lock(), mipmap_sizes, mips);
-+    generateHQMipmap(image->lock(), mipmap_sizes, mipmaps);
-     compressed_loc += mipmap_sizes[0].second;
-     for (unsigned mip = 1; mip < mipmap_sizes.size(); mip++)
-     {
--        squishCompressImage(mips_loc,
-+        squishCompressImage(mipmaps_loc,
-             mipmap_sizes[mip].first.Width, mipmap_sizes[mip].first.Height,
-             mipmap_sizes[mip].first.Width * 4, compressed_loc, tc_flag);
--        mips_loc += mipmap_sizes[mip].first.Width *
-+        mipmaps_loc += mipmap_sizes[mip].first.Width *
-             mipmap_sizes[mip].first.Height * 4;
-         compressed_loc += mipmap_sizes[mip].second;
-     }
- 
--    delete [] mips;
-+    delete [] mipmaps;
-     image.swap(compressed);
- #endif
-     return mipmap_sizes;
--- 
-2.34.1
-

recipes-games/supertuxkart/supertuxkart_1.4.bb

@@ -1,5 +1,5 @@
 DESCRIPTION = "SuperTuxKart is a kart racing game featuring Tux and his friends"
-HOMEPAGE = "http://supertuxkart.sourceforge.net"
+HOMEPAGE = "https://supertuxkart.sourceforge.net"
 SECTION = "x11/application"
 LICENSE = "GPL-2.0-only & GPL-3.0-or-later & CC-BY-SA-3.0 & CC-BY-SA-4.0 & PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bcfdeb69518cfe348a07845ebba5c295"
@@ -26,10 +26,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = " \
     https://github.com/supertuxkart/stk-code/releases/download/${PV}/SuperTuxKart-${PV}-src.tar.xz \
-    file://0001-Fix-MIPS-compilation.patch \
 "
 
-SRC_URI[sha256sum] = "eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd"
+SRC_URI[sha256sum] = "9890392419baf4715313f14d5ad60746f276eed36eb580636caf44e2532c0f03"
 
 S = "${WORKDIR}/SuperTuxKart-${PV}-src"
 

recipes-games/wesnoth/files/0003-Do-not-adjust-compiler-flags.patch

@@ -19,22 +19,18 @@ Fixes build errors as:
 Upstream-Status: Inappropriate Inappropriate [oe specific]
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- CMakeLists.txt | 16 ++--------------
- 1 file changed, 2 insertions(+), 14 deletions(-)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aaf6923..04efa09 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -218,20 +218,8 @@ if(NOT WIN32)
+diff -Nurd wesnoth-1.16.5/CMakeLists.txt wesnoth-1.16.5/CMakeLists.txt
+--- wesnoth-1.16.5/CMakeLists.txt	2022-08-24 19:31:59.541867878 +0300
++++ wesnoth-1.16.5/CMakeLists.txt	2022-08-24 19:33:34.818527791 +0300
+@@ -218,20 +218,8 @@
  		set(COMPILER_FLAGS "${COMPILER_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls")
  	endif()
  
 -### Set the final compiler flags.
- 
--	set(COMPILER_FLAGS "${COMPILER_FLAGS} ${CXX_FLAGS_USER}")
 -
+-	set(COMPILER_FLAGS "${COMPILER_FLAGS} ${CXX_FLAGS_USER}")
+ 
 -	if(NOT "${CMAKE_CXX_FLAGS}" STREQUAL "${COMPILER_FLAGS}")
 -		MESSAGE(STATUS "CMake compiler flags set to »${COMPILER_FLAGS}«")
 -		set(CMAKE_CXX_FLAGS
@@ -49,15 +45,12 @@ index aaf6923..04efa09 100644
  
  # #
  # Determine optimization level
-@@ -416,7 +404,7 @@ if(NOT WIN32)
+@@ -416,7 +404,7 @@
  # End setting profiler build options
  # #
  else()
 -	set(CMAKE_CXX_FLAGS "/W3 /WX /wd4503 /wd4351 /wd4250 /wd4244 /wd4267 /we4239 /wd4275 /EHsc /utf-8" CACHE STRING "Global flags used by the CXX compiler during all builds." FORCE)
 +	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /WX /wd4503 /wd4351 /wd4250 /wd4244 /wd4267 /we4239 /wd4275 /EHsc /utf-8" CACHE STRING "Global flags used by the CXX compiler during all builds." FORCE)
+ 	set(CMAKE_C_FLAGS "/WX" CACHE STRING "Global flags used by the C compiler during all builds." FORCE)
  	add_definitions(-D_WIN32_WINNT=_WIN32_WINNT_WIN7 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -DNOMINMAX)
  
- 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG_LUA")
--- 
-2.34.1
-

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

@@ -1,10 +1,10 @@
 DESCRIPTION = "The Battle for Wesnoth is a turn-based strategy game with a fantasy theme."
-HOMEPAGE = "http://www.wesnoth.org/"
+HOMEPAGE = "https://www.wesnoth.org/"
 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] = "729fd0903a28af502240d08c0a27b9ff50e534677644b639d8fd33823a7a9799"
+SRC_URI[sha256sum] = "3ded6938fb24100b9884ab5a902711f6c7a25cef65aafddb3e3b8a15b7652386"
 
 ARM_INSTRUCTION_SET = "arm"