diff --git a/recipes-games/freeciv/freeciv/0002-Fix-server-crash-when-bribing.patch b/recipes-games/freeciv/freeciv/0002-Fix-server-crash-when-bribing.patch deleted file mode 100644 index a57b736..0000000 --- a/recipes-games/freeciv/freeciv/0002-Fix-server-crash-when-bribing.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d3e0ef6afe7c3f99d6a2af400d0c7c776695ac84 Mon Sep 17 00:00:00 2001 -From: Marko Lindqvist -Date: Thu, 2 Nov 2023 22:56:11 +0200 -Subject: [PATCH 2/2] Fix server crash when bribing - -Reported by omero - -See osdn #48931 - -Signed-off-by: Marko Lindqvist ---- - server/diplomats.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/server/diplomats.c b/server/diplomats.c -index 9787a82d0e..83547aa68f 100644 ---- a/server/diplomats.c -+++ b/server/diplomats.c -@@ -221,6 +221,12 @@ void diplomat_investigate(struct player *pplayer, struct unit *pdiplomat, - action_consequence_success(ACTION_SPY_INVESTIGATE_CITY, pplayer, cplayer, - city_tile(pcity), city_link(pcity)); - -+ conn_list_iterate(pplayer->connections, pconn) { -+ if (has_capability("obsinv", pconn->capability)) { -+ dsend_packet_investigate_finished(pconn, pdiplomat->id, pcity->id); -+ } -+ } conn_list_iterate_end; -+ - /* Spies always survive. Diplomats never do. */ - if (!unit_has_type_flag(pdiplomat, UTYF_SPY)) { - wipe_unit(pdiplomat, ULR_USED, NULL); -@@ -1483,12 +1489,6 @@ static bool diplomat_infiltrate_tile(struct player *pplayer, - } - } unit_list_iterate_end; - -- conn_list_iterate(pplayer->connections, pconn) { -- if (has_capability("obsinv", pconn->capability)) { -- dsend_packet_investigate_finished(pconn, pdiplomat->id, pcity->id); -- } -- } conn_list_iterate_end; -- - return TRUE; - } - --- -2.42.0 - diff --git a/recipes-games/freeciv/freeciv/dummy-qtver-S2_6.patch b/recipes-games/freeciv/freeciv/dummy-qtver-S2_6.patch deleted file mode 100644 index c9bfc29..0000000 --- a/recipes-games/freeciv/freeciv/dummy-qtver-S2_6.patch +++ /dev/null @@ -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="" diff --git a/recipes-games/freeciv/freeciv_2.6.10.bb b/recipes-games/freeciv/freeciv_2.6.10.bb deleted file mode 100644 index 5c8555b..0000000 --- a/recipes-games/freeciv/freeciv_2.6.10.bb +++ /dev/null @@ -1,11 +0,0 @@ - -require freeciv-qt5.inc - -SRC_URI += "\ -${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \ -file://0002-Fix-server-crash-when-bribing.patch \ -file://allow-root.patch \ -file://dummy-qtver-S2_6.patch \ -" - -SRC_URI[sha256sum] = "b7f5eb4cc99abeea1123614889f1432864014de4962839fabfa23fe4c64ad49d"