diff --git a/recipes-games/freeciv/freeciv/allow-root-S3_2.patch b/recipes-games/freeciv/freeciv/allow-root-S3_2.patch index eadf6df..72a48a3 100644 --- a/recipes-games/freeciv/freeciv/allow-root-S3_2.patch +++ b/recipes-games/freeciv/freeciv/allow-root-S3_2.patch @@ -1,10 +1,10 @@ Upstream-Status: Inappropriate diff --git a/configure.ac b/configure.ac -index 657a3689e2..0f3e87a6a1 100644 +index e7289e51e5..673e254ed7 100644 --- a/configure.ac +++ b/configure.ac -@@ -756,6 +756,8 @@ dnl Defaults to override with host specific values +@@ -721,6 +721,8 @@ dnl Defaults to override with host specific values HOST_PATH_SEPARATOR=":" HOST_DIR_SEPARATOR="/" @@ -14,14 +14,18 @@ index 657a3689e2..0f3e87a6a1 100644 case "$host_os" in diff --git a/meson.build b/meson.build -index 0fa23a94c7..6471de9f3f 100644 +index dab9d6d93c..3111fcec4f 100644 --- a/meson.build +++ b/meson.build -@@ -312,6 +312,7 @@ else - priv_conf_data.set('ALWAYS_ROOT', 1) +@@ -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 - 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.2.0-beta1.bb b/recipes-games/freeciv/freeciv_3.2.0-beta2.bb similarity index 66% rename from recipes-games/freeciv/freeciv_3.2.0-beta1.bb rename to recipes-games/freeciv/freeciv_3.2.0-beta2.bb index 0687a90..98280be 100644 --- a/recipes-games/freeciv/freeciv_3.2.0-beta1.bb +++ b/recipes-games/freeciv/freeciv_3.2.0-beta2.bb @@ -10,4 +10,4 @@ ${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \ file://allow-root-S3_2.patch \ " -SRC_URI[sha256sum] = "2800c27096e69c3cbcd30ecda5a1c826cfd85db6db759e7f3bf327d2c9812eb8" +SRC_URI[sha256sum] = "425cce907e985cfe1b5a1815043bfc2b57c2e089d23f24be510921bd0d1ae7c3"