36 Commits

Author SHA1 Message Date
Marko Lindqvist
dd7479c971 freeciv-3.1: Drop
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-11-02 21:22:49 +02:00
Marko Lindqvist
f7ad9b9b29 freeciv-3.2: Update to 3.2.1
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-11-02 21:21:16 +02:00
Marko Lindqvist
edd236da64 freeciv-3.2: Update to 3.2.0
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-07-18 22:47:31 +03:00
Marko Lindqvist
9a176fdc5a freeciv-3.2: Update to 3.2.0-RC1
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-07-04 06:43:29 +03:00
Marko Lindqvist
9f6a3d43f0 freeciv: Mark source dir relative to unpackdir
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-07-04 06:38:46 +03:00
Marko Lindqvist
b952cced8a libsdl2-gfx: Mark source dir relative to unpackdir
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-07-04 06:38:04 +03:00
Marko Lindqvist
3e462aafc2 Mark layer compatible with whinlatter
...and only with it.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-07-04 05:02:15 +03:00
Marko Lindqvist
428c6d8122 freeciv: Set moc path via EXTRANATIVEPATH
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-06-16 15:43:10 +03:00
Marko Lindqvist
9c364f8dd3 freeciv: Update to version 3.1.5
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-05-09 18:33:15 +03:00
Marko Lindqvist
6d11b66167 Add spaces around assignments
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-04-25 18:26:20 +03:00
Marko Lindqvist
b97f952d59 layer.conf: Mark compatible with walnascar
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-04-25 18:18:42 +03:00
Marko Lindqvist
c14691ec54 freeciv-3.2: Update to 3.2.0-beta2
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-04-25 18:18:07 +03:00
Marko Lindqvist
ffd79a9599 freeciv: Update to version 3.1.4
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2025-01-04 02:13:24 +02:00
Marko Lindqvist
f07ec6e48d freeciv-3.2: Update to 3.2.0-beta1
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-12-06 04:08:01 +02:00
Marko Lindqvist
3073825606 freeciv-3.2: Add
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-11-14 02:18:45 +02:00
Marko Lindqvist
966c6d9bd1 freeciv: Update to version 3.1.3
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-10-11 03:11:16 +03:00
Marko Lindqvist
f6c21b53c5 layer.conf: Mark compatible with styhead
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-09-19 19:01:23 +03:00
Marko Lindqvist
c38431ebe8 freeciv: Drop deprecated dummy-qtver.patch
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-07-28 01:33:20 +03:00
Marko Lindqvist
9c60ad069d freeciv: Update to version 3.1.2
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-07-06 00:26:47 +03:00
Marko Lindqvist
caef5f2b42 freeciv: Add Upstream-Status to patch
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-06-28 13:26:08 +03:00
Marko Lindqvist
8b111dedf1 libsdl2-gfx: Add Upstream-Status to patch
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-06-28 13:25:31 +03:00
Marko Lindqvist
407085033f tolua: Add Upstream-Status for patches
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-06-28 08:41:06 +03:00
Marko Lindqvist
bd190122d3 libsdl2-gfx: Fix build
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-05-30 03:59:28 +03:00
Marko Lindqvist
3b4817515b freeciv: Move gtk4,zstd dependency definitions to .inc
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-05-16 03:44:33 +03:00
Marko Lindqvist
7062055da3 etr: Update to 0.8.4
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-05-16 03:05:24 +03:00
Marko Lindqvist
96b903afe7 freeciv: Update to version 3.1.1
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-04-27 13:39:13 +03:00
Marko Lindqvist
af1e7fab69 tolua: Add 06-gen-code-no-trailing-spaces.patch
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-04-19 20:49:02 +03:00
Marko Lindqvist
4355eeb87c freeciv: Switch to Qt6
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-04-18 19:33:24 +03:00
Marko Lindqvist
5274c2bc59 freeciv: Fix build against Qt-6.8
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-04-17 07:47:37 +03:00
Marko Lindqvist
2082d74c18 freeciv: Handle gtk4-client in freeciv.inc
No version without gtk4-client is supported any more.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-04-05 20:48:02 +03:00
Marko Lindqvist
ed70c46d18 freeciv: Drop freeciv-3.0
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-04-02 19:07:13 +03:00
Marko Lindqvist
eeb64e60b4 freeciv: Add freeciv-qt6.inc
Currently unused replacement for freeciv-qt5.inc.
Just change which one freeciv-3.1 main recipe includes to
switch between Qt5 and Qt6 support.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-03-21 19:54:11 +02:00
Marko Lindqvist
a96eb3d4f0 layer.conf: Mark compatible with scarthgap
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-03-21 19:53:17 +02:00
Marko Lindqvist
0109d24fa4 freeciv-3.1: Update to 3.1.0
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-03-01 17:11:13 +02:00
Marko Lindqvist
c8c4835977 freeciv-3.0: Update to 3.0.10
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-02-10 15:25:35 +02:00
Marko Lindqvist
e9caf1ca3b freeciv-3.1: Update to beta4
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
2024-01-01 01:35:42 +02:00
27 changed files with 212 additions and 166 deletions

View File

@@ -8,5 +8,5 @@ BBFILE_COLLECTIONS += "games-layer"
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 nanbield"
LAYERDEPENDS_games-layer = "core openembedded-layer filesystems-layer gnome-layer networking-layer multimedia-layer meta-python qt6-layer"
LAYERSERIES_COMPAT_games-layer = "whinlatter"

View File

@@ -1,22 +1,13 @@
diff -Nurd SDL2_gfx-1.0.1/autogen.sh SDL2_gfx-1.0.1/autogen.sh
--- SDL2_gfx-1.0.1/autogen.sh 2012-09-05 04:51:19.000000000 +0300
+++ SDL2_gfx-1.0.1/autogen.sh 2016-09-18 18:21:14.113749811 +0300
@@ -1,6 +1,6 @@
#!/bin/sh
#
-aclocal -I acinclude
+aclocal -I m4
automake --foreign --include-deps --add-missing --copy
autoconf
diff -Nurd SDL2_gfx-1.0.1/configure.in SDL2_gfx-1.0.1/configure.in
--- SDL2_gfx-1.0.1/configure.in 2014-06-19 09:11:23.000000000 +0300
+++ SDL2_gfx-1.0.1/configure.in 2016-09-18 18:21:59.205661379 +0300
Upstream-Status: Inactive-Upstream
diff -Nurd SDL2_gfx-1.0.4/configure.in SDL2_gfx-1.0.4/configure.in
--- SDL2_gfx-1.0.4/configure.in 2024-05-30 03:24:19.046203935 +0300
+++ SDL2_gfx-1.0.4/configure.in 2024-05-30 03:25:04.462372638 +0300
@@ -44,6 +44,8 @@
dnl Setup for automake
AM_INIT_AUTOMAKE(SDL2_gfx, $VERSION)
+AC_CONFIG_MACRO_DIRS([m4])
+AC_CONFIG_MACRO_DIRS([acinclude])
+
dnl Check for tools
AC_PROG_LIBTOOL

View File

@@ -16,7 +16,7 @@ SRC_URI = "\
SRC_URI[md5sum] = "15f9866c6464ca298f28f62fe5b36d9f"
SRC_URI[sha256sum] = "63e0e01addedc9df2f85b93a248f06e8a04affa014a835c2ea34bfe34e576262"
S = "${WORKDIR}/SDL2_gfx-${PV}"
S = "${UNPACKDIR}/SDL2_gfx-${PV}"
inherit autotools pkgconfig
@@ -27,7 +27,3 @@ EXTRA_OECONF += "--disable-mmx"
EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "m32", "--enable-mmx", "", d)}"
EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "m64", "--enable-mmx", "", d)}"
EXTRA_OECONF += "${@bb.utils.contains("AVAILTUNES", "powerpc", "--disable-mmx", "", d)}"
do_unpack:append() {
os.rename("SDL2_gfx-1.0.4/acinclude", "SDL2_gfx-1.0.4/m4")
}

View File

@@ -1,3 +1,5 @@
Upstream-Status: Inactive-Upstream
diff -Nurd tolua-5.2/src/bin/tolua.c tolua-5.2/src/bin/tolua.c
--- tolua-5.2/src/bin/tolua.c 2022-09-26 18:11:41.769267668 +0300
+++ tolua-5.2/src/bin/tolua.c 2020-02-22 14:33:47.775736302 +0200

View File

@@ -1,3 +1,5 @@
Upstream-Status: Inactive-Upstream
diff -Nurd tolua-5.2/src/lib/tolua_event.c tolua-5.2/src/lib/tolua_event.c
--- tolua-5.2/src/lib/tolua_event.c 2022-09-26 18:17:40.544835582 +0300
+++ tolua-5.2/src/lib/tolua_event.c 2022-08-29 15:10:32.145383356 +0300

View File

@@ -1,3 +1,5 @@
Upstream-Status: Inactive-Upstream
diff -Nurd tolua-5.2/src/lib/tolua_map.c tolua-5.2/src/lib/tolua_map.c
--- tolua-5.2/src/lib/tolua_map.c 2022-09-26 18:19:26.145867532 +0300
+++ tolua-5.2/src/lib/tolua_map.c 2020-02-22 14:33:47.779735894 +0200

View File

@@ -1,3 +1,5 @@
Upstream-Status: Inactive-Upstream
diff -Nurd tolua-5.2/src/lib/tolua_event.c tolua-5.2/src/lib/tolua_event.c
--- tolua-5.2/src/lib/tolua_event.c 2022-09-26 18:20:52.710709210 +0300
+++ tolua-5.2/src/lib/tolua_event.c 2022-09-26 18:18:49.593511033 +0300

View File

@@ -1,3 +1,5 @@
Upstream-Status: Inactive-Upstream
diff -Nurd tolua-5.2/src/bin/lua/variable.lua tolua-5.2/src/bin/lua/variable.lua
--- tolua-5.2/src/bin/lua/variable.lua 2022-09-26 18:23:47.772402128 +0300
+++ tolua-5.2/src/bin/lua/variable.lua 2022-08-29 15:10:32.145383356 +0300

View File

@@ -0,0 +1,23 @@
Upstream-Status: Inactive-Upstream
diff -Nurd tolua-5.2/src/bin/lua/function.lua tolua-5.2/src/bin/lua/function.lua
--- tolua-5.2/src/bin/lua/function.lua 2024-04-19 20:03:11.818328350 +0300
+++ tolua-5.2/src/bin/lua/function.lua 2024-04-19 20:11:14.294719921 +0300
@@ -85,7 +85,7 @@
func = 'tolua_isusertable'
type = self.parent.type
end
- output(' !'..func..'(tolua_S,1,"'..type..'",0,&tolua_err) || \n')
+ output(' !'..func..'(tolua_S,1,"'..type..'",0,&tolua_err) ||\n')
end
-- check args
local vararg = false
@@ -94,7 +94,7 @@
while self.args[i] and self.args[i].type ~= "..." do
local btype = isbasic(self.args[i].type)
if btype ~= 'state' then
- output(' !'..self.args[i]:outchecktype(narg,false)..' || \n')
+ output(' !'..self.args[i]:outchecktype(narg,false)..' ||\n')
end
if btype ~= 'state' then
narg = narg+1

View File

@@ -1,7 +1,8 @@
Look for lua files from under share
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Upstream-Status: Inappropriate
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd tolua-5.2.4/src/bin/tolua.c tolua-5.2.4/src/bin/tolua.c
--- tolua-5.2.4/src/bin/tolua.c 2015-11-03 00:54:03.000000000 +0200
+++ tolua-5.2.4/src/bin/tolua.c 2018-04-02 10:30:44.572922804 +0300

View File

@@ -1,7 +1,8 @@
Make tolua to compile on OpenEmbedded
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Upstream-Status: Inappropriate
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd tolua-5.2.4/config tolua-5.2.4/config
--- tolua-5.2.4/config 2015-11-03 00:54:03.000000000 +0200
+++ tolua-5.2.4/config 2018-04-02 10:31:14.296753597 +0300

View File

@@ -7,7 +7,7 @@ functions, classes, and methods to Lua."
HOMEPAGE = "http://webserver2.tecgraf.puc-rio.br/~celes/tolua/"
SECTION = "console/utils"
DEPENDS= "lua-native"
DEPENDS = "lua-native"
BBCLASSEXTEND = "native"
LICENSE = "GPL-2.0-or-later"
@@ -23,6 +23,7 @@ SRC_URI = "\
file://03-tolua_bnd_takeownership-prototype.patch \
file://04-include-tolua_event.patch \
file://05-gen-code-fix-null-dereferences.patch \
file://06-gen-code-no-trailing-spaces.patch \
"
B = "${S}"

View File

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

View File

@@ -0,0 +1,10 @@
require freeciv.inc
inherit qt6-paths
EXTRA_OECONF += "\
--with-qtver=qt6 \
--with-qt6-includes=${STAGING_DIR_HOST}${QT6_INSTALL_INCLUDEDIR} \
--with-qt6-libs=${STAGING_DIR_HOST}${QT6_INSTALL_LIBDIR} \
"

View File

@@ -11,11 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SECTION = "games"
FREECIV_GUI = "gtk3.22,qt,sdl2"
FREECIV_GUI = "gtk3.22,gtk4,qt,sdl2"
DEPENDS = "readline bzip2 curl xz libsdl2-mixer gtk+3 qtbase virtual/gettext qttools-native libsdl2-image libsdl2-ttf libsdl2-gfx freetype"
DEPENDS = "readline bzip2 curl xz zstd libsdl2-mixer gtk+3 gtk4 qtbase virtual/gettext qttools-native libsdl2-image libsdl2-ttf libsdl2-gfx freetype"
S = "${WORKDIR}/freeciv-${PV}"
S = "${UNPACKDIR}/freeciv-${PV}"
B = "${WORKDIR}/build-${PV}"
inherit autotools pkgconfig gettext
@@ -32,10 +32,14 @@ ac_cv_func_working_vsnprintf=yes \
SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \
"
EXTRANATIVEPATH = "\
../libexec \
"
acpaths = "-I ${S}/m4 -I ${S}/dependencies/m4"
PACKAGES =+ "${PN}-common ${PN}-server ${PN}-client-common \
${PN}-gtk3.22 ${PN}-qt ${PN}-sdl2"
${PN}-gtk3.22 ${PN}-gtk4 ${PN}-qt ${PN}-sdl2"
do_install:append() {
rm -Rf ${D}/${datadir}/appdata
@@ -89,6 +93,13 @@ ${datadir}/freeciv/themes/gui-gtk-3.22 \
${datadir}/freeciv/gtk3.22_menus.xml \
"
RDEPENDS:${PN}-gtk4 = "freeciv-common freeciv-client-common"
RPROVIDES:${PN}-gtk4 = "freeciv-client"
FILES:${PN}-gtk4 = "\
${bindir}/freeciv-gtk4 \
${datadir}/freeciv/themes/gtk4 \
"
RDEPENDS:${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
RPROVIDES:${PN}-qt = "freeciv-client"
FILES:${PN}-qt = "\

View File

@@ -1,36 +0,0 @@
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

View File

@@ -0,0 +1,92 @@
Upstream-Status: Backport
From 48875b712fe1b5009a80a1fb4280fe1904677012 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 2 Nov 2025 09:14:58 +0200
Subject: [PATCH 19/20] Qt: Work around Qt-6.9 theming issue
See RM #1697
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
client/gui-qt/citydlg.cpp | 2 ++
client/gui-qt/gui_main.h | 2 ++
client/gui-qt/themes.cpp | 17 ++++++++++++++---
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/client/gui-qt/citydlg.cpp b/client/gui-qt/citydlg.cpp
index 1d569b8a8d..b2c6d5a6f7 100644
--- a/client/gui-qt/citydlg.cpp
+++ b/client/gui-qt/citydlg.cpp
@@ -2044,6 +2044,8 @@ city_dialog::city_dialog(QWidget *parent): qfc_dialog(parent)
installEventFilter(this);
::city_dlg_created = true;
+
+ set_theme_style();
}
/************************************************************************//**
diff --git a/client/gui-qt/gui_main.h b/client/gui-qt/gui_main.h
index d825cba768..94d3a0d20f 100644
--- a/client/gui-qt/gui_main.h
+++ b/client/gui-qt/gui_main.h
@@ -23,4 +23,6 @@ QApplication *current_app();
#define CAPTURE_DEFAULT_THIS [=]
#endif // FREECIV_HAVE_CXX20_CAPTURE_THIS
+void set_theme_style();
+
#endif // FC__GUI_MAIN_H
diff --git a/client/gui-qt/themes.cpp b/client/gui-qt/themes.cpp
index 79092d65b2..6e4e5bdf3c 100644
--- a/client/gui-qt/themes.cpp
+++ b/client/gui-qt/themes.cpp
@@ -38,6 +38,8 @@ extern QString current_theme;
static QString def_app_style;
static QString stylestring;
+static QStyle *current_style = nullptr;
+
/*************************************************************************//**
Loads a qt theme directory/theme_name
*****************************************************************************/
@@ -76,16 +78,17 @@ void qtg_gui_load_theme(const char *directory, const char *theme_name)
stylestring.replace(lnb, fake_dir + "/" + theme_name + "/");
if (QString(theme_name) == QString("System")) {
- QApplication::setStyle(QStyleFactory::create(def_app_style));
+ current_style = QStyleFactory::create(def_app_style);
} else {
QStyle *fstyle = QStyleFactory::create("Fusion");
if (fstyle != nullptr) {
- QApplication::setStyle(fstyle);
+ current_style = fstyle;
} else {
- QApplication::setStyle(QStyleFactory::create(def_app_style));
+ current_style = QStyleFactory::create(def_app_style);
}
}
+ QApplication::setStyle(current_style);
current_theme = theme_name;
QPixmapCache::clear();
@@ -98,6 +101,14 @@ void qtg_gui_load_theme(const char *directory, const char *theme_name)
QApplication::setPalette(pal);
}
+/*************************************************************************//**
+ Set theme style again, to work around Qt theming bug.
+*****************************************************************************/
+void set_theme_style()
+{
+ QApplication::setStyle(current_style);
+}
+
/*************************************************************************//**
Clears a theme (sets default system theme)
*****************************************************************************/
--
2.51.0

View File

@@ -1,25 +0,0 @@
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

View File

@@ -0,0 +1,31 @@
Upstream-Status: Inappropriate
diff --git a/configure.ac b/configure.ac
index e7289e51e5..673e254ed7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -721,6 +721,8 @@ dnl Defaults to override with host specific values
HOST_PATH_SEPARATOR=":"
HOST_DIR_SEPARATOR="/"
+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 dab9d6d93c..3111fcec4f 100644
--- a/meson.build
+++ b/meson.build
@@ -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
net_dep = []
endif

View File

@@ -1,17 +0,0 @@
Allow root to run freeciv
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff --git a/configure.ac b/configure.ac
index f2ca1f093d..555f23e0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -678,6 +678,8 @@ dnl Defaults to override with host specific values
HOST_PATH_SEPARATOR=":"
HOST_DIR_SEPARATOR="/"
+AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - OpenEmbedded])
+
dnl Settings specific to host OS
case "$host_os" in

View File

@@ -1,20 +0,0 @@
diff --git a/configure.ac b/configure.ac
index d26b8fdf28..8daa054344 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,6 +612,15 @@ PKG_CHECK_MODULES([ICU], [icu-uc],,
UTILITY_CFLAGS="${UTILITY_CFLAGS} ${ICU_CFLAGS}"
UTILITY_LIBS="${UTILITY_LIBS} ${ICU_LIBS}"
+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=""

View File

@@ -1,11 +0,0 @@
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"

View File

@@ -1,24 +0,0 @@
require freeciv-qt5.inc
DEFAULT_PREFERENCE = "-1"
DEPENDS += "lua gtk4 zstd"
SRC_URI += "\
${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
file://allow-root-S3_1.patch \
"
SRC_URI[sha256sum] = "2fc4ad1f5833b60e18286e6dc5107ef9104d6d81a0e634b5448abdb73636d54e"
FREECIV_GUI += "gtk4"
PACKAGES += "${PN}-gtk4"
RDEPENDS:${PN}-gtk4 = "freeciv-common freeciv-client-common"
RPROVIDES:${PN}-gtk4 = "freeciv-client"
FILES:${PN}-gtk4 = "\
${bindir}/freeciv-gtk4 \
${datadir}/freeciv/themes/gtk4 \
"

View File

@@ -0,0 +1,12 @@
require freeciv-qt6.inc
DEPENDS += "lua"
SRC_URI += "\
${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \
file://allow-root-S3_2.patch \
file://0019-Qt-Work-around-Qt-6.9-theming-issue.patch \
"
SRC_URI[sha256sum] = "3fc01ef55bfc9b9c2d71432d22a9fc5ab5892285d15d3dc888ec4bb288d21caa"

View File

@@ -5,7 +5,7 @@ LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "libgames-support glib-2.0 gtk+3 librsvg libcanberra intltool-native itstool-native"
GNOME_COMPRESS_TYPE="xz"
GNOME_COMPRESS_TYPE = "xz"
inherit gnomebase gettext

View File

@@ -5,7 +5,7 @@ LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "libgnome-games-support glib-2.0 gtk+3 librsvg libcanberra intltool-native itstool-native"
GNOME_COMPRESS_TYPE="xz"
GNOME_COMPRESS_TYPE = "xz"
inherit gnomebase

View File

@@ -141,7 +141,7 @@ FILES:${PN}-l = "\
${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-l.mo \
"
FILES:${PN}-low ="\
FILES:${PN}-low = "\
${datadir}/wesnoth/data/campaigns/Legend_of_Wesmere \
${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-low.mo \
"