haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

QtCreator: switch to llvm 9

Browse Source
This commit is contained in:
Gerasim Troeglazov
2019-09-23 22:46:14 +10:00
parent 95eb14ca23
commit 40fca05520
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dev-qt/qt_creator/patches/qt_creator-4.10.0.patchset
View File

@@ -1,4 +1,4 @@
From 226e9e654c6913ad6bd70f7a3ac3e38e3e016d5c Mon Sep 17 00:00:00 2001
From b4709157faa1a3b36731661a018bc4abbbd2a61d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Jul 2017 15:42:32 +0200
Subject: apply patch from 4.1.0.
@@ -100,7 +100,7 @@ index 04a061e..a384b3b 100644
2.23.0
From bcb42768b4da408d8ba05f0be7f545cab428453f Mon Sep 17 00:00:00 2001
From 1bbe86f642c4cc1e3c3532249a13731218fa45e1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 15 Jul 2017 18:20:31 +0200
Subject: Fix rpath handling.
@@ -163,7 +163,7 @@ index d0c94a7..cc35826 100644
2.23.0
From e508814ef963dcac9baa31049212e0c8ed636777 Mon Sep 17 00:00:00 2001
From 8715ab2fb9c4061190e0bb15f3819c17ce7c97a3 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 25 Jun 2018 16:18:26 +0300
Subject: Enable Terminal on Haiku
@@ -214,3 +214,26 @@ index 77daae6..4940d3e 100644
--
2.23.0
From 200afca60589b6b0f6ae8a29f02596376185c41f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 23 Sep 2019 22:43:58 +1000
Subject: Fix for llvm 9
diff --git a/src/plugins/clangformat/clangformatutils.cpp b/src/plugins/clangformat/clangformatutils.cpp
index 59c2b59..2ff79b4 100644
--- a/src/plugins/clangformat/clangformatutils.cpp
+++ b/src/plugins/clangformat/clangformatutils.cpp
@@ -60,7 +60,7 @@ static clang::format::FormatStyle qtcStyle()
style.AllowShortBlocksOnASingleLine = false;
style.AllowShortCaseLabelsOnASingleLine = false;
style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
- style.AllowShortIfStatementsOnASingleLine = false;
+ style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_Never;
style.AllowShortLoopsOnASingleLine = false;
style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
style.AlwaysBreakBeforeMultilineStrings = false;
--
2.23.0

10
dev-qt/qt_creator/qt_creator-4.10.0.recipe
View File

@@ -6,7 +6,7 @@ such as Android and iOS."
HOMEPAGE="https://www.qt.io/ide/"
COPYRIGHT="2019 The Qt Company Ltd"
LICENSE="GNU GPL v3"
REVISION="1"
REVISION="2"
SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.10/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
CHECKSUM_SHA256="8f5d3abc522d8b8879adfa098e037f751b4311173f5f443fd1b5800f5feb0f8a"
SOURCE_DIR="qt-creator-opensource-src-$portVersion"
@@ -25,7 +25,7 @@ REQUIRES="
cmd:qdoc$secondaryArchSuffix >= 5
cmd:qmake$secondaryArchSuffix >= 5
lib:libGL$secondaryArchSuffix
lib:libLLVM_8$secondaryArchSuffix
lib:libLLVM_9$secondaryArchSuffix
lib:libQt5Concurrent$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Designer$secondaryArchSuffix
@@ -46,9 +46,9 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libclang$secondaryArchSuffix >= 8
devel:libclang$secondaryArchSuffix >= 9
devel:libGL$secondaryArchSuffix
devel:libLLVM_8$secondaryArchSuffix
devel:libLLVM_9$secondaryArchSuffix
devel:libQt5Concurrent$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Designer$secondaryArchSuffix
@@ -89,7 +89,7 @@ INSTALL()
# Qt port doesn't support createPlatformOpenGLContext yet
rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlDesigner.so
rm -rf $appsDir/QtCreator/lib/qtcreator/plugins/libQmlProfiler.so
# Create symlink to libclang 5.0 from Qt's build
# Create symlink to libclang from Qt's build
ln -s /system/apps/Qt5/lib/libclang* $appsDir/QtCreator/lib/qtcreator/
local APP_SIGNATURE="application/x-vnd.qt5-qtcreator"