From f0ddcad13515f66d2f3bf827d33c277bdba7e1dd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 12 Jun 2024 00:08:13 +0100 Subject: gentoo auto-resync : 12:06:2024 - 00:08:13 --- games-strategy/Manifest.gz | Bin 8077 -> 8081 bytes games-strategy/freeciv/Manifest | 3 ++- .../freeciv/files/freeciv-3.1.0-qt6.patch | 24 +++++++++++++++++++++ games-strategy/freeciv/freeciv-3.1.0.ebuild | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 games-strategy/freeciv/files/freeciv-3.1.0-qt6.patch (limited to 'games-strategy') diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz index 7fea0b1c9b94..4c1fd485626c 100644 Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index cf9feb381029..eac69ff21435 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,5 +1,6 @@ +AUX freeciv-3.1.0-qt6.patch 775 BLAKE2B 225fb73659a5a11e1b77c04157856b52a996f1694948152650c879cf1f16d053c30c4ddb28a50125e3e875352840e27407bf1e3f257c33371c19ad408d7efb8c SHA512 e53a347ab9aad973d6283c4057783ae431b0fadc9eb618c7160b2d5457c17fbea9bc25cb286258be1c6aba34ea4848726025c6812b4570e67f7fa1b19ff2a3f8 AUX freeciv-3.1.0_beta4-fix-manpage-install-location.patch 882 BLAKE2B 7cbe60cf4753af0331541786679b80d8d14a95a8fb99d57b1c17c0e9690001aac2b8bc205a9225c755ca5c3ffc577af992a7bd6aaf2f37d6aa37be6d5b8460ed SHA512 e2f652a05368a885531e47421dfde993fac54850092db07834399d91c393c51e35f6662c9cd79d55bd470dbc81f211a2b393cd96768a6874c3b7b680de2ac366 DIST freeciv-3.1.0.tar.gz 127748997 BLAKE2B 75b3d1341d8ab09af244f07f3df5b1817571c4958a4296f37f35a105fe5a8e3d2e8d2e0dc7eb1d1aaf3d4a4c6574ba75355595134dc5a255535bc14c604bb99f SHA512 514d796a54466790a5ce0f2abb6fd8cb9c124a2f19ab33d48ce7a7f0d8d92096b54352a5d3655da852cdbd807baf4969467e04b82f687347bdff92e09f7aad86 -EBUILD freeciv-3.1.0.ebuild 5920 BLAKE2B a097b6afc92267c174981f2efca3c2525700f17d8267b412d66ec7c0ebd4b0a1888ba2f9d3d0ae38badde732ae884d4927c3e1a188d0ede052a02b85aa501199 SHA512 842200f491bbba8a9721e2eba8192f45d8d6a559000782c98a8bb16d5b0fd16ba5ee9a465be6974835c7ed153f3768a3bb681a502ee7bed8c0659daa49d5ae68 +EBUILD freeciv-3.1.0.ebuild 5968 BLAKE2B f66374068aaf4b25559814d228febd6a0df42312aa663f87e0c9f82528e110c25d4cbfac3c5489f224efb4e4fcf3aa912523c75ceca1103d2612982e78f2cf09 SHA512 59be1c2a75afa5ff50ec6d870dc59b2768a9df29547b938647cf301f0696692f1468bac2464a06bc5c39c1ef0cf87f6b4829744b5477ffd2205876fb3cdaf032 EBUILD freeciv-9999.ebuild 5920 BLAKE2B a097b6afc92267c174981f2efca3c2525700f17d8267b412d66ec7c0ebd4b0a1888ba2f9d3d0ae38badde732ae884d4927c3e1a188d0ede052a02b85aa501199 SHA512 842200f491bbba8a9721e2eba8192f45d8d6a559000782c98a8bb16d5b0fd16ba5ee9a465be6974835c7ed153f3768a3bb681a502ee7bed8c0659daa49d5ae68 MISC metadata.xml 1298 BLAKE2B c744a6fa5ab5345aeafa4bea7edc493beee1ded63cc2d9d26fe7e883dd81d4de6cec288a8ceb49567f2bdfe2fcd647ab9231055429244c14d8b05978dc13ad7a SHA512 767b482284030363aeaf521b13511fe10f69db940b411fe637a4f9d00324172b3b3e1426e74fa575cb414eb1a038fca87ab473237804699879975448f9ca0f1f diff --git a/games-strategy/freeciv/files/freeciv-3.1.0-qt6.patch b/games-strategy/freeciv/files/freeciv-3.1.0-qt6.patch new file mode 100644 index 000000000000..9aa363a11e02 --- /dev/null +++ b/games-strategy/freeciv/files/freeciv-3.1.0-qt6.patch @@ -0,0 +1,24 @@ +From 8da1d4c91dff53db6d903730855ed6a02252e53d Mon Sep 17 00:00:00 2001 +From: Marko Lindqvist +Date: Wed, 17 Apr 2024 07:02:20 +0300 +Subject: [PATCH] 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 7574ce4f8e..9d02d1c3f6 100644 +--- a/client/gui-qt/shortcuts.h ++++ b/client/gui-qt/shortcuts.h +@@ -155,6 +155,7 @@ class line_edit : public QLineEdit + **************************************************************************/ + class fc_shortcut_popup : public QDialog + { ++ Q_OBJECT + public: + fc_shortcut_popup(QWidget *parent); + void run(fc_shortcut *s); diff --git a/games-strategy/freeciv/freeciv-3.1.0.ebuild b/games-strategy/freeciv/freeciv-3.1.0.ebuild index 0b5e2c809016..17f914cff915 100644 --- a/games-strategy/freeciv/freeciv-3.1.0.ebuild +++ b/games-strategy/freeciv/freeciv-3.1.0.ebuild @@ -92,6 +92,7 @@ pkg_setup() { PATCHES=( "${FILESDIR}"/${PN}-3.1.0_beta4-fix-manpage-install-location.patch + "${FILESDIR}"/${P}-qt6.patch # from git master ) src_prepare() { -- cgit v1.2.3