commit: 5fa4351aedd7f31898cc7b0dc970c438e993aab4 Author: Andrei Sabalenka <mechakotik <AT> gmail <DOT> com> AuthorDate: Fri Aug 8 21:08:19 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sat Aug 9 06:38:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa4351a
dev-games/tiled: drop 1.11.0 Closes: https://bugs.gentoo.org/961228 Signed-off-by: Andrei Sabalenka <mechakotik <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/43390 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-games/tiled/Manifest | 1 - dev-games/tiled/files/tiled-1.11.0-qt680.patch | 77 ---------------------- dev-games/tiled/tiled-1.11.0.ebuild | 91 -------------------------- 3 files changed, 169 deletions(-) diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest index e32e690231d9..3a877276ea2a 100644 --- a/dev-games/tiled/Manifest +++ b/dev-games/tiled/Manifest @@ -1,2 +1 @@ -DIST tiled-1.11.0.tar.gz 17458724 BLAKE2B 3e7ea2ce4a61aa31d60487bf4cd68efb9307be0a753ee1571b9d2a90dff5299fdbbfd432c38eddafbea98cd6a1c59aa338c9ab5337e923e3178456a720e24ed4 SHA512 59e7ff38bedb0b897b40b2d3f6231004970de843e3700ef8adfaf78ab9b15c57e291ec27d409ba61094871b84f27238defb33bef5b23e838736f515ec1addf5d DIST tiled-1.11.2.tar.gz 17570418 BLAKE2B d2abf3e43c107228cccd1b754326487a78a804381c428760a5dd4af92366aee899f8b35623292fb8b541ac7e6ca61a79303be6dde4b772957c0b46a6f942f488 SHA512 c8fc3d853b91e1e74bdeb1873912e5dfe6efea49d937803502bac42865b6406adf6845f7f393098dccdf59adba522a5672e48e4a673e22e2fc320fe8c4b43405 diff --git a/dev-games/tiled/files/tiled-1.11.0-qt680.patch b/dev-games/tiled/files/tiled-1.11.0-qt680.patch deleted file mode 100644 index f6edef42655a..000000000000 --- a/dev-games/tiled/files/tiled-1.11.0-qt680.patch +++ /dev/null @@ -1,77 +0,0 @@ -https://github.com/mapeditor/tiled/pull/4077 - -From 5a771722aa31c7ce1611ada3fa5b636166e3e3e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <[email protected]> -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 deleted file mode 100644 index 9269ae16e168..000000000000 --- a/dev-games/tiled/tiled-1.11.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2024 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}"/${P}-qt680.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}" - - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples -}
