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 deleted file mode 100644 index cf7b592..0000000 --- a/recipes-games/freeciv/freeciv/0015-Qt-Add-Q_OBJECT-for-fc_shortcut_popup.patch +++ /dev/null @@ -1,27 +0,0 @@ -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.1.bb similarity index 51% rename from recipes-games/freeciv/freeciv_3.1.0.bb rename to recipes-games/freeciv/freeciv_3.1.1.bb index ddc0d11..13d0485 100644 --- a/recipes-games/freeciv/freeciv_3.1.0.bb +++ b/recipes-games/freeciv/freeciv_3.1.1.bb @@ -6,7 +6,6 @@ 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" +SRC_URI[sha256sum] = "b2bd00c0e2a6c81bcb52aa0dddf81f2f4543705bf7a9fcd5afac3f7b3fff5ef6"