aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsykose <alice@ayaya.dev>2023-03-18 15:44:27 +0000
committerpsykose <alice@ayaya.dev>2023-03-18 16:44:27 +0100
commit9d9306518c1c91b1dfd28c1446e0ee5bfd8fc28e (patch)
tree1e7dc60a065c03b0b2155fe92f7bdf6dd0f7cd90
parent58c5c2af57c941efa5fbbce762c4922e59e83188 (diff)
community/kdevelop: rebuild against clang16
-rw-r--r--community/kdevelop/APKBUILD15
-rw-r--r--community/kdevelop/fix-find-clang-path.patch35
2 files changed, 33 insertions, 17 deletions
diff --git a/community/kdevelop/APKBUILD b/community/kdevelop/APKBUILD
index a6acd34b4f8..e0e77ca7ebb 100644
--- a/community/kdevelop/APKBUILD
+++ b/community/kdevelop/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kdevelop
pkgver=22.12.3
-pkgrel=0
+pkgrel=1
# armhf blocked by extra-cmake-modules
# ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
arch="all !armhf !ppc64le !s390x !riscv64"
@@ -12,9 +12,8 @@ license="GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.2-only"
depends="indent"
makedepends="
boost-dev
- clang>=12
- clang-dev>=12
- clang-libs>=12
+ clang
+ clang-dev
extra-cmake-modules
grantlee-dev
karchive-dev
@@ -39,15 +38,13 @@ makedepends="
kxmlgui-dev
libkomparediff2-dev
libksysguard-dev
+ llvm-dev
qt5-qtbase-dev
qt5-qtwebengine-dev
+ samurai
shared-mime-info
threadweaver-dev
"
-makedepends="$makedepends
- llvm-dev>=12
- samurai
- " # Should always install the version of llvm that contains /usr/bin/llvm-config
checkdepends="xvfb-run"
source="https://download.kde.org/stable/release-service/$pkgver/src/kdevelop-$pkgver.tar.xz
fix-find-clang-path.patch
@@ -69,5 +66,5 @@ package() {
sha512sums="
465bf3639e3fd61058af1217904fe0904d7c380e1f073dcb3af28d5758bba1d477e2f1313c61c233cf2acef4362c5380b30bcae6a02eb704a8a3fdf80ddfd75a kdevelop-22.12.3.tar.xz
-6700fcf1da4243aa9950c8c81e47f916d3d04cd11a73fbf14bbe77209fd19000078f49c266d0b58158d7f85cdd89c0316d86284bf665470a5cfb2c8318bdf56d fix-find-clang-path.patch
+47b271ed48c82c489d62314e30438667baddef2a05bb0c85062fa1e2fdc8681895c4d561f2d2c250da2ed9275a2ef73fad82b3d164f58ed8272cc9ec5190cef2 fix-find-clang-path.patch
"
diff --git a/community/kdevelop/fix-find-clang-path.patch b/community/kdevelop/fix-find-clang-path.patch
index 5f64b648c70..7ff58909774 100644
--- a/community/kdevelop/fix-find-clang-path.patch
+++ b/community/kdevelop/fix-find-clang-path.patch
@@ -1,16 +1,35 @@
diff --git a/cmake/modules/FindClang.cmake b/cmake/modules/FindClang.cmake
-index 34a8c38198..9ebb9c4a58 100644
+index 89f4c9f..117c9be 100644
--- a/cmake/modules/FindClang.cmake
+++ b/cmake/modules/FindClang.cmake
-@@ -106,9 +106,9 @@ if(CLANG_FOUND)
+@@ -102,7 +102,7 @@ if(CLANG_FOUND)
+ NAMES "cpuid.h"
PATHS "${CLANG_LIBRARY_DIRS}"
"${CLANG_INCLUDE_DIRS}"
- PATH_SUFFIXES "clang/${CLANG_VERSION}/include"
-- "../../../clang/${CLANG_VERSION}/include"
-+ "../../clang/${CLANG_VERSION}/include"
+- PATH_SUFFIXES "clang/${CLANG_VERSION}/include"
++ PATH_SUFFIXES "clang/16/include"
+ "../../../clang/${CLANG_VERSION}/include"
"clang/${CLANG_VERSION_CLEAN}/include"
-- "../../../clang/${CLANG_VERSION_CLEAN}/include"
-+ "../../clang/${CLANG_VERSION_CLEAN}/include"
- NO_DEFAULT_PATH
+ "../../../clang/${CLANG_VERSION_CLEAN}/include"
+@@ -116,7 +116,7 @@ if(CLANG_FOUND)
+
+ # check whether llvm-config comes from an install prefix
+ execute_process(
+- COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
++ COMMAND ${LLVM_CONFIG_EXECUTABLE} --obj-root
+ OUTPUT_VARIABLE _llvmSourceRoot
+ OUTPUT_STRIP_TRAILING_WHITESPACE
)
+diff --git a/cmake/modules/FindLLVM.cmake b/cmake/modules/FindLLVM.cmake
+index 5569123..85e4c98 100644
+--- a/cmake/modules/FindLLVM.cmake
++++ b/cmake/modules/FindLLVM.cmake
+@@ -129,7 +129,7 @@ if (LLVM_FOUND)
+ # potentially add include dir from binary dir for non-installed LLVM
+ execute_process(
+- COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
++ COMMAND ${LLVM_CONFIG_EXECUTABLE} --obj-root
+ OUTPUT_VARIABLE _llvmSourceRoot
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )