From 7e71231bb784b62558a5d3bf3819538f9b4fe3f6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 May 2020 11:45:44 +0200
Subject: [PATCH] include-what-you-use: update to 0.14.

---
 .../include-what-you-use/patches/llvm10.patch | 61 -------------------
 srcpkgs/include-what-you-use/template         |  8 +--
 2 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100644 srcpkgs/include-what-you-use/patches/llvm10.patch

diff --git a/srcpkgs/include-what-you-use/patches/llvm10.patch b/srcpkgs/include-what-you-use/patches/llvm10.patch
deleted file mode 100644
index c6e0a5c1b39..00000000000
--- a/srcpkgs/include-what-you-use/patches/llvm10.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- iwyu_driver.cc
-+++ iwyu_driver.cc
-@@ -205,11 +205,8 @@ CompilerInstance* CreateCompilerInstance(int argc, const char **argv) {
- 
-   // Initialize a compiler invocation object from the clang (-cc1) arguments.
-   const ArgStringList &cc_arguments = command.getArguments();
--  const char** args_start = const_cast<const char**>(cc_arguments.data());
--  const char** args_end = args_start + cc_arguments.size();
-   std::shared_ptr<CompilerInvocation> invocation(new CompilerInvocation);
--  CompilerInvocation::CreateFromArgs(*invocation,
--                                     args_start, args_end, diagnostics);
-+  CompilerInvocation::CreateFromArgs(*invocation, cc_arguments, diagnostics);
-   invocation->getFrontendOpts().DisableFree = false;
- 
-   // Use libc++ headers bundled with Xcode.app on macOS.
---- iwyu_preprocessor.cc
-+++ iwyu_preprocessor.cc
-@@ -34,6 +34,7 @@
- #include "clang/Lex/MacroInfo.h"
- 
- using clang::FileEntry;
-+using clang::FileEntryRef;
- using clang::FileID;
- using clang::MacroDefinition;
- using clang::MacroDirective;
-@@ -694,7 +695,7 @@ void IwyuPreprocessorInfo::FileChanged(SourceLocation loc,
- // Called when we see an #include, but decide we don't need to
- // actually read it because it's already been #included (and is
- // protected by a header guard).
--void IwyuPreprocessorInfo::FileSkipped(const FileEntry& file,
-+void IwyuPreprocessorInfo::FileSkipped(const FileEntryRef& file,
-                                        const Token &filename,
-                                        SrcMgr::CharacteristicKind file_type) {
-   CHECK_(include_filename_loc_.isValid() &&
-@@ -705,11 +706,11 @@ void IwyuPreprocessorInfo::FileSkipped(const FileEntry& file,
-       GetInstantiationLoc(filename.getLocation());
-   ERRSYM(GetFileEntry(include_loc))
-       << "[ (#include)  ] " << include_name_as_written
--      << " (" << GetFilePath(&file) << ")\n";
-+      << " (" << GetFilePath(&file.getFileEntry()) << ")\n";
- 
--  AddDirectInclude(include_loc, &file, include_name_as_written);
--  if (ShouldReportIWYUViolationsFor(&file)) {
--    files_to_report_iwyu_violations_for_.insert(&file);
-+  AddDirectInclude(include_loc, &file.getFileEntry(), include_name_as_written);
-+  if (ShouldReportIWYUViolationsFor(&file.getFileEntry())) {
-+    files_to_report_iwyu_violations_for_.insert(&file.getFileEntry());
-   }
- }
- 
---- iwyu_preprocessor.h
-+++ iwyu_preprocessor.h
-@@ -204,7 +204,7 @@ class IwyuPreprocessorInfo : public clang::PPCallbacks,
-   void FileChanged(clang::SourceLocation loc, FileChangeReason reason,
-                    clang::SrcMgr::CharacteristicKind file_type,
-                    clang::FileID exiting_from_id) override;
--  void FileSkipped(const clang::FileEntry& file, const clang::Token &filename,
-+  void FileSkipped(const clang::FileEntryRef& file, const clang::Token &filename,
-                    clang::SrcMgr::CharacteristicKind file_type) override;
-   // FileChanged is actually a multi-plexer for 4 different callbacks.
-   void FileChanged_EnterFile(clang::SourceLocation file_beginning);
diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 18ad1b8896d..22c9d09d091 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -1,7 +1,7 @@
 # Template file for 'include-what-you-use'
 pkgname=include-what-you-use
-version=0.13
-revision=2
+version=0.14
+revision=1
 wrksrc="${pkgname}"
 build_style=cmake
 configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
@@ -12,8 +12,8 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="NCSA"
 homepage="https://include-what-you-use.org/"
 distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
-checksum=49294270aa64e8c04182369212cd919f3b3e0e47601b1f935f038c761c265bc9
-python_version=2 #unverified
+checksum=43184397db57660c32e3298a6b1fd5ab82e808a1f5ab0591d6745f8d256200ef
+python_version=3
 
 post_install() {
 	vlicense LICENSE.TXT