Re: qt-creator and llvm-8

[Jeremie Courreges-Anglas]

On Wed, Jul 03 2019, Jeremie Courreges-Anglas <j...@wxcvbn.org> wrote:
> Hi,
>
> qt-creator fails to build with llvm-8, the fixes looked trivial.
> Successfully compile-tested with llvm-7 and llvm-8.
>
> ok?

Updated diff.


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qt-creator/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile    4 Jul 2019 12:13:01 -0000       1.51
+++ Makefile    5 Jul 2019 16:41:59 -0000
@@ -7,7 +7,7 @@ COMMENT =               cross-platform IDE for use wi
 V =                    4.8.2
 DISTNAME =             qt-creator-opensource-src-${V}
 PKGNAME =              qt-creator-${V}
-REVISION =             2
+REVISION =             3
 
 SHARED_LIBS += Aggregation               0.0 # 0.0
 SHARED_LIBS += CPlusPlus                 2.0 # 0.0
@@ -76,8 +76,6 @@ LIB_DEPENDS = devel/llvm \
                x11/qt5/qttools
 
 PORTHOME =             ${WRKDIR}
-
-ALL_TARGET =           all
 
 NO_TEST =              Yes
 
Index: patches/patch-src_tools_clangrefactoringbackend_source_findcursorusr_h
===================================================================
RCS file: patches/patch-src_tools_clangrefactoringbackend_source_findcursorusr_h
diff -N patches/patch-src_tools_clangrefactoringbackend_source_findcursorusr_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_tools_clangrefactoringbackend_source_findcursorusr_h      
5 Jul 2019 16:41:59 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Cope with upstream API change
+https://reviews.llvm.org/D50346
+
+Index: src/tools/clangrefactoringbackend/source/findcursorusr.h
+--- src/tools/clangrefactoringbackend/source/findcursorusr.h.orig
++++ src/tools/clangrefactoringbackend/source/findcursorusr.h
+@@ -161,7 +161,7 @@ std::vector<const clang::NamedDecl *> namedDeclaration
+ 
+     auto declarations = Context.getTranslationUnitDecl()->decls();
+     for (auto &currentDeclation : declarations) {
+-        const auto &fileLocation = currentDeclation->getLocStart();
++        const auto &fileLocation = currentDeclation->getBeginLoc();
+         const auto &fileName = sourceManager.getFilename(fileLocation);
+         if (fileName == currentFile) {
+             visitor.TraverseDecl(currentDeclation);
Index: 
patches/patch-src_tools_clangrefactoringbackend_source_symbolscollector_cpp
===================================================================
RCS file: 
patches/patch-src_tools_clangrefactoringbackend_source_symbolscollector_cpp
diff -N 
patches/patch-src_tools_clangrefactoringbackend_source_symbolscollector_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_tools_clangrefactoringbackend_source_symbolscollector_cpp 
5 Jul 2019 16:41:59 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Index: src/tools/clangrefactoringbackend/source/symbolscollector.cpp
+--- src/tools/clangrefactoringbackend/source/symbolscollector.cpp.orig
++++ src/tools/clangrefactoringbackend/source/symbolscollector.cpp
+@@ -26,6 +26,7 @@
+ #include "symbolscollector.h"
+ 
+ #include <clang/Frontend/FrontendActions.h>
++#include <llvm/ADT/StringRef.h>
+ 
+ namespace ClangBackEnd {
+ 
+@@ -91,7 +92,7 @@ newFrontendActionFactory(Factory *consumerFactory,
+             {}
+ 
+             std::unique_ptr<clang::ASTConsumer>
+-                    CreateASTConsumer(clang::CompilerInstance &instance, 
StringRef inFile) override {
++                    CreateASTConsumer(clang::CompilerInstance &instance, 
llvm::StringRef inFile) override {
+                 return m_consumerFactory->newASTConsumer(instance, inFile);
+             }
+ 


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE