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

qt_creator: enable clangbackend.

Browse Source 
depends on clang6.
This commit is contained in:
Jerome Duval
2018-10-08 21:39:11 +02:00
parent 99dd5e14e1
commit 6f1f182c60
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
dev-qt/qt_creator/patches/qt_creator-4.6.2.patchset
View File

@@ -1,4 +1,4 @@
From 1272e7247817315ab22bea85d4bac628f0b0d41a Mon Sep 17 00:00:00 2001
From f55dc3e97a105194be5af13aab08a9fadee66c6d 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.
@@ -97,10 +97,10 @@ index 58a082f..808a15e 100644
# error Missing implementation of processNameByPid for this platform.
#endif
--
2.16.4
2.19.0
From 16905d1053943afd63d88b3c855b0f7b48397486 Mon Sep 17 00:00:00 2001
From 8eb289497fff68e522e3b8778e208820f271f4ca 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.
@@ -160,10 +160,10 @@ index 49bbd90..48730b8 100644
macx:QMAKE_LFLAGS += -Wl,-rpath,$${QBS_APPS_RPATH_DIR}
}
--
2.16.4
2.19.0
From 8dea17be7402f638ba1e7c7d40dd0f9cc342e091 Mon Sep 17 00:00:00 2001
From 51a8eb5a3313be6c68f1a59196e5a7a267894077 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
@@ -212,5 +212,28 @@ index 7db05c2..0814fed 100644
QString UnixUtils::fileBrowser(const QSettings *settings)
--
2.16.4
2.19.0
From 58c23b74dbe8854767466c78cb5611e5379bb581 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 8 Oct 2018 21:33:21 +0200
Subject: force QTC_FORCE_CLANG_LIBTOOLING with llvm 6.0
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
index 63ad0ad..10835c9 100644
--- a/src/shared/clang/clang_installation.pri
+++ b/src/shared/clang/clang_installation.pri
@@ -141,7 +141,7 @@ isEmpty(LLVM_VERSION) {
QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING)
isEmpty(QTC_NO_CLANG_LIBTOOLING) {
QTC_FORCE_CLANG_LIBTOOLING = $$(QTC_FORCE_CLANG_LIBTOOLING)
- versionIsEqual($$LLVM_VERSION, 5, 0)|!isEmpty(QTC_FORCE_CLANG_LIBTOOLING) {
+ versionIsEqual($$LLVM_VERSION, 6, 0)|isEmpty(QTC_FORCE_CLANG_LIBTOOLING) {
!contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}
LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH =
--
2.19.0

5
dev-qt/qt_creator/qt_creator-4.6.2.recipe
View File

@@ -6,7 +6,7 @@ such as Android and iOS."
HOMEPAGE="https://www.qt.io/ide/"
COPYRIGHT="2018 The Qt Company Ltd"
LICENSE="GNU GPL v3"
REVISION="1"
REVISION="2"
SOURCE_URI="https://download.qt.io/official_releases/qtcreator/4.6/$portVersion/qt-creator-opensource-src-$portVersion.tar.xz"
CHECKSUM_SHA256="bbaf667f51051c602df02e04c1d7369bef9553326d8377bc36a019ae718843cc"
SOURCE_DIR="qt-creator-opensource-src-$portVersion"
@@ -22,6 +22,7 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libclang$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libQt5Concurrent$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
@@ -43,6 +44,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libclang$secondaryArchSuffix >= 6
devel:libGL$secondaryArchSuffix
devel:libQt5Concurrent$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
@@ -63,6 +65,7 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
cmd:g++$secondaryArchSuffix
cmd:llvm_config >= 6
cmd:make
cmd:qmake$secondaryArchSuffix >= 5
"