From 5274c2bc596e385dc35ebc6826f9706ae4874f8f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 17 Apr 2024 07:47:09 +0300 Subject: [PATCH] freeciv: Fix build against Qt-6.8 Signed-off-by: Marko Lindqvist --- ...t-Add-Q_OBJECT-for-fc_shortcut_popup.patch | 27 +++++++++++++++++++ recipes-games/freeciv/freeciv_3.1.0.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 recipes-games/freeciv/freeciv/0015-Qt-Add-Q_OBJECT-for-fc_shortcut_popup.patch diff --git a/recipes-games/freeciv/freeciv/0015-Qt-Add-Q_OBJECT-for-fc_shortcut_popup.patch b/recipes-games/freeciv/freeciv/0015-Qt-Add-Q_OBJECT-for-fc_shortcut_popup.patch new file mode 100644 index 0000000..cf7b592 --- /dev/null +++ b/recipes-games/freeciv/freeciv/0015-Qt-Add-Q_OBJECT-for-fc_shortcut_popup.patch @@ -0,0 +1,27 @@ +From a0c1d49c2607faffb05baed27a9ce0929aee8cb6 Mon Sep 17 00:00:00 2001 +From: Marko Lindqvist +Date: Wed, 17 Apr 2024 07:02:20 +0300 +Subject: [PATCH 15/15] Qt: Add Q_OBJECT for fc_shortcut_popup + +See RM #462 + +Signed-off-by: Marko Lindqvist +--- + client/gui-qt/shortcuts.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/client/gui-qt/shortcuts.h b/client/gui-qt/shortcuts.h +index cf7fb487c1..1c1728f4ce 100644 +--- a/client/gui-qt/shortcuts.h ++++ b/client/gui-qt/shortcuts.h +@@ -154,6 +154,7 @@ public: + **************************************************************************/ + class fc_shortcut_popup : public QDialog + { ++ Q_OBJECT + public: + fc_shortcut_popup(QWidget *parent); + void run(fc_shortcut *s); +-- +2.43.0 + diff --git a/recipes-games/freeciv/freeciv_3.1.0.bb b/recipes-games/freeciv/freeciv_3.1.0.bb index 9e91f10..52ed1e9 100644 --- a/recipes-games/freeciv/freeciv_3.1.0.bb +++ b/recipes-games/freeciv/freeciv_3.1.0.bb @@ -6,6 +6,7 @@ DEPENDS += "lua gtk4 zstd" SRC_URI += "\ ${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.xz \ file://allow-root-S3_1.patch \ +file://0015-Qt-Add-Q_OBJECT-for-fc_shortcut_popup.patch \ " SRC_URI[sha256sum] = "d746a883937b955b0ee1d1eba8b4e82354f7f72051ac4f514de7ab308334506e"