From 38ecaf88ae0891dd2d7f2bdd9a7acdcd45835724 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Dec 2024 02:07:22 +0000 Subject: gentoo auto-resync : 04:12:2024 - 02:07:22 --- dev-games/Manifest.gz | Bin 5720 -> 5723 bytes dev-games/tiled/Manifest | 3 +- dev-games/tiled/files/tiled-1.11.0-qt680.patch | 77 +++++++++++++++++++++++++ dev-games/tiled/tiled-1.11.0.ebuild | 4 ++ 4 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 dev-games/tiled/files/tiled-1.11.0-qt680.patch (limited to 'dev-games') diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz index 5432297bcdbc..4953128e627f 100644 Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest index c12e0d5fe297..6d6a3971baa4 100644 --- a/dev-games/tiled/Manifest +++ b/dev-games/tiled/Manifest @@ -1,3 +1,4 @@ +AUX tiled-1.11.0-qt680.patch 2944 BLAKE2B a566a0f0623efc8a3563f021521db23f210b948f91ca56f4b2fd5719dd9bca314000924602fca535263325b887bf0f7b89f28bd4d548274150116228a2586079 SHA512 4ca0bf153b4b850156fde719be5cb565882fd30d144e1fa3ad68b8f46982c994937f63618051570109be687236773042297fea78b3ca6426525feec6ab49ba9f DIST tiled-1.11.0.tar.gz 17458724 BLAKE2B 3e7ea2ce4a61aa31d60487bf4cd68efb9307be0a753ee1571b9d2a90dff5299fdbbfd432c38eddafbea98cd6a1c59aa338c9ab5337e923e3178456a720e24ed4 SHA512 59e7ff38bedb0b897b40b2d3f6231004970de843e3700ef8adfaf78ab9b15c57e291ec27d409ba61094871b84f27238defb33bef5b23e838736f515ec1addf5d -EBUILD tiled-1.11.0.ebuild 2161 BLAKE2B ddbaae857870123f3cd62c30875baa67444aa47301362f42ccb4ad5e0d01717dde36669dd7824b6ef7fd3d0329930330646ce17c2a1f2b5fb78741a198e1d733 SHA512 14c226895b6598483eabe30b5a9b2c6c404719c3fe7c35fb8955f1bbd61b58aa71456cacb71d8e42be0ee581735f22043eff75da9769825b4ec6901c7f3158b7 +EBUILD tiled-1.11.0.ebuild 2206 BLAKE2B 70670f563f63eab10c0753f05784f1e0d395a993de841a329f07b96080eb778a62c1babe8855ed2945c0d19ad307895bb631c5a8eff7ce6a578f43184525b482 SHA512 40cb4b05029bd4029644d89005a19b52a2f48b6fb0244b59fc11c3d0eec660d8fb11faa5044760f72d0cb7976b50cd509d77ab588468eac6b117743d60c09ace MISC metadata.xml 575 BLAKE2B 67eae166f5a7e6f93eb2f550a259d642ff5372de2bc19c82eaaceacf6255378f81541c92b5200df3c2d3206baf008b06de1cebdb7380f9fd48a77a96f2248b3d SHA512 25c2670f6f3b08cf951641ea50b7f62c528b192e850ea5923c5092349d750166c73979a7d54ad5a3ba40c62778cdcfde9d555e0af4c7def99075aa8921339b10 diff --git a/dev-games/tiled/files/tiled-1.11.0-qt680.patch b/dev-games/tiled/files/tiled-1.11.0-qt680.patch new file mode 100644 index 000000000000..f6edef42655a --- /dev/null +++ b/dev-games/tiled/files/tiled-1.11.0-qt680.patch @@ -0,0 +1,77 @@ +https://github.com/mapeditor/tiled/pull/4077 + +From 5a771722aa31c7ce1611ada3fa5b636166e3e3e1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= +Date: Thu, 10 Oct 2024 12:22:36 +0200 +Subject: [PATCH] Fixed compile against Qt 6.8 + +Using the QT_VERSION_CHECK macro as value for the +QT_DISABLE_DEPRECATED_BEFORE define is causing issues since Qt 6.8, for +example when QByteArray is included without first explicitly including +QtGlobal. +--- a/qbs/imports/TiledPlugin.qbs ++++ b/qbs/imports/TiledPlugin.qbs +@@ -23,7 +23,7 @@ DynamicLibrary { + return ["$ORIGIN/../.."]; + } + cpp.defines: [ +- "QT_DISABLE_DEPRECATED_BEFORE=QT_VERSION_CHECK(5,15,0)", ++ "QT_DISABLE_DEPRECATED_BEFORE=0x050F00", + "QT_NO_DEPRECATED_WARNINGS", + "QT_NO_FOREACH", + "QT_NO_URL_CAST_FROM_STRING" +--- a/qbs/imports/TiledQtGuiApplication.qbs ++++ b/qbs/imports/TiledQtGuiApplication.qbs +@@ -16,7 +16,7 @@ QtGuiApplication { + return flags; + } + cpp.defines: [ +- "QT_DISABLE_DEPRECATED_BEFORE=QT_VERSION_CHECK(5,15,0)", ++ "QT_DISABLE_DEPRECATED_BEFORE=0x050F00", + "QT_NO_DEPRECATED_WARNINGS", + "QT_NO_CAST_FROM_ASCII", + "QT_NO_CAST_TO_ASCII", +--- a/src/libtiled/libtiled.qbs ++++ b/src/libtiled/libtiled.qbs +@@ -30,7 +30,7 @@ DynamicLibrary { + "QT_NO_CAST_FROM_ASCII", + "QT_NO_CAST_TO_ASCII", + "QT_NO_URL_CAST_FROM_STRING", +- "QT_DISABLE_DEPRECATED_BEFORE=QT_VERSION_CHECK(5,15,0)", ++ "QT_DISABLE_DEPRECATED_BEFORE=0x050F00", + "QT_NO_DEPRECATED_WARNINGS", + "_USE_MATH_DEFINES", + ] +--- a/src/libtiledquick/libtiledquick.qbs ++++ b/src/libtiledquick/libtiledquick.qbs +@@ -21,7 +21,7 @@ DynamicLibrary { + "QT_NO_CAST_FROM_ASCII", + "QT_NO_CAST_TO_ASCII", + "QT_NO_URL_CAST_FROM_STRING", +- "QT_DISABLE_DEPRECATED_BEFORE=QT_VERSION_CHECK(5,15,0)", ++ "QT_DISABLE_DEPRECATED_BEFORE=0x050F00", + "QT_NO_DEPRECATED_WARNINGS", + "QT_NO_FOREACH" + ] +--- a/src/tiled/libtilededitor.qbs ++++ b/src/tiled/libtilededitor.qbs +@@ -39,7 +39,7 @@ DynamicLibrary { + var defs = [ + "TILED_EDITOR_LIBRARY", + "TILED_VERSION=" + project.version, +- "QT_DISABLE_DEPRECATED_BEFORE=QT_VERSION_CHECK(5,15,0)", ++ "QT_DISABLE_DEPRECATED_BEFORE=0x050F00", + "QT_NO_DEPRECATED_WARNINGS", + "QT_NO_CAST_FROM_ASCII", + "QT_NO_CAST_TO_ASCII", +--- a/src/tiledquickplugin/tiledquickplugin.qbs ++++ b/src/tiledquickplugin/tiledquickplugin.qbs +@@ -19,7 +19,7 @@ DynamicLibrary { + return flags; + } + cpp.defines: [ +- "QT_DISABLE_DEPRECATED_BEFORE=QT_VERSION_CHECK(5,15,0)", ++ "QT_DISABLE_DEPRECATED_BEFORE=0x050F00", + "QT_NO_DEPRECATED_WARNINGS", + "QT_NO_CAST_FROM_ASCII", + "QT_NO_CAST_TO_ASCII", diff --git a/dev-games/tiled/tiled-1.11.0.ebuild b/dev-games/tiled/tiled-1.11.0.ebuild index 66a5a4df0232..9269ae16e168 100644 --- a/dev-games/tiled/tiled-1.11.0.ebuild +++ b/dev-games/tiled/tiled-1.11.0.ebuild @@ -33,6 +33,10 @@ BDEPEND=" QBS_PRODUCTS="tiled,csv,json" +PATCHES=( + "${FILESDIR}"/${P}-qt680.patch +) + pkg_setup() { if use python; then python-single-r1_pkg_setup -- cgit v1.2.3