3 files changed, 7 insertions, 152 deletions
diff --git a/development/tiled/tiled.SlackBuild b/development/tiled/tiled.SlackBuild
index 9e210487933e..ecd0725be894 100644
--- a/development/tiled/tiled.SlackBuild
+++ b/development/tiled/tiled.SlackBuild
@@ -27,7 +27,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tiled
-VERSION=${VERSION:-1.8.5}
+VERSION=${VERSION:-1.9.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -81,16 +81,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# patch to force the right library path to be used for libtiled plugins directory
-# it was always using ../lib/tiled/plugins/ even on x86_64 where the plugins were
-# stored by the installer itself on $LIBDIR/tiled/plugins/
-# This patch is therefore only useful when $LIBDIR=/usr/lib64/
-# Compilation itself would break as linking was done with ../lib/ even when the libs
-# are stored on ../lib64/
-if [ "$ARCH" = "x86_64" ]; then
-  patch -p0 < $CWD/tiled_lib64.patch
-fi
-
 qbs setup-qt /usr/bin/qmake-qt5 qt5
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -101,6 +91,9 @@ qbs install --install-root $PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+[ ! -d $PKG/usr/lib$LIBDIRSUFFIX ] && mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX
+	
+
 mv $PKG/usr/share/man $PKG/usr/man
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/development/tiled/tiled.info b/development/tiled/tiled.info
index 1093db03fcba..c12ecfc7f9df 100644
--- a/development/tiled/tiled.info
+++ b/development/tiled/tiled.info
@@ -1,8 +1,8 @@
 PRGNAM="tiled"
-VERSION="1.8.5"
+VERSION="1.9.2"
 HOMEPAGE="https://www.mapeditor.org"
-DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.8.5/tiled-1.8.5.tar.gz"
-MD5SUM="09b8b9305941eab8ae50901f90f56b48"
+DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.9.2/tiled-1.9.2.tar.gz"
+MD5SUM="a67993fe5b0ec4f6d97dffac52f6b5c7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qbs"
diff --git a/development/tiled/tiled_lib64.patch b/development/tiled/tiled_lib64.patch
deleted file mode 100644
index 4410d5a7f613..000000000000
--- a/development/tiled/tiled_lib64.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naur src/libtiled/libtiled.pro src/libtiled/libtiled.pro
---- 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/
- } else {
--    DESTDIR = ../../lib
-+    DESTDIR = ../../lib64
- }
- DLLDESTDIR = ../..
- 
-diff -Naur src/libtiled/pluginmanager.cpp src/libtiled/pluginmanager.cpp
---- 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
--    pluginPath += QStringLiteral("/../lib/tiled/plugins");
-+    pluginPath += QStringLiteral("/../lib64/tiled/plugins");
- #endif
- 
-     // Load dynamic plugins
-diff -Naur src/plugins/plugin.pri src/plugins/plugin.pri
---- 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
- } else {
--    DESTDIR = $$OUT_PWD/../../../lib/tiled/plugins
-+    DESTDIR = $$OUT_PWD/../../../lib64/tiled/plugins
- }
- 
- include(../../tiled.pri)
-@@ -21,9 +21,9 @@
- macx {
-     QMAKE_LIBDIR += $$OUT_PWD/../../../bin/Tiled.app/Contents/Frameworks
- } else:win32 {
--    LIBS += -L$$OUT_PWD/../../../lib
-+    LIBS += -L$$OUT_PWD/../../../lib64
- } else {
--    QMAKE_LIBDIR += $$OUT_PWD/../../../lib
-+    QMAKE_LIBDIR += $$OUT_PWD/../../../lib64
- }
- 
- # Set rpath so that the plugin will resolve libtiled correctly
-diff -Naur src/tiled/tiled.pro src/tiled/tiled.pro
---- 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 {
--    QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
-+    QMAKE_LIBDIR = $$OUT_PWD/../../lib64 $$QMAKE_LIBDIR
- }
- 
- # Make sure the Tiled executable can find libtiled
- !win32:!macx:!cygwin: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, ":")\'
-diff -Naur src/tmxrasterizer/tmxrasterizer.pro src/tmxrasterizer/tmxrasterizer.pro
---- 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
- } else {
--    QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
-+    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
- 
-     # 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	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
- } else {
--    QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
-+    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
- 
-     # 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	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
- } else {
--    QMAKE_LIBDIR_FLAGS += -L$$OUT_PWD/../../lib
-+    QMAKE_LIBDIR_FLAGS += -L$$OUT_PWD/../../lib64
- }
- 
- # Make sure the executable can find libtiled
- !win32:!macx:!cygwin: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, ":")\'
-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 {
--    QMAKE_LIBDIR = $$OUT_PWD/../../lib $$QMAKE_LIBDIR
-+    QMAKE_LIBDIR = $$OUT_PWD/../../lib64 $$QMAKE_LIBDIR
- }
- 
- # 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, ":")\'