diff --git a/tiled-1.10.0-lib.patch b/tiled-1.10.0-lib.patch deleted file mode 100644 index 9b96f71..0000000 --- a/tiled-1.10.0-lib.patch +++ /dev/null @@ -1,39 +0,0 @@ -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" - } diff --git a/tiled.changes b/tiled.changes index 088a744..deec7c9 100644 --- a/tiled.changes +++ b/tiled.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Apr 4 12:56:27 UTC 2023 - Michael Vetter + +- Update to 1.10.1: + * Make panning with Space require pressing a mouse button as well (#3626) + * Scripting: Added read-only access to Project properties (by dogboydog, #3622) + * Scripting: Fixed behavior of Dialog.SameWidgetRows (#3607) + * Fixed object labels to adjust to application font changes + * Fixed grid rendering for odd Hex Side Length values (#3623) + * Fixed tile stamp getting messed up on staggered maps in some cases (#3431) + * JSON plugin: Fixed loading of empty tilesets created by script (#3542) + * Godot 4 plugin: Removed depth limit for .godot project file (#3612) + * Improved Terrain Brush for Hexagonal (Staggered) maps with side length 0 (#3617) + * Removed "Add Folder to Project" button from the startup page + * Qt 6: Increased the image allocation limit from 128 MB to 1 GB (#3616) + * Qt 6 / Linux: Fixed long startup time for some icon themes + * snap: Updated from core20 to core22 (now uses Qt 5.15) + * Qbs: Added projects.Tiled.libDir option (#3613) +- Remove tiled-1.10.0-lib.patch + ------------------------------------------------------------------- Wed Mar 29 16:57:16 UTC 2023 - Bjørn Lie diff --git a/tiled.spec b/tiled.spec index b8e6c7f..14e99be 100644 --- a/tiled.spec +++ b/tiled.spec @@ -17,14 +17,12 @@ Name: tiled -Version: 1.10.0 +Version: 1.10.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 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++ @@ -63,9 +61,6 @@ and tmxrasterizer which is also a command line tool. %prep %setup -q -%if "%{_lib}" == "lib64" -%patch0 -p1 -%endif # Remove copy of zlib rm -rf src/zlib @@ -74,7 +69,7 @@ rm -rf src/zlib qbs setup-toolchains --type gcc %{_bindir}/g++-13 gcc qbs setup-qt %{_bindir}/qmake6 defprof qbs config defaultProfile defprof -qbs qbs.installPrefix:"%{_prefix}" projects.Tiled.useRPaths:false +qbs qbs.installPrefix:"%{_prefix}" projects.Tiled.useRPaths:false projects.Tiled.libDir:%{_lib} %install qbs install --install-root %{buildroot} diff --git a/v1.10.0.tar.gz b/v1.10.0.tar.gz deleted file mode 100644 index 4287b05..0000000 --- a/v1.10.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60436003575b475adfd490832385306740bc6e1c51ceec023986cb251b0417ff -size 17358146 diff --git a/v1.10.1.tar.gz b/v1.10.1.tar.gz new file mode 100644 index 0000000..a562963 --- /dev/null +++ b/v1.10.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6babc67801c4b2840ffad03d9c524187878dd859b68e2fcd0b5039c5cb04ab5a +size 17359401