diff --git a/dev-qt/qt_creator/patches/qt_creator-11.0.3.patchset b/dev-qt/qt_creator/patches/qt_creator-12.0.2.patchset similarity index 81% rename from dev-qt/qt_creator/patches/qt_creator-11.0.3.patchset rename to dev-qt/qt_creator/patches/qt_creator-12.0.2.patchset index 3dc9f4aec..480d92194 100644 --- a/dev-qt/qt_creator/patches/qt_creator-11.0.3.patchset +++ b/dev-qt/qt_creator/patches/qt_creator-12.0.2.patchset @@ -1,27 +1,11 @@ -From c7c336bec585fac00600050713192297ad011f7e Mon Sep 17 00:00:00 2001 +From 0fff3d79b902adc84d86ce7a6cada6e79a7c15e5 Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Fri, 29 Sep 2023 16:03:27 +0000 -Subject: [PATCH] Port 6.0.3 changes to 11.0.03 +Subject: Port 6.0.3 changes to 11.0.03 ---- - src/libs/3rdparty/libptyqt/unixptyprocess.cpp | 13 +++++++++++-- - src/libs/3rdparty/sqlite/config.h | 5 +++++ - src/libs/3rdparty/sqlite/sqlite3.c | 2 +- - src/libs/sqlite/createtablesqlstatementbuilder.cpp | 0 - src/libs/utils/qtcassert.cpp | 2 +- - src/libs/utils/savefile.cpp | 2 +- - src/plugins/clangformat/clangformatutils.cpp | 2 +- - src/plugins/coreplugin/manhattanstyle.cpp | 8 ++++++++ - src/plugins/projectexplorer/abi.cpp | 4 ++++ - src/plugins/qmldesigner/CMakeLists.txt | 2 +- - .../qbs/src/lib/corelib/tools/processutils.cpp | 2 ++ - src/tools/process_stub/main.cpp | 6 +++--- - src/tools/qml2puppet/CMakeLists.txt | 2 +- - 13 files changed, 39 insertions(+), 11 deletions(-) - create mode 100644 src/libs/sqlite/createtablesqlstatementbuilder.cpp diff --git a/src/libs/3rdparty/libptyqt/unixptyprocess.cpp b/src/libs/3rdparty/libptyqt/unixptyprocess.cpp -index a72712c..11d8702 100644 +index e9ec1d5..04d1e21 100644 --- a/src/libs/3rdparty/libptyqt/unixptyprocess.cpp +++ b/src/libs/3rdparty/libptyqt/unixptyprocess.cpp @@ -118,7 +118,10 @@ bool UnixPtyProcess::startProcess(const QString &shellPath, @@ -59,7 +43,7 @@ index a72712c..11d8702 100644 ttmode.c_cc[VMIN] = 1; ttmode.c_cc[VTIME] = 0; -@@ -318,7 +327,7 @@ void ShellProcess::configChildProcess() +@@ -322,7 +331,7 @@ void ShellProcess::configChildProcess() ioctl(m_handleSlave, TIOCSCTTY, 0); tcsetpgrp(m_handleSlave, sid); @@ -69,10 +53,10 @@ index a72712c..11d8702 100644 struct utmpx utmpxInfo; memset(&utmpxInfo, 0, sizeof(utmpxInfo)); diff --git a/src/libs/3rdparty/sqlite/config.h b/src/libs/3rdparty/sqlite/config.h -index 3672f4c..2dcb402 100644 +index f0e73be..13d1902 100644 --- a/src/libs/3rdparty/sqlite/config.h +++ b/src/libs/3rdparty/sqlite/config.h -@@ -39,6 +39,11 @@ +@@ -35,6 +35,11 @@ #define HAVE_UTIME 1 #endif @@ -85,10 +69,10 @@ index 3672f4c..2dcb402 100644 #define HAVE_USLEEP 1 #endif diff --git a/src/libs/3rdparty/sqlite/sqlite3.c b/src/libs/3rdparty/sqlite/sqlite3.c -index dd3b5c5..c5bec17 100644 +index 1884b08..e492cf7 100644 --- a/src/libs/3rdparty/sqlite/sqlite3.c +++ b/src/libs/3rdparty/sqlite/sqlite3.c -@@ -40863,7 +40863,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){ +@@ -41330,7 +41330,7 @@ static int full_fsync(int fd, int fullSync, int dataOnly){ */ if( rc ) rc = fsync(fd); @@ -114,7 +98,7 @@ index 78baa41..bb91104 100644 int size = backtrace(bt, maxdepth); char **lines = backtrace_symbols(bt, size); diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp -index 4cf579a..0f3fb69 100644 +index a9d0cca..1737508 100644 --- a/src/libs/utils/savefile.cpp +++ b/src/libs/utils/savefile.cpp @@ -88,7 +88,7 @@ bool SaveFile::commit() @@ -127,10 +111,10 @@ index 4cf579a..0f3fb69 100644 #else fsync(handle()); diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp -index 1aae91a..458d142 100644 +index f3e5c8f..ef4b5c9 100644 --- a/src/plugins/clangformat/clangformatutils.cpp +++ b/src/plugins/clangformat/clangformatutils.cpp -@@ -121,7 +121,7 @@ clang::format::FormatStyle qtcStyle() +@@ -121,7 +121,7 @@ clang::format::FormatStyle calculateQtcStyle() #if LLVM_VERSION_MAJOR >= 12 style.IncludeStyle.IncludeCategories = {{"^save(); if (const auto mbi = qstyleoption_cast(option)) { -@@ -866,6 +871,7 @@ void ManhattanStyle::drawControl( +@@ -879,6 +884,7 @@ void ManhattanStyle::drawControl( } painter->restore(); break; @@ -180,7 +164,7 @@ index e3205da..feda199 100644 case CE_MenuBarItem: painter->save(); -@@ -1009,6 +1015,7 @@ void ManhattanStyle::drawControl( +@@ -1022,6 +1028,7 @@ void ManhattanStyle::drawControl( } break; @@ -188,7 +172,7 @@ index e3205da..feda199 100644 case CE_MenuBarEmptyArea: { if (creatorTheme()->flag(Theme::FlatMenuBar)) painter->fillRect(option->rect, StyleHelper::baseColor()); -@@ -1022,6 +1029,7 @@ void ManhattanStyle::drawControl( +@@ -1035,6 +1042,7 @@ void ManhattanStyle::drawControl( painter->restore(); } break; @@ -197,10 +181,10 @@ index e3205da..feda199 100644 case CE_ToolBar: { diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp -index 88efb96..423c11e 100644 +index d1bd01b..ab90153 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp -@@ -1117,6 +1117,10 @@ Abi Abi::hostAbi() +@@ -1138,6 +1138,10 @@ Abi Abi::hostAbi() subos = WindowsMSysFlavor; #endif format = PEFormat; @@ -212,10 +196,10 @@ index 88efb96..423c11e 100644 os = LinuxOS; subos = GenericFlavor; diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt -index 072e802..16a529a 100644 +index 3c41fff..28fb307 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt -@@ -93,7 +93,7 @@ extend_qtc_library(QmlDesignerCore +@@ -89,7 +89,7 @@ extend_qtc_library(QmlDesignerCore PUBLIC_DEFINES QDS_BUILD_QMLPARSER ) extend_qtc_library(QmlDesignerCore @@ -269,10 +253,10 @@ index 3749333..6688023 100644 inferiorProcess.setChildProcessModifier([] { // Let the parent know our pid ... diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt -index 77bde35..0d81fba 100644 +index 9244a94..781b5cc 100644 --- a/src/tools/qml2puppet/CMakeLists.txt +++ b/src/tools/qml2puppet/CMakeLists.txt -@@ -85,7 +85,7 @@ extend_qtc_executable(qml2puppet +@@ -74,7 +74,7 @@ extend_qtc_executable(qml2puppet ) extend_qtc_executable(qml2puppet @@ -282,5 +266,5 @@ index 77bde35..0d81fba 100644 ) -- -2.37.3 +2.42.1 diff --git a/dev-qt/qt_creator/qt_creator-11.0.3.recipe b/dev-qt/qt_creator/qt_creator-12.0.2.recipe similarity index 91% rename from dev-qt/qt_creator/qt_creator-11.0.3.recipe rename to dev-qt/qt_creator/qt_creator-12.0.2.recipe index 39a1afb9a..7a4f6e95b 100644 --- a/dev-qt/qt_creator/qt_creator-11.0.3.recipe +++ b/dev-qt/qt_creator/qt_creator-12.0.2.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2023 The Qt Company Ltd" LICENSE="GNU GPL v3" REVISION="2" SOURCE_URI="https://download.qt.io/official_releases/qtcreator/${portVersion%.*}/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz" -CHECKSUM_SHA256="5f501e64e836b7e3e50b98b3ebc345b201396a5fd92e49738dabb5e268d5cf1c" +CHECKSUM_SHA256="ace811ac3aee9bfbd1a55eb6cb49479a4823ead6f39f203571e9d77648450381" SOURCE_DIR="qt-creator-opensource-src-$portVersion" PATCHES="qt_creator-$portVersion.patchset" ADDITIONAL_FILES="qt_creator.rdef.in" @@ -26,7 +26,7 @@ REQUIRES=" lib:libclang_cpp$secondaryArchSuffix lib:libexecinfo$secondaryArchSuffix lib:libGL$secondaryArchSuffix - lib:libLLVM_12$secondaryArchSuffix + lib:libLLVM_17$secondaryArchSuffix lib:libQt6Concurrent$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix lib:libQt6Core5Compat$secondaryArchSuffix @@ -49,11 +49,11 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel qt6_tools${secondaryArchSuffix}_devel - devel:libclang$secondaryArchSuffix >= 12 - devel:libclang_cpp$secondaryArchSuffix >= 12 + devel:libclang$secondaryArchSuffix >= 17 + devel:libclang_cpp$secondaryArchSuffix >= 17 devel:libexecinfo$secondaryArchSuffix devel:libGL$secondaryArchSuffix - devel:libLLVM_12$secondaryArchSuffix + devel:libLLVM_17$secondaryArchSuffix devel:libQt6Concurrent$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix devel:libQt6Core5Compat$secondaryArchSuffix @@ -98,8 +98,8 @@ INSTALL() rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlDesigner.so rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlProfiler.so # Create symlink to libclang - ln -s /system/$relativeDevelopLibDir/libclang.so.12 $appsDir/QtCreator/lib/qtcreator/ - ln -s /system/$relativeDevelopLibDir/libclang.so.12 $appsDir/QtCreator/libexec/qtcreator/ + ln -s /system/$relativeDevelopLibDir/libclang.so.17 $appsDir/QtCreator/lib/qtcreator/ + ln -s /system/$relativeDevelopLibDir/libclang.so.17 $appsDir/QtCreator/libexec/qtcreator/ local APP_SIGNATURE="application/x-vnd.qt6-qtcreator" local MAJOR="`echo "$portVersion" | cut -d. -f1`"