freeciv-3.2: Update to 3.2.6

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
This commit is contained in:
Marko Lindqvist
2026-09-04 18:34:46 +03:00
parent b2cbb9adca
commit 89e3f7b269
3 changed files with 13 additions and 54 deletions

View File

@@ -1,42 +0,0 @@
From 9c4cc96e176e9fc7049a7f44be1efcf36df3fd9a Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 27 Aug 2026 14:20:09 +0300
Subject: [PATCH 36/36] INSTALL.meson: Replace /home/cazfi with /home/user in
examples
See RM #2175
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Upstream-Status: Backport
---
doc/INSTALL.meson | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/INSTALL.meson b/doc/INSTALL.meson
index 670a914dea..ba4ab8e666 100644
--- a/doc/INSTALL.meson
+++ b/doc/INSTALL.meson
@@ -98,15 +98,15 @@ Configure options:
Configure options are given as '-D<option>=<value>'.
For example to set freeciv installation prefix as
-'/home/cazfi/freeciv-install':
+'/home/user/freeciv-install':
-> meson setup ../src -Dprefix=/home/cazfi/freeciv-install
+> meson setup ../src -Dprefix=/home/user/freeciv-install
You can give configure options when you first set up the build directory
(like in example above), or you can change configure options for the
build directory later by 'meson configure' subcommand like this:
-> meson configure -Dprefix=/home/cazfi/freeciv-install
+> meson configure -Dprefix=/home/user/freeciv-install
You get full list of configure options by running 'meson configure'
subcommand without any configure options to set
--
2.53.0

View File

@@ -1,12 +0,0 @@
require freeciv-qt6.inc
DEPENDS += "lua"
SRC_URI += "\
${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
file://allow-root-S3_2.patch \
file://0036-INSTALL.meson-Replace-home-cazfi-with-home-user-in-e.patch \
"
SRC_URI[sha256sum] = "d32808f02a9b9f49ef159bcbf266b16ce2a3ce6ea8f71115d80f952c3cc609e8"

View File

@@ -0,0 +1,13 @@
require freeciv-qt6.inc
DEPENDS += "lua"
SRC_URI += "\
${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
file://allow-root-S3_2.patch \
"
OEQA_BUILDPATHS_SKIP = "/home/cazfi"
SRC_URI[sha256sum] = "b3ce15f54083b1fca146f62837a5f7d41d298537fa34940cca70eeb09c7a9c6e"