diff options
Diffstat (limited to 'dev-games/tiled')
| -rw-r--r-- | dev-games/tiled/Manifest | 5 | ||||
| -rw-r--r-- | dev-games/tiled/files/tiled-1.11-qt6.8.2.patch | 20 | ||||
| -rw-r--r-- | dev-games/tiled/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-games/tiled/tiled-1.11.2.ebuild | 93 |
4 files changed, 118 insertions, 3 deletions
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest index 6d6a3971baa4..7c9a17ae369a 100644 --- a/dev-games/tiled/Manifest +++ b/dev-games/tiled/Manifest @@ -1,4 +1,7 @@ +AUX tiled-1.11-qt6.8.2.patch 642 BLAKE2B 506689a91649612a1913bd908ccacc6fe9a13854f450e6d29fcdfee63bb3c1d8ccc0d3016645bad76a61833c14108a9da0fab05641fae227bdbffed3f624b88a SHA512 5d2f197068d2a6411f8c7ed6a76bb66526bb622f3c61fb94caf78e400c768a59a27010b52e47b9dae265cc3125f309b7f9ab3390d9ce6c5054c9a5e8619a6776 AUX tiled-1.11.0-qt680.patch 2944 BLAKE2B a566a0f0623efc8a3563f021521db23f210b948f91ca56f4b2fd5719dd9bca314000924602fca535263325b887bf0f7b89f28bd4d548274150116228a2586079 SHA512 4ca0bf153b4b850156fde719be5cb565882fd30d144e1fa3ad68b8f46982c994937f63618051570109be687236773042297fea78b3ca6426525feec6ab49ba9f DIST tiled-1.11.0.tar.gz 17458724 BLAKE2B 3e7ea2ce4a61aa31d60487bf4cd68efb9307be0a753ee1571b9d2a90dff5299fdbbfd432c38eddafbea98cd6a1c59aa338c9ab5337e923e3178456a720e24ed4 SHA512 59e7ff38bedb0b897b40b2d3f6231004970de843e3700ef8adfaf78ab9b15c57e291ec27d409ba61094871b84f27238defb33bef5b23e838736f515ec1addf5d +DIST tiled-1.11.2.tar.gz 17570418 BLAKE2B d2abf3e43c107228cccd1b754326487a78a804381c428760a5dd4af92366aee899f8b35623292fb8b541ac7e6ca61a79303be6dde4b772957c0b46a6f942f488 SHA512 c8fc3d853b91e1e74bdeb1873912e5dfe6efea49d937803502bac42865b6406adf6845f7f393098dccdf59adba522a5672e48e4a673e22e2fc320fe8c4b43405 EBUILD tiled-1.11.0.ebuild 2206 BLAKE2B 70670f563f63eab10c0753f05784f1e0d395a993de841a329f07b96080eb778a62c1babe8855ed2945c0d19ad307895bb631c5a8eff7ce6a578f43184525b482 SHA512 40cb4b05029bd4029644d89005a19b52a2f48b6fb0244b59fc11c3d0eec660d8fb11faa5044760f72d0cb7976b50cd509d77ab588468eac6b117743d60c09ace -MISC metadata.xml 575 BLAKE2B 67eae166f5a7e6f93eb2f550a259d642ff5372de2bc19c82eaaceacf6255378f81541c92b5200df3c2d3206baf008b06de1cebdb7380f9fd48a77a96f2248b3d SHA512 25c2670f6f3b08cf951641ea50b7f62c528b192e850ea5923c5092349d750166c73979a7d54ad5a3ba40c62778cdcfde9d555e0af4c7def99075aa8921339b10 +EBUILD tiled-1.11.2.ebuild 2245 BLAKE2B 4e5842e3fd4491d217a550b80a26b59b1b0ed1e0fb8f04beda4e41e2a15f333787dd1d3aa79158c34d2e0c7c41d3916b68c77934cd8bc995fc995121090fff44 SHA512 9091a1c906e8fee62c91de17a66f14effc21b9cc74f0b0d1c3eac8a0d50938dbcdff6916501c9c5b5ac3c5a2d2391fe778dcd56f05d96a5eeb511368b3ba4401 +MISC metadata.xml 584 BLAKE2B e41f9edb5d43906d4e41048fccfc046e4b53f4585a3ed24bb85c8caf85a60c84e895a09ff39963d2f567c93db71d9a95ee99fb0f941a7841d476b0b53552cb6a SHA512 d2ed00465c1e48bcab9808dc4dd159dc1c3f037a2e1720deeef78e93e1ac7ad388b616e29b90a2b12155de29b9a59ae3bbb0fe532b1a607d24ae5c2677bfb958 diff --git a/dev-games/tiled/files/tiled-1.11-qt6.8.2.patch b/dev-games/tiled/files/tiled-1.11-qt6.8.2.patch new file mode 100644 index 000000000000..29e1eca70753 --- /dev/null +++ b/dev-games/tiled/files/tiled-1.11-qt6.8.2.patch @@ -0,0 +1,20 @@ +commit 60388da00ef8e64608c581369b5c68e85162e31d +Author: Thorbjørn Lindeijer <bjorn@lindeijer.nl> +Date: Fri Feb 14 20:49:16 2025 +0100 + + Fixed compile against Qt 6.8.2 + + A rather smaller change than 776d3b67b011f970a65e8a743795401851684cc9 + for the 1.11 branch, which keeps compatibility down to Qt 5.12. + +diff --git a/src/libtiled/qtcompat_p.h b/src/libtiled/qtcompat_p.h +index 3b46dc1b..60c089ed 100644 +--- a/src/libtiled/qtcompat_p.h ++++ b/src/libtiled/qtcompat_p.h +@@ -28,5 +28,5 @@ using ::endl; + #endif + + #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) +-using QStringRef = QStringView; ++#define QStringRef QStringView + #endif diff --git a/dev-games/tiled/metadata.xml b/dev-games/tiled/metadata.xml index d6abd76eacce..7cb2367870ac 100644 --- a/dev-games/tiled/metadata.xml +++ b/dev-games/tiled/metadata.xml @@ -13,7 +13,6 @@ <remote-id type="github">mapeditor/tiled</remote-id> </upstream> <use> - <flag name="minimal">Exclude optional plugins and development headers</flag> + <flag name="minimal">Exclude optional plugins, development headers and examples</flag> </use> </pkgmetadata> - diff --git a/dev-games/tiled/tiled-1.11.2.ebuild b/dev-games/tiled/tiled-1.11.2.ebuild new file mode 100644 index 000000000000..20092295a136 --- /dev/null +++ b/dev-games/tiled/tiled-1.11.2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) +inherit edo flag-o-matic multiprocessing python-single-r1 toolchain-funcs xdg + +DESCRIPTION="A general purpose tile map editor" +HOMEPAGE="https://www.mapeditor.org/ https://github.com/mapeditor/tiled" +SRC_URI="https://github.com/mapeditor/tiled/archive/v${PV}/${P}.tar.gz" + +LICENSE="BSD BSD-2 GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="minimal python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + app-arch/zstd:= + dev-qt/qtbase:6[X,dbus,gui,network,opengl,widgets] + dev-qt/qtdeclarative:6 + dev-qt/qtsvg:6 + sys-libs/zlib + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/qbs + dev-qt/qtbase:6 + dev-qt/qttools:6[linguist] +" + +QBS_PRODUCTS="tiled,csv,json" + +PATCHES=( + "${FILESDIR}/tiled-1.11-qt6.8.2.patch" +) + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +qbs_format_flags() { + local -a array + for flag in ${@}; do + array+=( "\"${flag}\"" ) + done + echo "[$(IFS=","; echo "${array[*]}")]" +} + +src_configure() { + if use python; then + QBS_PRODUCTS="${QBS_PRODUCTS},python" + fi + if ! use minimal; then + QBS_PRODUCTS="${QBS_PRODUCTS},defold,defoldcollection,droidcraft,flare,gmx,json1,lua,replicaisland,rpmap,tbin,tengine,terraingenerator,tmxrasterizer,tmxviewer,tscn,yy" + fi + + edo qbs setup-qt /usr/bin/qmake6 qt6 + edo qbs config defaultProfile qt6 + + local toolchain=$(tc-get-compiler-type) + edo qbs setup-toolchains ${toolchain} ${toolchain} + edo qbs config profiles.qt6.baseProfile ${toolchain} + + edo qbs resolve \ + --force-probe-execution \ + qbs.installPrefix:"/usr" \ + projects.Tiled.useRPaths:false \ + projects.Tiled.installHeaders:$(usex minimal false true) \ + project.libDir:$(get_libdir) \ + modules.cpp.cFlags:$(qbs_format_flags ${CFLAGS}) \ + modules.cpp.cxxFlags:$(qbs_format_flags ${CXXFLAGS}) \ + modules.cpp.linkerFlags:$(qbs_format_flags $(raw-ldflags ${LDFLAGS})) +} + +src_compile() { + edo qbs build \ + -p ${QBS_PRODUCTS} \ + -j $(get_makeopts_jobs) +} + +src_install() { + edo qbs install -p ${QBS_PRODUCTS} --install-root "${D}" + + if ! use minimal; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi +} |