haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

kdevelop, bump version (#10328)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-04-13 10:51:33 +02:00
committed by GitHub
parent fe081fb4b2
commit aa5bd23f6e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
dev-util/kdevelop/patches/kdevelop-24.02.2.patchset Normal file
View File

@@ -0,0 +1,103 @@
From 0b3f961226c7bf128a874c41a10cae88741a8a5d 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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,6 @@ endif()
find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS
Config
Declarative
- DocTools
IconThemes
I18n
ItemModels
@@ -189,7 +188,7 @@ add_subdirectory(app)
add_subdirectory(app_templates)
add_subdirectory(file_templates)
add_subdirectory(shortcuts)
-add_subdirectory(doc)
+###add_subdirectory(doc)
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
# Make it possible to use the po files fetched by the fetch-translations step
ki18n_install(po)
-kdoctools_install(po)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/plugins/appwizard/CMakeLists.txt b/plugins/appwizard/CMakeLists.txt
index 652c32e..6a8cb57 100644
--- a/plugins/appwizard/CMakeLists.txt
+++ b/plugins/appwizard/CMakeLists.txt
@@ -24,7 +24,9 @@ declare_qt_logging_category(kdevappwizard_PART_SRCS
ki18n_wrap_ui(kdevappwizard_PART_SRCS ${kdevappwizard_PART_UI})
+if(NOT HAIKU)
install(FILES kdevappwizard.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
+endif()
qt5_add_resources(kdevappwizard_PART_SRCS kdevappwizard.qrc)
kdevplatform_add_plugin(kdevappwizard SOURCES ${kdevappwizard_PART_SRCS})
diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt
index 0f0be21..f0961ec 100644
--- a/plugins/filetemplates/CMakeLists.txt
+++ b/plugins/filetemplates/CMakeLists.txt
@@ -33,7 +33,9 @@ ki18n_wrap_ui(kdevfiletemplates_PART_SRCS
ui/testcases.ui
)
+if(NOT HAIKU)
install(FILES kdevfiletemplates.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
+endif()
qt5_add_resources(kdevfiletemplates_PART_SRCS kdevfiletemplates.qrc)
kdevplatform_add_plugin(kdevfiletemplates SOURCES ${kdevfiletemplates_PART_SRCS})
diff --git a/plugins/qthelp/CMakeLists.txt b/plugins/qthelp/CMakeLists.txt
index e7e3b69..332c95e 100644
--- a/plugins/qthelp/CMakeLists.txt
+++ b/plugins/qthelp/CMakeLists.txt
@@ -22,7 +22,9 @@ ki18n_wrap_ui(kdevqthelp_SRCS
qthelpconfigeditdialog.ui
)
+if(NOT HAIKU)
install(FILES kdevelop-qthelp.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
+endif()
kdevplatform_add_plugin(kdevqthelp SOURCES ${kdevqthelp_SRCS})
target_link_libraries(kdevqthelp
--
2.43.2
From 1ca73437265f0add80a3a934c8f0246be6a271e0 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
diff --git a/kdevplatform/shell/mainwindow_p.cpp b/kdevplatform/shell/mainwindow_p.cpp
index e553dd0..e7b2176 100644
--- a/kdevplatform/shell/mainwindow_p.cpp
+++ b/kdevplatform/shell/mainwindow_p.cpp
@@ -312,7 +312,9 @@ void MainWindowPrivate::setupActions()
action->setWhatsThis( i18nc( "@info:whatsthis", "Adds a new tool view to this window." ) );
//Load themes
+#ifndef Q_OS_HAIKU
actionCollection()->addAction(QStringLiteral("colorscheme_menu"), new ColorSchemeChooser(actionCollection()));
+#endif
}
void MainWindowPrivate::toggleArea(bool b)
--
2.43.2