freeciv-3.0: Backport savegame loading fix

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

conf/layer.conf

@@ -9,4 +9,4 @@ 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"
+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

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.3.bb

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

recipes-games/freeciv/freeciv.inc

@@ -25,6 +25,7 @@ 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} \

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/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.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.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

@@ -1,19 +1,16 @@
 
 require freeciv-qt5.inc
 
-DEFAULT_PREFERENCE = "-2"
+DEFAULT_PREFERENCE = "-1"
 
-DEPENDS += "tolua-native lua gtk4"
+DEPENDS += "lua gtk4 zstd"
 
 SRC_URI += "\
-git://github.com/freeciv/freeciv.git;protocol=https;branch=S3_1 \
+${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
 file://allow-root-S3_1.patch \
 "
 
-SRCREV="8d7cdf503164f296990c68e27a4fe3e2a87eb909"
-PN = "freeciv"
-PV = "3.1.0-alpha5"
-S = "${WORKDIR}/git"
+SRC_URI[sha256sum] = "2fc4ad1f5833b60e18286e6dc5107ef9104d6d81a0e634b5448abdb73636d54e"
 
 FREECIV_GUI += "gtk4"
 

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"