kdevelop, bump version (#10469)

This commit is contained in:
Schrijvers Luc
2024-05-24 12:19:24 +02:00
committed by GitHub
parent c2d4ba8036
commit 5cce929f96
4 changed files with 10 additions and 312 deletions

View File

@@ -1,48 +0,0 @@
From cbe0a6f058968ab499e3e638d3f14e6a73e72b56 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 22 Sep 2020 13:41:47 +1000
Subject: Fix for Haiku
diff --git a/plugins/appwizard/CMakeLists.txt b/plugins/appwizard/CMakeLists.txt
index 3f4d4c5..a77ad88 100644
--- a/plugins/appwizard/CMakeLists.txt
+++ b/plugins/appwizard/CMakeLists.txt
@@ -24,7 +24,7 @@ declare_qt_logging_category(kdevappwizard_PART_SRCS
ki18n_wrap_ui(kdevappwizard_PART_SRCS ${kdevappwizard_PART_UI})
-if(NOT KF5_VERSION VERSION_LESS "5.57.0")
+if(NOT KF5_VERSION VERSION_LESS "5.57.0" AND NOT HAIKU)
install(FILES kdevappwizard.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
else()
qt5_add_resources(kdevappwizard_PART_SRCS kdevappwizardknsrc.qrc)
diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt
index c3cf1b4..dbd9fd5 100644
--- a/plugins/filetemplates/CMakeLists.txt
+++ b/plugins/filetemplates/CMakeLists.txt
@@ -33,7 +33,7 @@ ki18n_wrap_ui(kdevfiletemplates_PART_SRCS
ui/testcases.ui
)
-if(NOT KF5_VERSION VERSION_LESS "5.57.0")
+if(NOT KF5_VERSION VERSION_LESS "5.57.0" AND NOT HAIKU)
install(FILES kdevfiletemplates.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
else()
qt5_add_resources(kdevfiletemplates_PART_SRCS kdevfiletemplatesknsrc.qrc)
diff --git a/plugins/qthelp/CMakeLists.txt b/plugins/qthelp/CMakeLists.txt
index a0b4918..46809a1 100644
--- a/plugins/qthelp/CMakeLists.txt
+++ b/plugins/qthelp/CMakeLists.txt
@@ -22,7 +22,7 @@ ki18n_wrap_ui(kdevqthelp_SRCS
qthelpconfigeditdialog.ui
)
-if(NOT KF5_VERSION VERSION_LESS "5.57.0")
+if(NOT KF5_VERSION VERSION_LESS "5.57.0" AND NOT HAIKU)
install(FILES kdevelop-qthelp.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
else()
qt5_add_resources(kdevqthelp_SRCS kdevqthelp.qrc)
--
2.28.0

View File

@@ -1,11 +1,11 @@
From 0b3f961226c7bf128a874c41a10cae88741a8a5d Mon Sep 17 00:00:00 2001
From 71ed7e5ae9d05ddadd617a932dc00cdab85fcb04 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 22 Sep 2020 13:41:47 +1000
Subject: Fix for Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 951d714..5264db0 100644
index 322cbdc..e1f0740 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,6 @@ endif()
@@ -16,7 +16,7 @@ index 951d714..5264db0 100644
IconThemes
I18n
ItemModels
@@ -189,7 +188,7 @@ add_subdirectory(app)
@@ -187,7 +186,7 @@ add_subdirectory(app)
add_subdirectory(app_templates)
add_subdirectory(file_templates)
add_subdirectory(shortcuts)
@@ -25,7 +25,7 @@ index 951d714..5264db0 100644
add_subdirectory(share)
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KDevelop")
@@ -218,6 +217,5 @@ install(FILES org.kde.kdevelop.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR
@@ -216,6 +215,5 @@ install(FILES org.kde.kdevelop.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR
# Make it possible to use the po files fetched by the fetch-translations step
ki18n_install(po)
@@ -78,7 +78,7 @@ index e7e3b69..332c95e 100644
2.43.2
From 1ca73437265f0add80a3a934c8f0246be6a271e0 Mon Sep 17 00:00:00 2001
From ea22edc8a4fa1daacdeb0ae082b18008a2efc9b3 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 26 Mar 2024 08:14:54 +0100
Subject: Use system theme