summaryrefslogtreecommitdiffstats
path: root/development/tiled
diff options
context:
space:
mode:
Diffstat (limited to 'development/tiled')
-rw-r--r--development/tiled/tiled.SlackBuild34
-rw-r--r--development/tiled/tiled.info8
-rw-r--r--development/tiled/tiled_lib64.patch138
3 files changed, 24 insertions, 156 deletions
diff --git a/development/tiled/tiled.SlackBuild b/development/tiled/tiled.SlackBuild
index bfa869ce32..f4bd1709fa 100644
--- a/development/tiled/tiled.SlackBuild
+++ b/development/tiled/tiled.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for tiled
@@ -24,10 +24,13 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=tiled
-VERSION=${VERSION:-1.4.3}
+VERSION=${VERSION:-1.10.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -51,6 +61,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "aarch64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
@@ -71,16 +84,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" \
@@ -91,6 +94,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 {} \;
@@ -107,4 +113,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/tiled/tiled.info b/development/tiled/tiled.info
index 02ea49644f..fcbf8bdff2 100644
--- a/development/tiled/tiled.info
+++ b/development/tiled/tiled.info
@@ -1,10 +1,10 @@
PRGNAM="tiled"
-VERSION="1.4.3"
+VERSION="1.10.2"
HOMEPAGE="https://www.mapeditor.org"
-DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.4.3/tiled-1.4.3.tar.gz"
-MD5SUM="e7465ccc8fb9b5a42472f59d65eb371c"
+DOWNLOAD="https://github.com/bjorn/tiled/archive/v1.10.2/tiled-1.10.2.tar.gz"
+MD5SUM="92e4de50b817b0288d0c635b6668ecd4"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="qt5 qbs"
+REQUIRES="qbs"
MAINTAINER="Yth - Arnaud"
EMAIL="yth@ythogtha.org"
diff --git a/development/tiled/tiled_lib64.patch b/development/tiled/tiled_lib64.patch
deleted file mode 100644
index 4410d5a7f6..0000000000
--- 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, ":")\'
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-26 17:37:07 +0000