graphics/tiled: update to 1.7.0
This commit is contained in:
parent
f1a94dd860
commit
5fb024ea61
@ -1,5 +1,5 @@
|
||||
PORTNAME= tiled
|
||||
PORTVERSION= 1.6.0
|
||||
PORTVERSION= 1.7.0
|
||||
DISTVERSIONPREFIX= v
|
||||
CATEGORIES= graphics editors games
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1619258429
|
||||
SHA256 (bjorn-tiled-v1.6.0_GH0.tar.gz) = c8bc2cd8f48c9085ac391cf17e351eccae9bed95b0a726f62d3a77f1fddba6ae
|
||||
SIZE (bjorn-tiled-v1.6.0_GH0.tar.gz) = 16730026
|
||||
TIMESTAMP = 1623151954
|
||||
SHA256 (bjorn-tiled-v1.7.0_GH0.tar.gz) = 836492b127cc3cda62d4ac0cdc3b6ade8dd814d4a4d8b44871ab07acef87a260
|
||||
SIZE (bjorn-tiled-v1.7.0_GH0.tar.gz) = 16742927
|
||||
|
@ -1,46 +0,0 @@
|
||||
--- src/tiled/main.cpp.orig 2021-04-23 13:13:21 UTC
|
||||
+++ src/tiled/main.cpp
|
||||
@@ -66,10 +66,6 @@ static QTextStream& stdOut()
|
||||
return ts;
|
||||
}
|
||||
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
|
||||
-using Qt::endl;
|
||||
-#endif
|
||||
-
|
||||
namespace {
|
||||
|
||||
class CommandLineHandler : public CommandLineParser
|
||||
@@ -260,7 +256,7 @@ void CommandLineHandler::showVersion()
|
||||
if (!showedVersion) {
|
||||
showedVersion = true;
|
||||
stdOut() << QApplication::applicationDisplayName() << " "
|
||||
- << QApplication::applicationVersion() << endl;
|
||||
+ << QApplication::applicationVersion() << Qt::endl;
|
||||
quit = true;
|
||||
}
|
||||
}
|
||||
@@ -317,9 +313,9 @@ void CommandLineHandler::showExportFormats()
|
||||
}
|
||||
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 @@ void CommandLineHandler::showExportFormats()
|
||||
}
|
||||
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;
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
--- src/tiled/tiled.pro.orig 2021-04-23 13:13:21 UTC
|
||||
+++ src/tiled/tiled.pro
|
||||
@@ -19,7 +19,7 @@ contains(QT_CONFIG, opengl):minQtVersion(6, 0, 0) {
|
||||
QT += openglwidgets
|
||||
}
|
||||
|
||||
-contains(QT_CONFIG, dbus) {
|
||||
+!contains(DISABLE_DBUS, yes):contains(QT_CONFIG, dbus) {
|
||||
QT += dbus
|
||||
DEFINES += TILED_ENABLE_DBUS
|
||||
}
|
Loading…
Reference in New Issue
Block a user