pool/tiled
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 1.11.1:

Browse Source 
* Releases now ship with support for loading Aseprite images (#4109)
  * Scripting: Added FileFormat.nameFilter
  * Scripting: Added MapEditor.currentBrushChanged signal
  * Scripting: Added tiled.cursor to create mouse cursor values
  * Scripting: Added Tileset.transformationFlags (#3753)
  * Scripting: Added Dialog.addRadioButtonGroup for selecting one of a list of mutually exclusive options (#4107)
  * Scripting: Made currentWangSet and currentWangColorIndex properties writeable (#4105)
  * AutoMapping: Ignore rules with empty input or output regions (#3834)
  * Fixed saving/loading of custom properties set on worlds (#4025)
  * Fixed issue with placing tile objects after switching maps (#3497)
  * Fixed crash when accessing a world through a symlink (#4042)
  * Fixed performance issue when tinting tiles from large tilesets
  * Fixed error reporting when exporting on the command-line (by Shuhei Nagasawa, #4015)
  * Fixed updating of object label when text changes without changing size
  * Fixed minimum value of spinbox in Tile Animation Editor
  * Fixed loading of custom property types in tilesets referenced by tile stamps (#4044)
  * Fixed compile against Qt 6.8

OBS-URL: https://build.opensuse.org/package/show/games:tools/tiled?expand=0&rev=97
This commit is contained in:
Michael Vetter 2025-01-11 16:48:12 +00:00 committed by Git OBS Bridge
commit c8e70132ee
7 changed files with 1598 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

96
fix_compile_against_qt_6_8.patch Normal file
View File

@ -0,0 +1,96 @@
From 37013721af5b22caafa6a32285d01d57ee608823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <bjorn@lindeijer.nl>
Date: Thu, 10 Oct 2024 21:54:26 +0200
Subject: [PATCH] Fixed compile against Qt 6.8 (#4077)
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.
---
qbs/imports/TiledPlugin.qbs | 2 +-
qbs/imports/TiledQtGuiApplication.qbs | 2 +-
src/libtiled/libtiled.qbs | 2 +-
src/libtiledquick/libtiledquick.qbs | 2 +-
src/tiled/libtilededitor.qbs | 2 +-
src/tiledquickplugin/tiledquickplugin.qbs | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/qbs/imports/TiledPlugin.qbs b/qbs/imports/TiledPlugin.qbs
index 84521b3185..4f0642ca6e 100644
--- 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"
diff --git a/qbs/imports/TiledQtGuiApplication.qbs b/qbs/imports/TiledQtGuiApplication.qbs
index 5cfa630465..fcdd5ea5f0 100644
--- 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",
diff --git a/src/libtiled/libtiled.qbs b/src/libtiled/libtiled.qbs
index 6dda343a71..21e0357e24 100644
--- 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",
]
diff --git a/src/libtiledquick/libtiledquick.qbs b/src/libtiledquick/libtiledquick.qbs
index 7c868d251f..055665e25d 100644
--- 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"
]
diff --git a/src/tiled/libtilededitor.qbs b/src/tiled/libtilededitor.qbs
index 9e576776b4..b31c299cf1 100644
--- 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",
diff --git a/src/tiledquickplugin/tiledquickplugin.qbs b/src/tiledquickplugin/tiledquickplugin.qbs
index 63a64a5507..729a732bb0 100644
--- 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",

1329
tiled.changes Normal file
View File

File diff suppressed because it is too large Load Diff

143
tiled.spec Normal file
View File

@ -0,0 +1,143 @@
#
# spec file for package tiled
#
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: tiled
Version: 1.11.1
Release: 0
Summary: A tilemap editor
License: GPL-2.0-or-later
URL: https://www.mapeditor.org
Source: https://github.com/mapeditor/tiled/archive/refs/tags/v%{version}.tar.gz
# PATCH-FIX-UPSTREAM gh/mapeditor/tiled#4077
Patch1: fix_compile_against_qt_6_8.patch
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: karchive-devel
BuildRequires: qbs
BuildRequires: qt6-base-common-devel
BuildRequires: qt6-base-devel
BuildRequires: qt6-core-devel >= 6.4.2
BuildRequires: qt6-declarative-devel
BuildRequires: qt6-declarative-private-devel
BuildRequires: qt6-gui-devel
BuildRequires: qt6-linguist-devel
BuildRequires: qt6-opengl-devel
BuildRequires: qt6-qml-devel
BuildRequires: qt6-quickcontrols2-devel
BuildRequires: qt6-svg-devel
BuildRequires: shared-mime-info
BuildRequires: zlib-devel
Recommends: tmxtools
Provides: tiled-qt
%description
Tiled is a general purpose tile map editor. It is built to work with
varying game engines, whether your game is an RPG, platformer or
Breakout clone. Tiled is written in C++, using the Qt application
framework.
%package -n tmxtools
Summary: Commandline Tools for Tiled MapEditor
License: BSD-2-Clause
%description -n tmxtools
This package contains tmxviewer, a simple application to view Tiled maps
and tmxrasterizer which is also a command line tool.
%prep
%autosetup -p1
# Remove copy of zlib
rm -rf src/zlib
%build
# see gh/mapeditor/tiled#3613 why no --detect
qbs setup-toolchains --type gcc %{_bindir}/g++ gcc
qbs setup-qt %{_bindir}/qmake6 defprof
qbs config defaultProfile defprof
qbs qbs.installPrefix:"%{_prefix}" projects.Tiled.useRPaths:false projects.Tiled.libDir:%{_lib}
%install
qbs install --install-root %{buildroot}
# Clean build artefacts
find -name ".uic" -or -name ".moc" -or -name ".rcc" | xargs rm -rf
# locale files
%find_lang %{name} --with-qt
# Remove duplicates
%fdupes %{buildroot}%{_datadir}
%if 0%{?suse_version} > 1130
%post
%desktop_database_post
%icon_theme_cache_post
%mime_database_post
%postun
%desktop_database_postun
%icon_theme_cache_postun
%mime_database_postun
%endif
%files -f %{name}.lang
%license COPYING LICENSE.GPL LICENSE.BSD
%doc AUTHORS NEWS.md README.md
%{_bindir}/%{name}
%{_bindir}/terraingenerator
%{_datadir}/applications/org.mapeditor.Tiled.desktop
%{_datadir}/metainfo/org.mapeditor.Tiled.appdata.xml
%{_datadir}/icons/hicolor/*/mimetypes/application-x-%{name}.*
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/mime/packages/org.mapeditor.Tiled.xml
%dir %{_datadir}/%{name}/
%dir %{_datadir}/%{name}/translations
%{_mandir}/man1/%{name}.1%{?ext_man}
%{_libdir}/libtiled.so
%{_libdir}/libtilededitor.so
%dir %{_libdir}/tiled
%dir %{_libdir}/tiled/plugins
%{_libdir}/tiled/plugins/libcsv.so
%{_libdir}/tiled/plugins/libdefold.so
%{_libdir}/tiled/plugins/libdefoldcollection.so
%{_libdir}/tiled/plugins/libdroidcraft.so
%{_libdir}/tiled/plugins/libflare.so
%{_libdir}/tiled/plugins/libgmx.so
%{_libdir}/tiled/plugins/libjson.so
%{_libdir}/tiled/plugins/libjson1.so
%{_libdir}/tiled/plugins/liblua.so
%{_libdir}/tiled/plugins/libreplicaisland.so
%{_libdir}/tiled/plugins/librpmap.so
%{_libdir}/tiled/plugins/libtbin.so
%{_libdir}/tiled/plugins/libtengine.so
%{_libdir}/tiled/plugins/libtscn.so
%{_libdir}/tiled/plugins/libyy.so
%files -n tmxtools
%license LICENSE.BSD
%{_bindir}/tmxrasterizer
%{_bindir}/tmxviewer
%{_mandir}/man1/tmxviewer.1%{?ext_man}
%{_mandir}/man1/tmxrasterizer.1%{?ext_man}
%dir %{_datadir}/thumbnailers/
%{_datadir}/thumbnailers/tiled.thumbnailer
%dir %{_datadir}/metainfo/
%changelog

3
v1.11.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ca549341fe1d13f633494fcde5880205301e6bb26ee66f307d76a2efb7e21da
size 17458724

3
v1.11.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35c9ae32b4c2883807775427bd0b8f273a47f98f836c0f3f1e3abc1258a7f97b
size 17569298