diff --git a/dev-qt/qt_creator/additional-files/qt_creator.rdef.in b/dev-qt/qt_creator/additional-files/qt_creator.rdef.in index e229c4eb4..3f2a6bab6 100644 --- a/dev-qt/qt_creator/additional-files/qt_creator.rdef.in +++ b/dev-qt/qt_creator/additional-files/qt_creator.rdef.in @@ -1,5 +1,5 @@ -resource app_flags B_MULTIPLE_LAUNCH; +resource app_flags B_SINGLE_LAUNCH; resource app_version { major = @MAJOR@, @@ -15,6 +15,8 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; +resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV"; + resource file_types message { "types" = "text/x-jamfile", "types" = "text/x-makefile", diff --git a/dev-qt/qt_creator/patches/qt_creator-4.12.1.patchset b/dev-qt/qt_creator/patches/qt_creator-4.13.2.patchset similarity index 76% rename from dev-qt/qt_creator/patches/qt_creator-4.12.1.patchset rename to dev-qt/qt_creator/patches/qt_creator-4.13.2.patchset index 12c892c6b..4617d1047 100644 --- a/dev-qt/qt_creator/patches/qt_creator-4.12.1.patchset +++ b/dev-qt/qt_creator/patches/qt_creator-4.13.2.patchset @@ -1,14 +1,14 @@ -From ce83762bf243fca21602024e4efac7bc22bedf33 Mon Sep 17 00:00:00 2001 +From 8f1c9d1ebc310b1a4b1f18678d0fd526759fff9b Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 15 Jul 2017 15:42:32 +0200 Subject: apply patch from 4.1.0. diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp -index 449e4ff..5ddf877 100644 +index defbf56..b8b3b81 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp -@@ -43,7 +43,7 @@ +@@ -45,7 +45,7 @@ namespace QmlDesigner { static void prioritizeDown() { @@ -18,10 +18,10 @@ index 449e4ff..5ddf877 100644 #elif defined(Q_OS_WIN) SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -index b801310..5433410 100644 +index f772fd8..186d63a 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri -@@ -20,7 +20,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc +@@ -29,7 +29,7 @@ RESOURCES += $$PWD/../qmlpuppet.qrc DISTFILES += Info.plist @@ -31,7 +31,7 @@ index b801310..5433410 100644 osx { CONFIG -= app_bundle diff --git a/src/libs/sqlite/sqlite-lib.pri b/src/libs/sqlite/sqlite-lib.pri -index 4d7f906..fdae422 100644 +index 8ded8ca..6a16c2e 100644 --- a/src/libs/sqlite/sqlite-lib.pri +++ b/src/libs/sqlite/sqlite-lib.pri @@ -6,7 +6,7 @@ shared { @@ -43,8 +43,17 @@ index 4d7f906..fdae422 100644 include(../3rdparty/sqlite/sqlite.pri) +@@ -58,7 +58,7 @@ DEFINES += SQLITE_THREADSAFE=2 SQLITE_ENABLE_FTS5 SQLITE_ENABLE_UNLOCK_NOTIFY \ + SQLITE_MAX_EXPR_DEPTH=0 SQLITE_OMIT_SHARED_CACHE SQLITE_USE_ALLOCA \ + SQLITE_ENABLE_MEMORY_MANAGEMENT SQLITE_ENABLE_NULL_TRIM SQLITE_OMIT_EXPLAIN \ + SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_UTF16 SQLITE_DQS=0 \ +- SQLITE_ENABLE_STAT4 HAVE_ISNAN HAVE_FDATASYNC HAVE_MALLOC_USABLE_SIZE \ ++ SQLITE_ENABLE_STAT4 HAVE_ISNAN HAVE_MALLOC_USABLE_SIZE \ + SQLITE_DEFAULT_MMAP_SIZE=268435456 SQLITE_CORE SQLITE_ENABLE_SESSION SQLITE_ENABLE_PREUPDATE_HOOK \ + SQLITE_LIKE_DOESNT_MATCH_BLOBS + diff --git a/src/libs/utils/process_stub_unix.c b/src/libs/utils/process_stub_unix.c -index 376473d..85bbca1 100644 +index ef5921b..9be08ad 100644 --- a/src/libs/utils/process_stub_unix.c +++ b/src/libs/utils/process_stub_unix.c @@ -1,3 +1,4 @@ @@ -63,7 +72,7 @@ index 376473d..85bbca1 100644 int errNo, hadInvalidCommand = 0; char **env = 0; struct sockaddr_un sau; -@@ -365,5 +368,6 @@ int main(int argc, char *argv[]) +@@ -366,5 +369,6 @@ int main(int argc, char *argv[]) } } assert(0); @@ -71,7 +80,7 @@ index 376473d..85bbca1 100644 return 0; } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro -index ea017e3..8a79b58 100644 +index 6590dcb..1894edf 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.pro +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro @@ -4,7 +4,7 @@ CONFIG += exceptions @@ -97,17 +106,17 @@ index b27592f..ca5fcd6 100644 # error Missing implementation of processNameByPid for this platform. #endif -- -2.26.0 +2.28.0 -From bb7dec1c7255e2a18f4f115c90e798d096458b1a Mon Sep 17 00:00:00 2001 +From a3c6ee9a1d2a91607e2bf1f36f464ae87e96f6d1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 15 Jul 2017 18:20:31 +0200 Subject: Fix rpath handling. diff --git a/qtcreator.pro b/qtcreator.pro -index b17bad6..2a6416c 100644 +index a8cb39f..b77216e 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -45,7 +45,7 @@ exists(src/shared/qbs/qbs.pro) { @@ -120,18 +129,20 @@ index b17bad6..2a6416c 100644 cache(QBS_PLUGINS_BUILD_DIR) cache(QBS_APPS_RPATH_DIR) diff --git a/src/rpath.pri b/src/rpath.pri -index ef0a6b7..6085af2 100644 +index ef0a6b7..49dfaf6 100644 --- a/src/rpath.pri +++ b/src/rpath.pri -@@ -17,3 +17,8 @@ macos { +@@ -16,4 +16,10 @@ macos { + IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' QMAKE_RPATHDIR = - } -+haiku { ++} else:haiku-* { ++ QMAKE_RPATHDIR += $ORIGIN/$$REL_PATH_TO_LIBS ++ QMAKE_RPATHDIR += $ORIGIN/$$REL_PATH_TO_PLUGINS + QMAKE_RPATHDIR += $ORIGIN + QMAKE_RPATHDIR += $ORIGIN/.. + QMAKE_RPATHDIR += $ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator -+} + } diff --git a/src/shared/qbs/src/app/app.pri b/src/shared/qbs/src/app/app.pri index d0c94a7..cc35826 100644 --- a/src/shared/qbs/src/app/app.pri @@ -145,20 +156,20 @@ index d0c94a7..cc35826 100644 macx:QMAKE_LFLAGS += -Wl,-rpath,$${QBS_APPS_RPATH_DIR} } -- -2.26.0 +2.28.0 -From b1aac81b4c023e5fc9b0b7af7bb0fd1dad8f174c Mon Sep 17 00:00:00 2001 +From 18795889273f1561440151a97332273897004347 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Mon, 25 Jun 2018 16:18:26 +0300 Subject: Enable Terminal on Haiku diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp -index f4cde33..b2cb822 100644 +index 0edcd13..f2ce8fc 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp -@@ -143,6 +143,9 @@ void ConsoleProcess::setSettings(QSettings *settings) +@@ -148,6 +148,9 @@ void ConsoleProcess::setSettings(QSettings *settings) Q_GLOBAL_STATIC_WITH_ARGS(const QVector, knownTerminals, ( { @@ -168,7 +179,7 @@ index f4cde33..b2cb822 100644 {"x-terminal-emulator", "", "-e"}, {"xdg-terminal", "", "", true}, {"xterm", "", "-e"}, -@@ -170,7 +173,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator() +@@ -175,7 +178,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator() defaultTerm = {"/usr/X11/bin/xterm", "", "-e"}; } else if (HostOsInfo::isAnyUnixHost()) { @@ -197,46 +208,20 @@ index 77daae6..4940d3e 100644 QString UnixUtils::fileBrowser(const QSettings *settings) -- -2.26.0 +2.28.0 -From 5649c629ee535cc1d27b1fb8a004f0256efe1dc4 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 9 May 2020 20:00:50 +1000 -Subject: Fix rpath - - -diff --git a/src/rpath.pri b/src/rpath.pri -index 6085af2..49dfaf6 100644 ---- a/src/rpath.pri -+++ b/src/rpath.pri -@@ -16,8 +16,9 @@ macos { - IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' - QMAKE_RPATHDIR = --} --haiku { -+} else:haiku-* { -+ QMAKE_RPATHDIR += $ORIGIN/$$REL_PATH_TO_LIBS -+ QMAKE_RPATHDIR += $ORIGIN/$$REL_PATH_TO_PLUGINS - QMAKE_RPATHDIR += $ORIGIN - QMAKE_RPATHDIR += $ORIGIN/.. - QMAKE_RPATHDIR += $ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator --- -2.26.0 - - -From e83ef098417dd815dbcad786d3933b07259f7e3a Mon Sep 17 00:00:00 2001 +From c388e265713c6658ff1339ef94aaad7d500af289 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 28 May 2020 14:42:59 +1000 Subject: Don't using Manhattan style for QMenu and QMenuBar diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp -index ea2e8db..f8990cf 100644 +index ed90cae..7c01d8a 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp -@@ -134,6 +134,9 @@ MainWindow::MainWindow() +@@ -135,6 +135,9 @@ MainWindow::MainWindow() && baseName == QLatin1String("windows")) { baseName = QLatin1String("fusion"); } @@ -246,7 +231,7 @@ index ea2e8db..f8990cf 100644 // if the user has specified as base style in the theme settings, // prefer that -@@ -146,6 +149,7 @@ MainWindow::MainWindow() +@@ -147,6 +150,7 @@ MainWindow::MainWindow() } QApplication::setStyle(new ManhattanStyle(baseName)); @@ -315,28 +300,29 @@ index d161753..3683057 100644 { QRect rect = option->rect; -- -2.26.0 +2.28.0 -From ac774cc265374a435e1b93c9089b2b84dca3a1b1 Mon Sep 17 00:00:00 2001 +From 1042165b6cb8c639c80ac651b7e9d731d827b842 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 28 May 2020 15:38:35 +1000 Subject: Don't validate Qt toolkit diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp -index 67cc6b8..3b38107 100644 +index 46ac87c..be4350b 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp -@@ -511,6 +511,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) +@@ -510,7 +510,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) + const QSet tdt = targetDeviceTypes(); + if (!tdt.isEmpty() && !tdt.contains(dt)) result << BuildSystemTask(Task::Warning, tr("Device type is not supported by Qt version.")); - - ToolChain *tc = ToolChainKitAspect::toolChain(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID); +- +#ifndef __HAIKU__ - if (tc) { + if (ToolChain *tc = ToolChainKitAspect::cxxToolChain(k)) { Abi targetAbi = tc->targetAbi(); bool fuzzyMatch = false; -@@ -542,6 +543,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) +@@ -542,6 +542,7 @@ Tasks BaseQtVersion::validateKit(const Kit *k) const QString message = tr("The kit has a Qt version, but no C++ compiler."); result << BuildSystemTask(Task::Warning, message); } @@ -345,20 +331,20 @@ index 67cc6b8..3b38107 100644 } -- -2.26.0 +2.28.0 -From 05f0223c49efdea26ef456bef6753b9a86e6de33 Mon Sep 17 00:00:00 2001 +From 307532174d86abf78d7fd79af448fe43588ddf01 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 28 May 2020 17:26:06 +1000 Subject: Make unknown host abi for Haiku diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp -index fec9f69..2892419 100644 +index 8cc8bcb..b95a8f2 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp -@@ -1015,6 +1015,10 @@ Abi Abi::hostAbi() +@@ -1127,6 +1127,10 @@ Abi Abi::hostAbi() subos = WindowsMSysFlavor; #endif format = PEFormat; @@ -370,5 +356,41 @@ index fec9f69..2892419 100644 os = LinuxOS; subos = GenericFlavor; -- -2.26.0 +2.28.0 + + +From 398a6b915224b275db90ca172a29aa536f307398 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 23 Oct 2020 09:14:22 +1000 +Subject: Use fsync + + +diff --git a/src/libs/3rdparty/sqlite/sqlite3.c b/src/libs/3rdparty/sqlite/sqlite3.c +index 55dc686..272ed4c 100644 +--- a/src/libs/3rdparty/sqlite/sqlite3.c ++++ b/src/libs/3rdparty/sqlite/sqlite3.c +@@ -36917,7 +36917,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){ + */ + if( rc ) rc = fsync(fd); + +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) || defined(__HAIKU__) + /* fdatasync() on HFS+ doesn't yet flush the file size if it changed correctly + ** so currently we default to the macro that redefines fdatasync to fsync + */ +diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp +index e96845e..9d6f471 100644 +--- a/src/libs/utils/savefile.cpp ++++ b/src/libs/utils/savefile.cpp +@@ -106,7 +106,7 @@ bool SaveFile::commit() + } + #ifdef Q_OS_WIN + FlushFileBuffers(reinterpret_cast(_get_osfhandle(handle()))); +-#elif _POSIX_SYNCHRONIZED_IO > 0 ++#elif _POSIX_SYNCHRONIZED_IO > 0 && !defined(__HAIKU__) + fdatasync(handle()); + #else + fsync(handle()); +-- +2.28.0 diff --git a/dev-qt/qt_creator/qt_creator-4.12.1.recipe b/dev-qt/qt_creator/qt_creator-4.13.2.recipe similarity index 93% rename from dev-qt/qt_creator/qt_creator-4.12.1.recipe rename to dev-qt/qt_creator/qt_creator-4.13.2.recipe index b0fa52ead..7ca087fc9 100644 --- a/dev-qt/qt_creator/qt_creator-4.12.1.recipe +++ b/dev-qt/qt_creator/qt_creator-4.13.2.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2020 The Qt Company Ltd" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://download.qt.io/official_releases/qtcreator/${portVersion%.*}/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" -CHECKSUM_SHA256="9ccee38b42854567eb7e3ea0419e635fbf9a9fe7035811fd62165e8d23436ab4" +CHECKSUM_SHA256="b00a5c13ba67d2e3436e6d9bf32fba38d780a1de0bc85b813daac672021e9428" SOURCE_DIR="qt-creator-opensource-src-$portVersion" PATCHES="qt_creator-$portVersion.patchset" ADDITIONAL_FILES="qt_creator.rdef.in" @@ -22,8 +22,8 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - cmd:qdoc$secondaryArchSuffix >= 5 - cmd:qmake$secondaryArchSuffix >= 5 + cmd:qdoc$secondaryArchSuffix + cmd:qmake$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libLLVM_9$secondaryArchSuffix lib:libQt5Concurrent$secondaryArchSuffix @@ -68,10 +68,10 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:g++$secondaryArchSuffix - cmd:lrelease$secondaryArchSuffix >= 5 + cmd:lrelease$secondaryArchSuffix cmd:make - cmd:qdoc$secondaryArchSuffix >= 5 - cmd:qmake$secondaryArchSuffix >= 5 + cmd:qdoc$secondaryArchSuffix + cmd:qmake$secondaryArchSuffix cmd:python2 cmd:which "