[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/

[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/

[Johannes Huber]

commit:     d47c41e397bb16b56b303c66cd9ce21d6c86cbda
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 10:18:38 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 10:18:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d47c41e3

dev-util/kdevelop: Update ninja patch

Package-Manager: portage-2.2.20.1

 dev-util/kdevelop/files/kdevelop-ninja-optional.patch | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-util/kdevelop/files/kdevelop-ninja-optional.patch b/dev-util/kdevelop/files/kdevelop-ninja-optional.patch
index a84279b..a60da91 100644
--- a/dev-util/kdevelop/files/kdevelop-ninja-optional.patch
+++ b/dev-util/kdevelop/files/kdevelop-ninja-optional.patch
@@ -1,9 +1,11 @@
---- a/projectbuilders/CMakeLists.txt	2015-02-02 15:19:46.000000000 +0100
-+++ b/projectbuilders/CMakeLists.txt	2015-07-06 22:51:22.083293634 +0200
+diff --git a/projectbuilders/CMakeLists.txt b/projectbuilders/CMakeLists.txt
+index 80d7866..825ca8b 100644
+--- a/projectbuilders/CMakeLists.txt
++++ b/projectbuilders/CMakeLists.txt
 @@ -1,5 +1,5 @@
- 
  add_subdirectory(makebuilder)
 -add_subdirectory(ninjabuilder)
 +ecm_optional_add_subdirectory(ninjabuilder)
  ecm_optional_add_subdirectory(cmakebuilder)
- 
+ if (KDevelop-PG-Qt_FOUND)
+     ecm_optional_add_subdirectory(qmakebuilder)

[gentoo-commits] proj/kde:master commit in: dev-util/kdevelop/files/

[Sam James]

commit:     2baa6d7fd846f14129d04312728744013acea492
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 23:22:59 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 23:23:09 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2baa6d7f

dev-util/kdevelop: add missing patch

Bug: https://bugs.gentoo.org/902101
Fixes: 856936687150763b48e5d59e94d2f02761ceb593
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../kdevelop/files/kdevelop-22.12.3-clang16.patch  | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch
new file mode 100644
index 0000000000..38676cc164
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-22.12.3-clang16.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/902101
+--- a/cmake/modules/FindClang.cmake
++++ b/cmake/modules/FindClang.cmake
+@@ -97,6 +97,8 @@
+   # dito for git
+   string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}")
+ 
++  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}")
++  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}")
+   find_path(CLANG_BUILTIN_DIR
+             # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator
+             NAMES "cpuid.h"
+@@ -106,6 +108,10 @@
+                           "../../../clang/${CLANG_VERSION}/include"
+                           "clang/${CLANG_VERSION_CLEAN}/include"
+                           "../../../clang/${CLANG_VERSION_CLEAN}/include"
++                          "clang/${CLANG_VERSION_STRIPPED}/include"
++                          "../../../clang/${CLANG_VERSION_STRIPPED}/include"
++                          "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
++                          "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
+             NO_DEFAULT_PATH
+   )
+ 
+