diff --git a/dev-util/kdevelop/additional-files/kdevelop.rdef.in b/dev-util/kdevelop/additional-files/kdevelop.rdef.in index 8fe4c67c7..cb22e49a0 100644 --- a/dev-util/kdevelop/additional-files/kdevelop.rdef.in +++ b/dev-util/kdevelop/additional-files/kdevelop.rdef.in @@ -1,5 +1,5 @@ -resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; +resource app_flags B_MULTIPLE_LAUNCH; resource app_version { major = @MAJOR@, @@ -13,6 +13,12 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; +resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV|Q_REF_TO_FORK"; + +resource file_types message { + "types" = "text/x-source-code" +}; + resource vector_icon { $"6E636966040400660500020006043BD4773C0A75BBF72D3BB88F4B60D948093D" $"00FFFFFF52D9BFA2B0F2ECE7FFBF9A73020006043C21833B67E8BC79323D1853" diff --git a/dev-util/kdevelop/kdevelop-5.4.6.recipe b/dev-util/kdevelop/kdevelop-5.6.0.recipe similarity index 95% rename from dev-util/kdevelop/kdevelop-5.4.6.recipe rename to dev-util/kdevelop/kdevelop-5.6.0.recipe index 398dc80c7..77125e474 100644 --- a/dev-util/kdevelop/kdevelop-5.4.6.recipe +++ b/dev-util/kdevelop/kdevelop-5.6.0.recipe @@ -4,16 +4,17 @@ DESCRIPTION="KDevelop is a free software integrated development environment \ variety of languages (such as C/C++, Python, PHP, Ruby, ...) via an extensible \ plugin framework." HOMEPAGE="https://www.kdevelop.org/" -COPYRIGHT="2010-2019 KDE Organisation" +COPYRIGHT="2010-2020 KDE Organisation" LICENSE="GNU GPL v3 GNU LGPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/KDE/kdevelop/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="a50ad2748a4fa0880d9995c050b026510c9eb0ff5c9ca2e44df75aa43cb7c75e" +CHECKSUM_SHA256="b79ca564b09493168cba0b4a600f2af533922b7a98c05628e5400105eabb500a" ADDITIONAL_FILES="kdevelop.rdef.in" +PATCHES="kdevelop-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86_64" -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="!x86" PROVIDES=" kdevelop$secondaryArchSuffix = $portVersion @@ -23,6 +24,7 @@ PROVIDES=" cmd:kdevelop$secondaryArchSuffix = $portVersion lib:libkdevclangprivate$secondaryArchSuffix lib:libkdevcmakecommon$secondaryArchSuffix + lib:libkdevcompileanalyzercommon$secondaryArchSuffix lib:libkdevplatformdebugger$secondaryArchSuffix lib:libkdevplatformdocumentation$secondaryArchSuffix lib:libkdevplatforminterfaces$secondaryArchSuffix @@ -104,7 +106,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.55 + extra_cmake_modules$secondaryArchSuffix >= 5.65 devel:libboost_system$secondaryArchSuffix devel:libgrantlee_templates$secondaryArchSuffix devel:libKF5Activities$secondaryArchSuffix @@ -173,12 +175,14 @@ BUILD_PREREQUIRES=" cmd:apu_1_config$secondaryArchSuffix cmd:clang cmd:cmake + cmd:find cmd:g++$secondaryArchSuffix cmd:llvm_config >= 9 - cmd:lrelease$secondaryArchSuffix >= 5.13 + cmd:lrelease$secondaryArchSuffix >= 5.15 cmd:make cmd:pkg_config$secondaryArchSuffix cmd:python2 + cmd:sed cmd:update_mime_database$secondaryArchSuffix " diff --git a/dev-util/kdevelop/patches/kdevelop-5.6.0.patchset b/dev-util/kdevelop/patches/kdevelop-5.6.0.patchset new file mode 100644 index 000000000..7fa3a4520 --- /dev/null +++ b/dev-util/kdevelop/patches/kdevelop-5.6.0.patchset @@ -0,0 +1,48 @@ +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 +