Accepting request 1072096 from games:tools

- Add tiled-1.10.0-lib.patch:
  Move so files into corresponding directories

- Update to 1.10.0:
  * Restored Tiled 1.8 file format compatibility by default (#3560)
  * Added action search popup on Ctrl+Shift+P (with dogboydog, #3449)
  * Added Godot 4 export plugin (by Rick Yorgason, #3550)
  * Added file system actions also for tileset image based tilesets (#3448)
  * Added custom class option to disable drawing fill for objects (with dogboydog, #3312)
  * Added option to choose a custom interface font (#3589)
  * Implemented rendering of major grid lines for staggered / hexagonal maps (#3583)
  * Fixed new layer names to be always unique (by Logan Higinbotham, #3452)
  * Fixed broken tile images after importing/exporting a tileset
  * AutoMapping: Added support for output set probability (#3179)
  * AutoMapping: When input regions are defined, match in order by default (#3559)
  * AutoMapping: Skip locked layers when applying rules (#3544)
  * AutoMapping: Fixed NoOverlappingOutput in case of multiple output indices (#3551)
  * AutoMapping: Fixed automatic output regions for object output (#3473)
  * AutoMapping: Fixed crash on undo when output layers have properties
  * Scripting: Added Object.setColorProperty and Object.setFloatProperty (#3423)
  * Scripting: Added tiled.projectFilePath
  * Scripting: Added tiled.versionLessThan
  * Scripting: Added TileMap.toImage (#3519)
  * Scripting: Added Tool.targetLayerType (#3248)
  * Scripting: Added region.contiguousRegions() (#3576)
  * Scripting: Added tiled.compress and tiled.decompress (#3153)
  * Scripting: Added Base64 encoding and decoding API (#3153)
  * Scripting: Allow assigning null to Tile.objectGroup (by Logan Higinbotham, #3495)
  * Scripting: Allow changing the items in a combo box added to a dialog
  * Scripting: Fixed painting issues after changing TileLayer size (#3481)

OBS-URL: https://build.opensuse.org/request/show/1072096
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tiled?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger 2023-03-15 17:54:31 +00:00 committed by Git OBS Bridge
commit d667def225
5 changed files with 216 additions and 33 deletions

39
tiled-1.10.0-lib.patch Normal file
View File

@ -0,0 +1,39 @@
Index: tiled-1.10.0/src/libtiled/libtiled.qbs
===================================================================
--- tiled-1.10.0.orig/src/libtiled/libtiled.qbs
+++ tiled-1.10.0/src/libtiled/libtiled.qbs
@@ -209,7 +209,7 @@ DynamicLibrary {
else
return "bin"
else
- return "lib"
+ return "lib64"
}
fileTagsFilter: "dynamiclibrary"
}
Index: tiled-1.10.0/qbs/imports/TiledPlugin.qbs
===================================================================
--- tiled-1.10.0.orig/qbs/imports/TiledPlugin.qbs
+++ tiled-1.10.0/qbs/imports/TiledPlugin.qbs
@@ -42,7 +42,7 @@ DynamicLibrary {
else if (qbs.targetOS.contains("macos"))
return "Tiled.app/Contents/PlugIns"
else
- return "lib/tiled/plugins"
+ return "lib64/tiled/plugins"
}
fileTagsFilter: "dynamiclibrary"
}
Index: tiled-1.10.0/src/tiled/libtilededitor.qbs
===================================================================
--- tiled-1.10.0.orig/src/tiled/libtilededitor.qbs
+++ tiled-1.10.0/src/tiled/libtilededitor.qbs
@@ -608,7 +608,7 @@ DynamicLibrary {
else
return "bin"
else
- return "lib"
+ return "lib64"
}
fileTagsFilter: "dynamiclibrary"
}

View File

@ -1,3 +1,131 @@
-------------------------------------------------------------------
Wed Mar 15 12:01:22 UTC 2023 - Michael Vetter <mvetter@suse.com>
- Add tiled-1.10.0-lib.patch:
Move so files into corresponding directories
-------------------------------------------------------------------
Sat Mar 11 06:08:09 UTC 2023 - Michael Vetter <mvetter@suse.com>
- Update to 1.10.0:
* Restored Tiled 1.8 file format compatibility by default (#3560)
* Added action search popup on Ctrl+Shift+P (with dogboydog, #3449)
* Added Godot 4 export plugin (by Rick Yorgason, #3550)
* Added file system actions also for tileset image based tilesets (#3448)
* Added custom class option to disable drawing fill for objects (with dogboydog, #3312)
* Added option to choose a custom interface font (#3589)
* Implemented rendering of major grid lines for staggered / hexagonal maps (#3583)
* Fixed new layer names to be always unique (by Logan Higinbotham, #3452)
* Fixed broken tile images after importing/exporting a tileset
* AutoMapping: Added support for output set probability (#3179)
* AutoMapping: When input regions are defined, match in order by default (#3559)
* AutoMapping: Skip locked layers when applying rules (#3544)
* AutoMapping: Fixed NoOverlappingOutput in case of multiple output indices (#3551)
* AutoMapping: Fixed automatic output regions for object output (#3473)
* AutoMapping: Fixed crash on undo when output layers have properties
* Scripting: Added Object.setColorProperty and Object.setFloatProperty (#3423)
* Scripting: Added tiled.projectFilePath
* Scripting: Added tiled.versionLessThan
* Scripting: Added TileMap.toImage (#3519)
* Scripting: Added Tool.targetLayerType (#3248)
* Scripting: Added region.contiguousRegions() (#3576)
* Scripting: Added tiled.compress and tiled.decompress (#3153)
* Scripting: Added Base64 encoding and decoding API (#3153)
* Scripting: Allow assigning null to Tile.objectGroup (by Logan Higinbotham, #3495)
* Scripting: Allow changing the items in a combo box added to a dialog
* Scripting: Fixed painting issues after changing TileLayer size (#3481)
* Scripting: Renamed Tileset.collection to Tileset.isCollection (#3543)
* Defold plugin: Allow overriding z value also when exporting to .collection (#3214)
* Qt 6: Fixed invisible tileset tabs when only a single tileset is open
* Qt 6: Fixed behavior of "Class of" selection popup
* Qt 6: Fixed tile rendering when OpenGL is enabled (#3578)
* Fixed positioning of point object name labels (by Logan Higinbotham, #3400)
* Fixed slight drift when zooming the map view in/out
* Fixed remaining lag after switching off hardware acceleration (#3584)
* Fixed point object hover highlight position (#3571)
* Fixed drawing lines with stamps having differently sized variations (#3533)
* Fixed compile against Qt 6.4
* snap: Added Wayland platform plugin and additional image format plugins
* AppImage: Updated to Sentry 0.6.0
* Updated Bulgarian, French, German, Hungarian, Russian and Swedish translations
-------------------------------------------------------------------
Sun Sep 18 11:43:24 UTC 2022 - Michael Vetter <mvetter@suse.com>
- Update to 1.9.2:
* Allow adding maps to image collection tilesets (#3447)
* Auto-detect JSON file format when importing custom types (#3472)
* Added file system actions to the tile context menu (#3448)
* Fixed possible crash in Custom Types Editor (#3465)
* Fixed display of overridden values from a nested class
* Fixed ability to reset nested string and file properties (#3409)
* Fixed changing nested property values for multiple objects (#3344)
* Fixed resolving of class properties on export to affect all data types (#3470)
* Fixed possible duplication of Automapping Rules Tileset (#3462)
* Fixed case where object labels could become visible for hidden layer (#3442)
* Fixed updating of custom property colors when changing style
* Scripting: Added Tileset.findTile
* AutoMapping: Fixed applying of rule probability (#3425)
* Defold plugin: Assign incrementing z values and allow specifying tile_set (#3214)
* Updates to German translation
-------------------------------------------------------------------
Fri Aug 12 05:34:14 UTC 2022 - Michael Vetter <mvetter@suse.com>
- Update to 1.9.1:
* Fixed properties-related crash when having no project loaded
* Fixed loading of custom tile image rectangles (#3405)
* Fixed loading of member values for nested classes (#3414)
* Fixed visibility of "Move Object to Layer" sub-menu (#3417)
* Fixed shadow offset for other maps in a world (#3429)
* Fixed class dropdown to update immediately when changing custom types (#3398)
* Fixed deleting an overridden property to not make it disappear (#3409)
* Scripting: Added TilesetsView.currentTilesetChanged
* JSON plugin: Fixed loading image layer "repeatx/y" properties #3428)
* snap: Fixed startup error due to missing libQt5Concurrent.so.5 (#3408)
* AppImage: Use custom AppRun that can call all binaries (#3415)
* AppImage: Updated to Sentry 0.5.0
* Updated Chinese (Simplified) and Portuguese translations
-------------------------------------------------------------------
Sat Jun 25 10:09:04 UTC 2022 - Michael Vetter <mvetter@suse.com>
- Update to 1.9.0:
* Added option to ignore transparent pixels when selecting tile objects (#1477)
* Added support for sub-images in image collection tilesets (#1008)
* Added "Class" field to all data types, referring to a custom class
* Added Tile Render Size and Fill Mode options to Tileset
* Added %worldfile variable for custom commands (by Pixel-Nori, #3352)
* Added 'New Project' action, replacing 'Save Project As' (#3279)
* Added ability to load .tiled-session files from command-line
* Merged Object Types with Property Types
* Don't scale point objects with the zoom level (#3356)
* Take into account image layer content when determining visual map size (#3386)
* Scripting: Added Dialog API for building custom UI (by tileboydog, #3384)
* Scripting: Added -e,--evaluate to run a script from command-line
* Scripting: Added Tool.toolBarActions property (#3318)
* Scripting: Added Tileset.columnCount property
* Scripting: Added ImageLayer.image property
* Scripting: Added access to selected terrain in tileset editor
* AutoMapping: Applying rules is now 10-30x faster
* AutoMapping: Explicit "regions" layers are no longer needed and have been deprecated (#1918)
* AutoMapping: "AutoMap While Drawing" no longer creates separate undo steps (#2166)
* AutoMapping: Custom tiles can now match "Empty", "Non-Empty" and "Other" tiles through a "MatchType" property (#3100)
* AutoMapping: A custom tile with "MatchType" set to "Negate" can be used instead of "inputnot" layers
* AutoMapping: Added built-in tileset with these custom rule tiles
* AutoMapping: Added a number of per-rule options which can be set using rectangle objects
* AutoMapping: Erase tiles by placing tiles with "MatchType" set to "Empty" on output layers (#3100)
* AutoMapping: Accumulate touched layers in AutoMap While Drawing (#3313)
* AutoMapping: Support map name filters in rules.txt (#3014)
* AutoMapping: Show relevant custom properties when a rules map is detected
* Optimized rendering of tinted layers by caching tinted images
* tmxrasterizer: Added options to hide certain layer types (#3343)
* Raised minimum supported Qt version from 5.6 to 5.12 (drops Windows XP support)
* Raised minimum C++ version to C++17
* Removed qmake project files (only Qbs supported now)
* Python plugin: Now built against Python 3.8 on Windows and Linux
* Updated Bulgarian, Czech, French and Russian translations
-------------------------------------------------------------------
Wed Jun 15 08:45:47 UTC 2022 - Michael Vetter <mvetter@suse.com>
@ -251,7 +379,7 @@ Mon Mar 29 11:04:10 UTC 2021 - Michael Vetter <mvetter@suse.com>
- Update to 1.5.0:
* Unified Wang and Terrain tools (backwards incompatible change!)
* Added support for a per-layer parallax scrolling factor (#2951[1])
* Added support for a per-layer parallax scrolling factor (#2951)
* Added export to GameMaker Studio 2.3 (#1642[2])
* Added option to change object selection behavior (#2865[3])
* Added Monospace option to the multi-line text editor

View File

@ -1,7 +1,7 @@
#
# spec file for package tiled
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,23 +17,33 @@
Name: tiled
Version: 1.8.6
Version: 1.10.0
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 mvetter@suse.com tiled-1.10.0-lib.patch -- gh/mapeditor/tiled#3613
Patch0: tiled-1.10.0-lib.patch
BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: libQt5OpenGL-devel
BuildRequires: libqt5-linguist
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qtdeclarative-private-headers-devel
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
BuildRequires: cmake(Qt5Qml)
Recommends: tmxtools
Provides: tiled-qt
@ -51,25 +61,23 @@ License: BSD-2-Clause
This package contains tmxviewer, a simple application to view Tiled maps
and tmxrasterizer which is also a command line tool.
%package -n libtiled1
Summary: Library for Tiled MapEditor
License: BSD-2-Clause
%description -n libtiled1
This package contains libtiled a library for the Tiled map editor.
%prep
%setup -q
%if "%{_lib}" == "lib64"
%patch0 -p1
%endif
# Remove copy of zlib
rm -rf src/zlib
%build
qmake-qt5 -r PREFIX=%{_prefix} LIBDIR=%{_libdir} RPATH=no USE_FHS_PLUGIN_PATH=yes
make %{?_smp_mflags}
# see gh/mapeditor/tiled#3613 why no --detect
qbs setup-toolchains --type gcc %{_bindir}/g++-12 gcc
qbs setup-qt %{_bindir}/qmake6 defprof
qbs config defaultProfile defprof
qbs qbs.installPrefix:"%{_prefix}" projects.Tiled.useRPaths:false
%install
make install INSTALL_ROOT=%{buildroot}
qbs install --install-root %{buildroot}
# Clean build artefacts
find -name ".uic" -or -name ".moc" -or -name ".rcc" | xargs rm -rf
@ -77,15 +85,9 @@ find -name ".uic" -or -name ".moc" -or -name ".rcc" | xargs rm -rf
# locale files
%find_lang %{name} --with-qt
# Removed development file (this version does not install headers anyway)
rm %{buildroot}%{_libdir}/lib%{name}.so
# Remove duplicates
%fdupes %{buildroot}%{_datadir}
%post -n libtiled1 -p /sbin/ldconfig
%postun -n libtiled1 -p /sbin/ldconfig
%if 0%{?suse_version} > 1130
%post
%desktop_database_post
@ -110,12 +112,26 @@ rm %{buildroot}%{_libdir}/lib%{name}.so
%{_datadir}/mime/packages/org.mapeditor.Tiled.xml
%dir %{_datadir}/%{name}/
%dir %{_datadir}/%{name}/translations
%{_libdir}/%{name}
%{_mandir}/man1/%{name}.1%{?ext_man}
%files -n libtiled1
%license LICENSE.BSD
%{_libdir}/lib%{name}.so.*
%{_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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60436003575b475adfd490832385306740bc6e1c51ceec023986cb251b0417ff
size 17358146

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4af8359bd6803a8e14540bcef7acd9b74afd76a3f5c91f9c958705d7fc5fd885
size 17053221