aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Demelier <markand@malikania.fr>2021-05-07 10:43:10 +0200
committerMichał Polański <michal@polanski.me>2021-05-09 21:54:22 +0200
commit7a2d6f8822e4d1ab83bea6c7aad6e374aee60529 (patch)
tree3a570ff4d74769185631a827221d9e43893de6a2
parentd7a18a88c5ea8fddd35582f6e46d8109086a9c4b (diff)
downloadaports-7a2d6f8822e4d1ab83bea6c7aad6e374aee60529.tar.gz
aports-7a2d6f8822e4d1ab83bea6c7aad6e374aee60529.tar.bz2
aports-7a2d6f8822e4d1ab83bea6c7aad6e374aee60529.tar.xz
testing/tiled: upgrade to 1.6.0
-rw-r--r--testing/tiled/APKBUILD13
-rw-r--r--testing/tiled/patch-main.cpp.patch47
2 files changed, 56 insertions, 4 deletions
diff --git a/testing/tiled/APKBUILD b/testing/tiled/APKBUILD
index 004a522419..45fe7c8007 100644
--- a/testing/tiled/APKBUILD
+++ b/testing/tiled/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: David Demelier <markand@malikania.fr>
# Maintainer: David Demelier <markand@malikania.fr>
pkgname=tiled
-pkgver=1.4.3
+pkgver=1.6.0
pkgrel=0
pkgdesc="powerful tile map editor"
url="http://mapeditor.org"
@@ -9,8 +9,10 @@ arch="all"
license="Apache-2.0 AND BSD-2-Clause AND GPL-2.0-only"
makedepends="qt5-qttools-dev qt5-qtdeclarative-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/bjorn/tiled/archive/v$pkgver.tar.gz"
-options="!check"
+source="$pkgname-$pkgver.tar.gz::https://github.com/bjorn/tiled/archive/v$pkgver.tar.gz
+ patch-main.cpp.patch
+ "
+options="!check" # No tests in qmake build
build() {
qmake-qt5 -r INSTALL_HEADERS=yes PREFIX=/usr
@@ -21,4 +23,7 @@ package() {
make install INSTALL_ROOT="$pkgdir"
}
-sha512sums="1e75e323733e05563bf542364778d95f2f22484ec0d85b4a9e7fac782c117934b37b049724979be5c83de86a3900c7ca2e9f3c5a660c530d2ecd0f023eb22c2e tiled-1.4.3.tar.gz"
+sha512sums="
+73c8fbd8af6c47632317fe33207cc01fcd5cab357372f6322406d6315c1d8d66363aa0849b72a78c2b2fe952ee70e6c98efc5ab8f99ea98bf1c319d346594eae tiled-1.6.0.tar.gz
+232dd1a38e29b34a010978f22b4d3ef0e1344f6a963a50c99cc7dce24a5d2ec9c1f77ff0c08a9528455211a465f7d95c983736c19e5aa2e14b64ee1c094b1fe7 patch-main.cpp.patch
+"
diff --git a/testing/tiled/patch-main.cpp.patch b/testing/tiled/patch-main.cpp.patch
new file mode 100644
index 0000000000..b54d3b5ecc
--- /dev/null
+++ b/testing/tiled/patch-main.cpp.patch
@@ -0,0 +1,47 @@
+Upstream: already in repository.
+--- tiled-1.6.0/src/tiled/main.cpp.orig
++++ tiled-1.6.0/src/tiled/main.cpp
+@@ -66,10 +66,6 @@
+ return ts;
+ }
+
+-#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+-using Qt::endl;
+-#endif
+-
+ namespace {
+
+ class CommandLineHandler : public CommandLineParser
+@@ -260,7 +256,7 @@
+ if (!showedVersion) {
+ showedVersion = true;
+ stdOut() << QApplication::applicationDisplayName() << " "
+- << QApplication::applicationVersion() << endl;
++ << QApplication::applicationVersion() << Qt::endl;
+ quit = true;
+ }
+ }
+@@ -317,9 +313,9 @@
+ }
+ formats.sort(Qt::CaseSensitive);
+
+- stdOut() << tr("Map export formats:") << endl;
++ stdOut() << tr("Map export formats:") << Qt::endl;
+ for (const QString &name : formats)
+- stdOut() << " " << name << endl;
++ stdOut() << " " << name << Qt::endl;
+
+ formats.clear();
+ const auto tilesetFormats = PluginManager::objects<TilesetFormat>();
+@@ -329,9 +325,9 @@
+ }
+ formats.sort(Qt::CaseSensitive);
+
+- stdOut() << tr("Tileset export formats:") << endl;
++ stdOut() << tr("Tileset export formats:") << Qt::endl;
+ for (const QString &name : formats)
+- stdOut() << " " << name << endl;
++ stdOut() << " " << name << Qt::endl;
+
+ quit = true;
+ }