From 132c36361bb84b7c1bb62477e81d7e2f15da48c0b52cc0b4db250b47cf116ca1 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 4 Jan 2018 11:31:37 +0000 Subject: [PATCH] =?UTF-8?q?-=20Update=20to=201.1.0:=20=20=20*=20Added=20su?= =?UTF-8?q?pport=20for=20infinite=20maps=20(by=20Ketan=20Gupta,=20#260)=20?= =?UTF-8?q?=20=20*=20Added=20support=20for=20Wang=20tiles=20and=20related?= =?UTF-8?q?=20tools=20(by=20Benjamin=20Trotter)=20=20=20*=20Added=20suppor?= =?UTF-8?q?t=20for=20reusable=20object=20templates=20(by=20Mohamed=20Thabe?= =?UTF-8?q?t)=20=20=20*=20Added=20icon=20for=20animation=20editor=20in=20t?= =?UTF-8?q?he=20tileset=20editor=20(by=20Ketan=20Gupta,=20#1706)=20=20=20*?= =?UTF-8?q?=20Added=20ability=20to=20reorder=20terrain=20types=20(by=20Jus?= =?UTF-8?q?tin=20Jacobs,=20#1603)=20=20=20*=20Added=20support=20for=20cust?= =?UTF-8?q?om=20input=20formats=20and=20TMX=20output=20to=20the=20--export?= =?UTF-8?q?-map=20command-line=20option=20=20=20*=20Added=20island=20RPG?= =?UTF-8?q?=20example=20based=20on=20Beach=20tileset=20by=20finalbossblues?= =?UTF-8?q?=20=20=20*=20Added=20file-related=20context=20menu=20actions=20?= =?UTF-8?q?to=20tileset=20tabs=20=20=20*=20Added=20support=20for=20exporti?= =?UTF-8?q?ng=20tilesets,=20including=20to=20Lua=20format=20(by=20Conrad?= =?UTF-8?q?=20Mercer,=20#1213)=20=20=20*=20Improved=20polygon=20node=20han?= =?UTF-8?q?dles=20and=20drag=20behavior=20=20=20*=20Fixed=20%executablepat?= =?UTF-8?q?h=20variable=20for=20executables=20found=20in=20PATH=20(#1648)?= =?UTF-8?q?=20=20=20*=20Fixed=20Delete=20key=20to=20delete=20selected=20po?= =?UTF-8?q?lygon=20nodes=20when=20appropriate=20(by=20Ketan=20Gupta,=20#15?= =?UTF-8?q?55)=20=20=20*=20Fixed=20crash=20when=20saving=20two=20new=20map?= =?UTF-8?q?s=20using=20the=20same=20file=20name=20(#1734)=20=20=20*=20Fixe?= =?UTF-8?q?d=20selection=20rectangle's=20shadow=20offset=20when=20zooming?= =?UTF-8?q?=20(by=20Antoine=20Gersant,=20#1796)=20=20=20*=20Fixed=20potent?= =?UTF-8?q?ial=20crash=20after=20deleting=20object=20or=20group=20layers?= =?UTF-8?q?=20=20=20*=20Automapping:=20Don't=20fail=20if=20an=20input/inpu?= =?UTF-8?q?tnot=20layer=20isn't=20found=20=20=20*=20Automapping:=20Added?= =?UTF-8?q?=20a=20"StrictEmpty"=20flag=20to=20input=20layers=20=20=20*=20G?= =?UTF-8?q?MX=20plugin:=20Added=20support=20for=20defining=20views=20with?= =?UTF-8?q?=20objects=20(by=20William=20Taylor,=20#1621)=20=20=20*=20GMX?= =?UTF-8?q?=20plugin:=20Start=20counting=20default=20tile=20layer=20depth?= =?UTF-8?q?=20from=201000000=20(#1814)=20=20=20*=20tBIN=20plugin:=20Added?= =?UTF-8?q?=20read/write=20support=20for=20the=20tBIN=20map=20format=20(by?= =?UTF-8?q?=20Chase=20Warrington,=20#1560)=20=20=20*=20libtiled-java:=20Ge?= =?UTF-8?q?nerate=20classes=20from=20XSD,=20some=20fixes=20and=20build=20w?= =?UTF-8?q?ith=20Maven=20(by=20Mike=20Thomas,=20#1637)=20=20=20*=20libtile?= =?UTF-8?q?d-java:=20Added=20support=20for=20manipulating=20non-consecutiv?= =?UTF-8?q?e=20tile=20IDs=20in=20a=20tileset=20(by=20St=C3=A9phane=20Seng)?= =?UTF-8?q?=20=20=20*=20Python=20plugin:=20Adjusted=20example=20scripts=20?= =?UTF-8?q?to=20API=20changes=20(by=20spiiin,=20#1769)=20=20=20*=20=20plug?= =?UTF-8?q?in:=20Various=20changes=20(by=20Justin=20Jacobs,=20#1781)=20=20?= =?UTF-8?q?=20*=20TMW=20plugin:=20Removed=20since=20it=20is=20no=20longer?= =?UTF-8?q?=20needed=20=20=20*=20Updated=20translations=20-=20Add=20tiled-?= =?UTF-8?q?1.1.0-empty-return.patch:=20Fix=20'Program=20returns=20random?= =?UTF-8?q?=20data=20in=20a=20function'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/games:tools/tiled?expand=0&rev=20 --- tiled-1.0.3.tar.gz | 3 --- tiled-1.1.0-empty-return.patch | 11 +++++++++++ tiled-1.1.0.tar.gz | 3 +++ tiled.changes | 32 ++++++++++++++++++++++++++++++++ tiled.spec | 10 ++++++++-- 5 files changed, 54 insertions(+), 5 deletions(-) delete mode 100644 tiled-1.0.3.tar.gz create mode 100644 tiled-1.1.0-empty-return.patch create mode 100644 tiled-1.1.0.tar.gz diff --git a/tiled-1.0.3.tar.gz b/tiled-1.0.3.tar.gz deleted file mode 100644 index e495feb..0000000 --- a/tiled-1.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d0665bd988a877b7156842daeddd91fa17b1b473d2e5ebf8a62ffe2c9a047e2 -size 6601791 diff --git a/tiled-1.1.0-empty-return.patch b/tiled-1.1.0-empty-return.patch new file mode 100644 index 0000000..43f3d76 --- /dev/null +++ b/tiled-1.1.0-empty-return.patch @@ -0,0 +1,11 @@ +diff -urEbwB tiled-1.1.0/src/libtiled/tileset.cpp tiled-1.1.0.new/src/libtiled/tileset.cpp +--- tiled-1.1.0/src/libtiled/tileset.cpp 2018-01-03 11:57:44.000000000 +0100 ++++ tiled-1.1.0.new/src/libtiled/tileset.cpp 2018-01-04 12:00:09.806029317 +0100 +@@ -786,6 +786,7 @@ + case Tileset::Isometric: + return QLatin1String("isometric"); + } ++ return QString(); + } + + Tileset::Orientation Tileset::orientationFromString(const QString &string) diff --git a/tiled-1.1.0.tar.gz b/tiled-1.1.0.tar.gz new file mode 100644 index 0000000..9049197 --- /dev/null +++ b/tiled-1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8eebd95489ee94545d9b36188261b80205a702fe0c2a0765b578ce87bf1bbf7 +size 15963801 diff --git a/tiled.changes b/tiled.changes index 0b721e2..81cbdcf 100644 --- a/tiled.changes +++ b/tiled.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Thu Jan 4 11:09:08 UTC 2018 - mvetter@suse.com + +- Update to 1.1.0: + * Added support for infinite maps (by Ketan Gupta, #260) + * Added support for Wang tiles and related tools (by Benjamin Trotter) + * Added support for reusable object templates (by Mohamed Thabet) + * Added icon for animation editor in the tileset editor (by Ketan Gupta, #1706) + * Added ability to reorder terrain types (by Justin Jacobs, #1603) + * Added support for custom input formats and TMX output to the --export-map command-line option + * Added island RPG example based on Beach tileset by finalbossblues + * Added file-related context menu actions to tileset tabs + * Added support for exporting tilesets, including to Lua format (by Conrad Mercer, #1213) + * Improved polygon node handles and drag behavior + * Fixed %executablepath variable for executables found in PATH (#1648) + * Fixed Delete key to delete selected polygon nodes when appropriate (by Ketan Gupta, #1555) + * Fixed crash when saving two new maps using the same file name (#1734) + * Fixed selection rectangle's shadow offset when zooming (by Antoine Gersant, #1796) + * Fixed potential crash after deleting object or group layers + * Automapping: Don't fail if an input/inputnot layer isn't found + * Automapping: Added a "StrictEmpty" flag to input layers + * GMX plugin: Added support for defining views with objects (by William Taylor, #1621) + * GMX plugin: Start counting default tile layer depth from 1000000 (#1814) + * tBIN plugin: Added read/write support for the tBIN map format (by Chase Warrington, #1560) + * libtiled-java: Generate classes from XSD, some fixes and build with Maven (by Mike Thomas, #1637) + * libtiled-java: Added support for manipulating non-consecutive tile IDs in a tileset (by Stéphane Seng) + * Python plugin: Adjusted example scripts to API changes (by spiiin, #1769) + * plugin: Various changes (by Justin Jacobs, #1781) + * TMW plugin: Removed since it is no longer needed + * Updated translations +- Add tiled-1.1.0-empty-return.patch: Fix 'Program returns random data in a function' + ------------------------------------------------------------------- Tue Aug 29 14:06:11 UTC 2017 - mvetter@suse.com diff --git a/tiled.spec b/tiled.spec index 127b7a9..137ac98 100644 --- a/tiled.spec +++ b/tiled.spec @@ -1,7 +1,7 @@ # # spec file for package tiled # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,15 @@ Name: tiled -Version: 1.0.3 +Version: 1.1.0 Release: 0 Summary: A tilemap editor License: GPL-2.0+ Group: Productivity/Graphics/Other Url: http://www.mapeditor.org Source: https://github.com/bjorn/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +# FIX-UPSTREAM - jubahl@iodoru.org - https://github.com/bjorn/tiled/pull/1846 +Patch0: tiled-1.1.0-empty-return.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ @@ -61,6 +63,7 @@ This package contains libtiled a library for the Tiled map editor. %prep %setup -q +%patch0 -p1 # Remove copy of zlib rm -rf src/zlib @@ -89,6 +92,8 @@ install -Dm0644 tiled.appdata.xml %{buildroot}%{_datadir}/appdata/tiled.appdata. %post -n libtiled1 -p /sbin/ldconfig %postun -n libtiled1 -p /sbin/ldconfig + +%if 0%{?suse_version} > 1130 %post %desktop_database_post %icon_theme_cache_post @@ -98,6 +103,7 @@ install -Dm0644 tiled.appdata.xml %{buildroot}%{_datadir}/appdata/tiled.appdata. %desktop_database_postun %icon_theme_cache_postun %mime_database_postun +%endif %files -f %{name}.lang %doc AUTHORS NEWS.md README.md COPYING LICENSE.GPL LICENSE.BSD