development/tiled: updated for version 1.3.0

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 31 insertions, 28 deletions

diff --git a/development/tiled/README b/development/tiled/README
index e2fd7d6636..6d8d1aeb7b 100644
--- a/development/tiled/README
+++ b/development/tiled/README
@@ -8,3 +8,6 @@ arbitrary properties to be set on the map, its layers, the tiles or on
 the objects. Its map format (TMX) is relatively easy to understand and
 allows a map to use multiple tilesets while also allowing each tileset
 to grow or shrink as necessary later.
+
+Sometimes - like when upgrading from 1.2.x to 1.3.x - you need to remove
+previously installed version prior to building the new one.
diff --git a/development/tiled/tiled.SlackBuild b/development/tiled/tiled.SlackBuild
index 87f8c5ae10..a870067f6d 100644
--- a/development/tiled/tiled.SlackBuild
+++ b/development/tiled/tiled.SlackBuild
@@ -25,7 +25,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tiled
-VERSION=${VERSION:-1.2.5}
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/development/tiled/tiled.info b/development/tiled/tiled.info
index 221115a945..455d355948 100644
--- a/development/tiled/tiled.info
+++ b/development/tiled/tiled.info
@@ -1,8 +1,8 @@
 PRGNAM="tiled"
-VERSION="1.2.5"
+VERSION="1.3.0"
 HOMEPAGE="https://www.mapeditor.org"
-DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.2.5/tiled-1.2.5.tar.gz"
-MD5SUM="205a542e4e2275d73582bfc71952ec1b"
+DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.3.0/tiled-1.3.0.tar.gz"
+MD5SUM="af189e32279c34dcbccd4ec67204c93f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5"
diff --git a/development/tiled/tiled_lib64.patch b/development/tiled/tiled_lib64.patch
index 01d778bc72..660062f45f 100644
--- a/development/tiled/tiled_lib64.patch
+++ b/development/tiled/tiled_lib64.patch
@@ -1,6 +1,6 @@
 diff -Naur src/libtiled/libtiled.pro src/libtiled/libtiled.pro
---- src/libtiled/libtiled.pro	2017-09-21 10:28:51.737708697 +0200
-+++ src/libtiled/libtiled.pro	2017-09-20 16:53:45.976355498 +0200
+--- src/libtiled/libtiled.pro	2019-11-12 15:18:10.000000000 +0100
++++ src/libtiled/libtiled.pro	2019-11-12 21:20:24.366384856 +0100
 @@ -8,7 +8,7 @@
      DESTDIR = ../../bin/Tiled.app/Contents/Frameworks
      QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Frameworks/
@@ -11,9 +11,9 @@ diff -Naur src/libtiled/libtiled.pro src/libtiled/libtiled.pro
  DLLDESTDIR = ../..
  
 diff -Naur src/libtiled/pluginmanager.cpp src/libtiled/pluginmanager.cpp
---- src/libtiled/pluginmanager.cpp	2017-09-21 10:28:51.739708697 +0200
-+++ src/libtiled/pluginmanager.cpp	2017-09-21 09:25:05.377930367 +0200
-@@ -201,7 +201,7 @@
+--- src/libtiled/pluginmanager.cpp	2019-11-12 15:18:10.000000000 +0100
++++ src/libtiled/pluginmanager.cpp	2019-11-12 21:20:24.366384856 +0100
+@@ -196,7 +196,7 @@
  #elif defined(TILED_PLUGIN_DIR)
      QString pluginPath = QLatin1String(TILED_PLUGIN_DIR);
  #else
@@ -23,8 +23,8 @@ diff -Naur src/libtiled/pluginmanager.cpp src/libtiled/pluginmanager.cpp
  
      // Load dynamic plugins
 diff -Naur src/plugins/plugin.pri src/plugins/plugin.pri
---- src/plugins/plugin.pri	2017-09-21 10:28:51.740708697 +0200
-+++ src/plugins/plugin.pri	2017-09-20 16:11:02.307504018 +0200
+--- src/plugins/plugin.pri	2019-11-12 15:18:10.000000000 +0100
++++ src/plugins/plugin.pri	2019-11-12 21:20:24.366384856 +0100
 @@ -10,7 +10,7 @@
  } else:macx {
      DESTDIR = $$OUT_PWD/../../../bin/Tiled.app/Contents/PlugIns
@@ -47,9 +47,9 @@ diff -Naur src/plugins/plugin.pri src/plugins/plugin.pri
  
  # Set rpath so that the plugin will resolve libtiled correctly
 diff -Naur src/tiled/tiled.pro src/tiled/tiled.pro
---- src/tiled/tiled.pro	2017-09-21 10:28:51.750708696 +0200
-+++ src/tiled/tiled.pro	2017-09-20 15:52:06.112569840 +0200
-@@ -58,12 +58,12 @@
+--- src/tiled/tiled.pro	2019-11-12 15:18:10.000000000 +0100
++++ src/tiled/tiled.pro	2019-11-12 21:20:24.366384856 +0100
+@@ -28,12 +28,12 @@
  } else:win32 {
      LIBS += -L$$OUT_PWD/../../lib
  } else {
@@ -65,8 +65,8 @@ diff -Naur src/tiled/tiled.pro src/tiled/tiled.pro
      # It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
      QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
 diff -Naur src/tmxrasterizer/tmxrasterizer.pro src/tmxrasterizer/tmxrasterizer.pro
---- src/tmxrasterizer/tmxrasterizer.pro	2017-09-21 11:18:41.212535509 +0200
-+++ src/tmxrasterizer/tmxrasterizer.pro	2017-09-21 11:18:29.837536168 +0200
+--- src/tmxrasterizer/tmxrasterizer.pro	2019-11-12 15:18:10.000000000 +0100
++++ src/tmxrasterizer/tmxrasterizer.pro	2019-11-12 21:20:24.366384856 +0100
 @@ -19,12 +19,12 @@
  } else:win32 {
      LIBS += -L$$OUT_PWD/../../lib
@@ -83,8 +83,8 @@ diff -Naur src/tmxrasterizer/tmxrasterizer.pro src/tmxrasterizer/tmxrasterizer.p
      # It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
      QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
 diff -Naur src/tmxviewer/tmxviewer.pro src/tmxviewer/tmxviewer.pro
---- src/tmxviewer/tmxviewer.pro	2017-09-21 11:18:12.497537173 +0200
-+++ src/tmxviewer/tmxviewer.pro	2017-09-21 11:17:51.468538391 +0200
+--- src/tmxviewer/tmxviewer.pro	2019-11-12 15:18:10.000000000 +0100
++++ src/tmxviewer/tmxviewer.pro	2019-11-12 21:20:24.366384856 +0100
 @@ -19,12 +19,12 @@
  } else:win32 {
      LIBS += -L$$OUT_PWD/../../lib
@@ -101,8 +101,8 @@ diff -Naur src/tmxviewer/tmxviewer.pro src/tmxviewer/tmxviewer.pro
      # It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
      QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
 diff -Naur src/terraingenerator/terraingenerator.pro src/terraingenerator/terraingenerator.pro
---- src/terraingenerator/terraingenerator.pro	2017-08-29 09:06:51.000000000 +0200
-+++ src/terraingenerator/terraingenerator.pro	2017-09-21 11:19:06.508534044 +0200
+--- src/terraingenerator/terraingenerator.pro	2019-11-12 15:18:10.000000000 +0100
++++ src/terraingenerator/terraingenerator.pro	2019-11-12 21:20:24.367384856 +0100
 @@ -19,12 +19,12 @@
  } else:win32 {
      LIBS += -L$$OUT_PWD/../../lib
@@ -118,10 +118,10 @@ diff -Naur src/terraingenerator/terraingenerator.pro src/terraingenerator/terrai
  
      # It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
      QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'
-diff -Naur src/automappingconverter/automappingconverter.pro src/automappingconverter/automappingconverter.pro
---- src/automappingconverter/automappingconverter.pro	2017-09-21 12:00:09.574391353 +0200
-+++ src/automappingconverter/automappingconverter.pro	2017-09-21 11:59:56.557392107 +0200
-@@ -12,12 +12,12 @@
+diff -Naur src/tiledquickplugin/tiledquickplugin.pro src/tiledquickplugin/tiledquickplugin.pro
+--- src/tiledquickplugin/tiledquickplugin.pro	2019-11-12 15:18:10.000000000 +0100
++++ src/tiledquickplugin/tiledquickplugin.pro	2019-11-12 21:50:05.469424699 +0100
+@@ -17,12 +17,12 @@
  } else:win32 {
      LIBS += -L$$OUT_PWD/../../lib
  } else {
@@ -129,10 +129,10 @@ diff -Naur src/automappingconverter/automappingconverter.pro src/automappingconv
 +    QMAKE_LIBDIR = $$OUT_PWD/../../lib64 $$QMAKE_LIBDIR
  }
  
- # Make sure the executable can find libtiled
- !win32:!macx:!cygwin:contains(RPATH, yes) {
--    QMAKE_RPATHDIR += \$\$ORIGIN/../lib
-+    QMAKE_RPATHDIR += \$\$ORIGIN/../lib64
+ # Make sure the Tiled executable can find libtiled
+ !win32:!macx:contains(RPATH, yes) {
+-    QMAKE_RPATHDIR += \$\$ORIGIN/../../../../lib
++    QMAKE_RPATHDIR += \$\$ORIGIN/../../../../lib64
  
      # It is not possible to use ORIGIN in QMAKE_RPATHDIR, so a bit manually
      QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$join(QMAKE_RPATHDIR, ":")\'