From dd7479c971ec7b287e35cbae9946bdf4371c839b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 2 Nov 2025 21:22:49 +0200 Subject: [PATCH] freeciv-3.1: Drop Signed-off-by: Marko Lindqvist --- .../freeciv/freeciv/allow-root-S3_1.patch | 27 ------------------- recipes-games/freeciv/freeciv_3.1.5.bb | 11 -------- 2 files changed, 38 deletions(-) delete mode 100644 recipes-games/freeciv/freeciv/allow-root-S3_1.patch delete mode 100644 recipes-games/freeciv/freeciv_3.1.5.bb diff --git a/recipes-games/freeciv/freeciv/allow-root-S3_1.patch b/recipes-games/freeciv/freeciv/allow-root-S3_1.patch deleted file mode 100644 index 23945e8..0000000 --- a/recipes-games/freeciv/freeciv/allow-root-S3_1.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Inappropriate - -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 diff --git a/recipes-games/freeciv/freeciv_3.1.5.bb b/recipes-games/freeciv/freeciv_3.1.5.bb deleted file mode 100644 index f0cb9ee..0000000 --- a/recipes-games/freeciv/freeciv_3.1.5.bb +++ /dev/null @@ -1,11 +0,0 @@ - -require freeciv-qt6.inc - -DEPENDS += "lua" - -SRC_URI += "\ -${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \ -file://allow-root-S3_1.patch \ -" - -SRC_URI[sha256sum] = "0d9f687ff950a77a9fa0af66108a7f67da717fd40c3a0ca4c0a4f4a3f0214b33"