diff --git a/dev-qt/qt_creator/patches/qt_creator-4.7.1.patchset b/dev-qt/qt_creator/patches/qt_creator-4.8.0.patchset similarity index 88% rename from dev-qt/qt_creator/patches/qt_creator-4.7.1.patchset rename to dev-qt/qt_creator/patches/qt_creator-4.8.0.patchset index e371e7669..09c2ea3ce 100644 --- a/dev-qt/qt_creator/patches/qt_creator-4.7.1.patchset +++ b/dev-qt/qt_creator/patches/qt_creator-4.8.0.patchset @@ -1,4 +1,4 @@ -From 5eabc92a95d831de7058735890742c99e6883455 Mon Sep 17 00:00:00 2001 +From 226e9e654c6913ad6bd70f7a3ac3e38e3e016d5c 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. @@ -100,14 +100,14 @@ index 58a082f..808a15e 100644 2.19.0 -From 20899fefeaf6c4351cae86f04908c3605af9efed Mon Sep 17 00:00:00 2001 +From bcb42768b4da408d8ba05f0be7f545cab428453f 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 c432455..0136929 100644 +index 2147403..c868f0e 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -45,7 +45,7 @@ exists(src/shared/qbs/qbs.pro) { @@ -163,38 +163,38 @@ index d0c94a7..cc35826 100644 2.19.0 -From c1801babe0ba7c01b57315ed4230b3fc8f0ef0a9 Mon Sep 17 00:00:00 2001 +From e508814ef963dcac9baa31049212e0c8ed636777 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_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp -index 223f8eb..2a48ebd 100644 +index 92b6995..510b852 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp -@@ -345,6 +345,9 @@ struct Terminal { +@@ -333,6 +333,9 @@ void ConsoleProcess::stubExited() - static const Terminal knownTerminals[] = + Q_GLOBAL_STATIC_WITH_ARGS(const QVector, knownTerminals, ( { +#ifdef Q_OS_HAIKU -+ {"Terminal", ""}, ++ {"Terminal", "", ""}, +#endif - {"x-terminal-emulator", "-e"}, - {"xterm", "-e"}, - {"aterm", "-e"}, -@@ -374,7 +377,11 @@ QString ConsoleProcess::defaultTerminalEmulator() - return result; - } - } + {"x-terminal-emulator", "", "-e"}, + {"xterm", "", "-e"}, + {"aterm", "", "-e"}, +@@ -362,7 +365,11 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator() + if (!result.isEmpty()) + return {result, term.openArgs, term.executeArgs}; + } +#ifdef Q_OS_HAIKU -+ return QLatin1String("/system/apps/Terminal"); ++ return {"/system/apps/Terminal", "", ""}; +#else - return QLatin1String("xterm -e"); + return {"xterm", "", "-e"}; +#endif - } - - QStringList ConsoleProcess::availableTerminalEmulators() + }(); + } + return defaultTerm; diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp index 7db05c2..0814fed 100644 --- a/src/libs/utils/unixutils.cpp diff --git a/dev-qt/qt_creator/qt_creator-4.7.1.recipe b/dev-qt/qt_creator/qt_creator-4.8.0.recipe similarity index 94% rename from dev-qt/qt_creator/qt_creator-4.7.1.recipe rename to dev-qt/qt_creator/qt_creator-4.8.0.recipe index e771c3306..ed521f5af 100644 --- a/dev-qt/qt_creator/qt_creator-4.7.1.recipe +++ b/dev-qt/qt_creator/qt_creator-4.8.0.recipe @@ -7,8 +7,8 @@ HOMEPAGE="https://www.qt.io/ide/" COPYRIGHT="2018 The Qt Company Ltd" LICENSE="GNU GPL v3" REVISION="1" -SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.7/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" -CHECKSUM_SHA256="c98254336953f637015f14b8b4ddb5e274454a5416fd20dd09747a6e50762565" +SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.8/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" +CHECKSUM_SHA256="aec7b4595e17f5536eb2eef4331057f2d0fa4ba0a46f4968cc06959a1d589b43" SOURCE_DIR="qt-creator-opensource-src-$portVersion" PATCHES="qt_creator-$portVersion.patchset" ADDITIONAL_FILES="qt_creator.rdef.in" @@ -44,7 +44,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libclang$secondaryArchSuffix >= 6 + devel:libclang$secondaryArchSuffix >= 7 devel:libGL$secondaryArchSuffix devel:libQt5Concurrent$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix @@ -65,10 +65,11 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:g++$secondaryArchSuffix - cmd:llvm_config >= 6 + cmd:llvm_config >= 7 cmd:make cmd:qmake$secondaryArchSuffix >= 5 cmd:python2 + cmd:which " BUILD()