Bump up include-what-you-use 0.17-1

2 files changed, 27 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e67c93ad7d5..b4a84d399cc1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = include-what-you-use
 	pkgdesc = A tool for use with clang to analyze #includes in C and C++ source files
-	pkgver = 0.16
-	pkgrel = 2
+	pkgver = 0.17
+	pkgrel = 1
 	url = http://include-what-you-use.org
 	install = iwyu.install
 	arch = x86_64
 	license = LLVM Release License
-	makedepends = clang>=12.0
-	makedepends = clang<13.0
+	makedepends = clang>=13.0
+	makedepends = clang<14.0
 	makedepends = cmake
-	makedepends = llvm>=12.0
-	makedepends = llvm<13.0
-	depends = clang>=12.0
-	depends = clang<13.0
+	makedepends = llvm>=13.0
+	makedepends = llvm<14.0
+	makedepends = ninja
+	depends = clang>=13.0
+	depends = clang<14.0
 	depends = python3
-	source = https://github.com/include-what-you-use/include-what-you-use/archive/0.16.tar.gz
-	sha512sums = 2923e18c40ddc5c03458b896d991adde03d489c6645ecc3cc4f69a508e323534afdef3233943e99533ffc21c64a10a8a5c635dc4797a61edf09d0a7a918a3cd5
+	source = https://github.com/include-what-you-use/include-what-you-use/archive/0.17.tar.gz
+	sha512sums = 2439e3dd37163d3953fc1e45614fb4325be093a162f25d0f45fa8126b2313942a7c8d45ed12454dfbfeb4cb4fcf2f4e3eebdc0ec5da14dad23533f7a0bf58290
 
 pkgname = include-what-you-use
-
diff --git a/PKGBUILD b/PKGBUILD
index d307ef268b41..057ae3c70e64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,43 +2,45 @@
 # Old Maintainer: Manuel Mendez <mmendez534@gmail.com>
 
 pkgname=include-what-you-use
-pkgver=0.16
-pkgrel=2
-_clang_major=12
+pkgver=0.17
+pkgrel=1
+_clang_major=13
 _clang_minor=0
 _clang_ver="${_clang_major}.${_clang_minor}"
 pkgdesc="A tool for use with clang to analyze #includes in C and C++ source files"
 url="http://include-what-you-use.org"
 license=('LLVM Release License')
 source=("https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz")
-sha512sums=('2923e18c40ddc5c03458b896d991adde03d489c6645ecc3cc4f69a508e323534afdef3233943e99533ffc21c64a10a8a5c635dc4797a61edf09d0a7a918a3cd5')
+sha512sums=('2439e3dd37163d3953fc1e45614fb4325be093a162f25d0f45fa8126b2313942a7c8d45ed12454dfbfeb4cb4fcf2f4e3eebdc0ec5da14dad23533f7a0bf58290')
 arch=('x86_64')
 _min="${_clang_ver}"
 _max=$((_clang_major + 1)).0
 depends=("clang>=${_min}" "clang<${_max}" 'python3')
-makedepends=("clang>=${_min}" "clang<${_max}" "cmake" "llvm>=${_min}" "llvm<${_max}")
+makedepends=("clang>=${_min}" "clang<${_max}" "cmake" "llvm>=${_min}" "llvm<${_max}" "ninja")
 install=iwyu.install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
 	rm -rf build && mkdir build && cd build
-	cmake -DCMAKE_PREFIX_PATH=/usr/lib -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
-	make
+	cmake -G "Ninja" ../
+  ninja
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}/build"
 
-	make install DESTDIR=${pkgdir}
+	DESTDIR="${pkgdir}" ninja install
 
 	install -Dm755 ../fix_includes.py "${pkgdir}/usr/bin/iwyu-fix-includes"
-	sed -i "s|^#!/usr/bin/python$|#!/usr/bin/python2|" "${pkgdir}/usr/bin/iwyu-fix-includes"
-	rm -f "${pkgdir}/usr/bin/fix_includes.py"
-
 	install -Dm755 ../iwyu_tool.py "${pkgdir}/usr/bin/iwyu-tool"
-	sed -i "s|^#!/usr/bin/python$|#!/usr/bin/python2|" "${pkgdir}/usr/bin/iwyu-tool"
-	rm -f "${pkgdir}/usr/bin/iwyu_tool.py"
+
+  # ninja
+	mv "${pkgdir}/usr/local/bin/include-what-you-use" "${pkgdir}/usr/bin/include-what-you-use"
+  mv "${pkgdir}/usr/local/share" "${pkgdir}/usr"
+	rm -f "${pkgdir}/usr/local/bin/fix_includes.py"
+	rm -f "${pkgdir}/usr/local/bin/iwyu_tool.py"
+  rmdir "${pkgdir}/usr/local/bin"
+  rmdir "${pkgdir}/usr/local"
 }
 
 # vim:set ts=2 sw=2 et: