diff --git a/488.patch b/488.patch new file mode 100644 index 0000000000000000000000000000000000000000..b6ed391c62e936a869ffeb97b7321095e657961c --- /dev/null +++ b/488.patch @@ -0,0 +1,27 @@ +From a064d4cfe5f56c75d9b0fb87982aa5d7d245ef25 Mon Sep 17 00:00:00 2001 +From: Alessandro Astone +Date: Sat, 16 Sep 2023 12:46:04 +0200 +Subject: [PATCH] Add another path to look for Clang builtin dir + +PATHS may include paths ending in "lib64/" while the includes may +be in "lib/". +This is the case in Fedora since LLVM17 +--- + plugins/clang/Locate_CLANG_BUILTIN_DIR.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/clang/Locate_CLANG_BUILTIN_DIR.cmake b/plugins/clang/Locate_CLANG_BUILTIN_DIR.cmake +index 0d9cd59e48..427fd5f2c4 100644 +--- a/plugins/clang/Locate_CLANG_BUILTIN_DIR.cmake ++++ b/plugins/clang/Locate_CLANG_BUILTIN_DIR.cmake +@@ -20,6 +20,7 @@ find_path(CLANG_BUILTIN_DIR + PATHS "${LLVM_LIBRARY_DIRS}" + "${CLANG_INCLUDE_DIRS}" + PATH_SUFFIXES "clang/${CLANG_VERSION_SUBDIR}/include" ++ "../lib/clang/${CLANG_VERSION_SUBDIR}/include" + "../../../clang/${CLANG_VERSION_SUBDIR}/include" + NO_DEFAULT_PATH + ) +-- +GitLab + diff --git a/kdevelop-23.08.4.tar.xz b/kdevelop-23.08.5.tar.xz similarity index 52% rename from kdevelop-23.08.4.tar.xz rename to kdevelop-23.08.5.tar.xz index 1087ad26e7de9646c503dab042491fa9447c9930..ca02b1118c319c0bafce0d3642c18cd54c4b4ca8 100644 Binary files a/kdevelop-23.08.4.tar.xz and b/kdevelop-23.08.5.tar.xz differ diff --git a/kdevelop.spec b/kdevelop.spec index 4d0b9d078e3f853ad408bd8e7fba4099776d946c..dfb40217235bf5f484caaf9926091512cbef8858 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -2,7 +2,7 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 23.08.4 +Version: 23.08.5 Release: 1 License: GPLv2 URL: http://www.kdevelop.org/ @@ -15,6 +15,8 @@ Patch0: kdevelop-5.2.3-qmake.patch # upstreamable patches # upstream patches +# https://invent.kde.org/kdevelop/kdevelop/-/merge_requests/488 +Patch1: 488.patch BuildRequires: gcc-c++ gcc BuildRequires: boost-devel @@ -31,6 +33,7 @@ BuildRequires: libksysguard-devel BuildRequires: grantlee-qt5-devel %{?grantlee5_requires} +BuildRequires: astyle-devel BuildRequires: libkomparediff2-devel BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -143,8 +146,7 @@ Obsoletes: kdevplatform-libs < 5.1.80-1 %prep -%setup -q -n kdevelop-%{version} -%patch0 -p1 -b .qmake +%autosetup -p1 %build mkdir build @@ -232,6 +234,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdevelop.desk %{rpm_macros_dir}/macros.kdevelop %changelog +* Mon Mar 18 2024 peijiankang - 9:23.08.5-1 +- update verison to 23.08.5 + * Mon Jan 08 2024 zhangxianting - 9:23.08.4-1 - Upgrade to 23.08.4