From f3f7d39e47ee4f37ebea71b17ff9a6800f8a2b45 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Mon, 9 Apr 2018 18:08:24 +0200 Subject: [PATCH] KDevelop: make it work (#2419) * KDevelop: #sudo hp kdevelop * Cleanup * Coment in PATCH * Comments in patchset --- .../additional-files/kdevelop.rdef.in | 29 ++++++ dev-util/kdevelop/kdevelop-5.2.1.recipe | 91 ++++++++++++++----- .../kdevelop/patches/kdevelop-5.2.1.patchset | 26 ++++++ 3 files changed, 123 insertions(+), 23 deletions(-) create mode 100644 dev-util/kdevelop/additional-files/kdevelop.rdef.in create mode 100644 dev-util/kdevelop/patches/kdevelop-5.2.1.patchset diff --git a/dev-util/kdevelop/additional-files/kdevelop.rdef.in b/dev-util/kdevelop/additional-files/kdevelop.rdef.in new file mode 100644 index 000000000..8fe4c67c7 --- /dev/null +++ b/dev-util/kdevelop/additional-files/kdevelop.rdef.in @@ -0,0 +1,29 @@ + +resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + variety = B_APPV_FINAL, + internal = 0, + short_info = "KDevelop", + long_info = "@LONG_INFO@" +}; + +resource app_signature "@APP_SIGNATURE@"; + +resource vector_icon { + $"6E636966040400660500020006043BD4773C0A75BBF72D3BB88F4B60D948093D" + $"00FFFFFF52D9BFA2B0F2ECE7FFBF9A73020006043C21833B67E8BC79323D1853" + $"4A0B4E48AE8F00FFFFFF53B8C2D9B1E6EAF2FF8FA0BF050A185F495E3F593B58" + $"3553335339503B4C383B463241214A27552E543457365D425E435A4B58535A56" + $"5658585C545A505C490A175E475D40C944BDF65434542F4D284B2B462942243E" + $"27432F43344035453E493EC3BBBF6A4D40C4C4C09F4F45524C584E564859450A" + $"15453E4035C08ABB1C432F3A2B37312F33292F2436283C2745224A27532D5035" + $"54375B40593F51444B4B4B4D4002044A35C349BBCFC42DBAEB5037C53BBB45C7" + $"03BD0D523DC75DBE1BC679BEFF4C3BC56BBEA5C3A3BCDD02043C433CBFA03CC2" + $"43BBF749BD2C49BAC149314331C24331BFA0BBF73DBAC13DBD2C3D050A000100" + $"1001158200040A010201031001178400040A02020103000A0102020410011784" + $"00040A0302020400" +}; diff --git a/dev-util/kdevelop/kdevelop-5.2.1.recipe b/dev-util/kdevelop/kdevelop-5.2.1.recipe index 36bbfd4b2..f38510bca 100644 --- a/dev-util/kdevelop/kdevelop-5.2.1.recipe +++ b/dev-util/kdevelop/kdevelop-5.2.1.recipe @@ -5,27 +5,48 @@ variety of languages (such as C/C++, Python, PHP, Ruby, ...) via an extensible \ plugin framework." HOMEPAGE="https://www.kdevelop.org/" COPYRIGHT="2010-2017 KDE Organisation" -LICENSE=" - GNU GPL v3 - GNU LGPL v3 - " +LICENSE="GNU GPL v3 + GNU LGPL v3" REVISION="1" SOURCE_URI="https://github.com/KDE/kdevelop/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="d64d9b7d6a6e1cc844106d468f5a3a6ac71ac5b6740e5a7c5456e083f78f217e" -#PATCHES="kdevelop-$portVersion.patchset" -#ADDITIONAL_FILES="kdevelop.rdef.in" +PATCHES="kdevelop-$portVersion.patchset" +ADDITIONAL_FILES="kdevelop.rdef.in" -ARCHITECTURES="!x86_gcc2 ?x86_64" +ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="?x86" PROVIDES=" kdevelop$secondaryArchSuffix = $portVersion cmd:kdevelop$secondaryArchSuffix = $portVersion + cmd:kdev_dbus_socket_transformer$secondaryArchSuffix = $portVersion + cmd:kdev_format_source$secondaryArchSuffix = $portVersion + cmd:kdev_includepathsconverter$secondaryArchSuffix = $portVersion + lib:libkdevclangprivate$secondaryArchSuffix + lib:libkdevplatformdebugger$secondaryArchSuffix + lib:libkdevplatformdocumentation$secondaryArchSuffix + lib:libkdevplatforminterfaces$secondaryArchSuffix + lib:libkdevplatformlanguage$secondaryArchSuffix + lib:libkdevplatformoutputview$secondaryArchSuffix + lib:libkdevplatformproject$secondaryArchSuffix + lib:libkdevplatformserialization$secondaryArchSuffix + lib:libkdevplatformshell$secondaryArchSuffix + lib:libkdevplatformsublime$secondaryArchSuffix + lib:libkdevplatformtests$secondaryArchSuffix + lib:libkdevplatformutil$secondaryArchSuffix + lib:libkdevplatformvcs$secondaryArchSuffix + lib:libkdevcmakecommon$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix + lib:libboost_system$secondaryArchSuffix + lib:libclang$secondaryArchSuffix + lib:libgrantlee_templates$secondaryArchSuffix + lib:libKF5Activities$secondaryArchSuffix lib:libKF5Archive$secondaryArchSuffix + lib:libKF5Attica$secondaryArchSuffix lib:libKF5Auth$secondaryArchSuffix + lib:libKF5Bookmarks$secondaryArchSuffix lib:libKF5Codecs$secondaryArchSuffix lib:libKF5Completion$secondaryArchSuffix lib:libKF5ConfigCore$secondaryArchSuffix @@ -34,44 +55,59 @@ REQUIRES=" lib:libKF5CoreAddons$secondaryArchSuffix lib:libKF5Crash$secondaryArchSuffix lib:libKF5DBusAddons$secondaryArchSuffix + lib:libKF5Declarative$secondaryArchSuffix + lib:libKF5DesignerPlugin$secondaryArchSuffix + lib:libKF5DocTools$secondaryArchSuffix + lib:libKF5Emoticons$secondaryArchSuffix + lib:libKF5FileMetadata$secondaryArchSuffix + lib:libKF5GlobalAccel$secondaryArchSuffix lib:libKF5GuiAddons$secondaryArchSuffix lib:libKF5I18n$secondaryArchSuffix lib:libKF5IconThemes$secondaryArchSuffix + lib:libKF5ItemModels$secondaryArchSuffix + lib:libKF5ItemViews$secondaryArchSuffix lib:libKF5JobWidgets$secondaryArchSuffix + lib:libKF5KCMUtils$secondaryArchSuffix + lib:libKF5KDELibs4Support$secondaryArchSuffix + lib:libKF5KioCore$secondaryArchSuffix lib:libKF5KIOCore$secondaryArchSuffix lib:libKF5KIOWidgets$secondaryArchSuffix + lib:libKF5NewStuff$secondaryArchSuffix + lib:libKF5NewStuffCore$secondaryArchSuffix + lib:libKF5Notifications$secondaryArchSuffix + lib:libKF5NotifyConfig$secondaryArchSuffix + lib:libKF5Package$secondaryArchSuffix lib:libKF5Parts$secondaryArchSuffix lib:libKF5Service$secondaryArchSuffix + lib:libKF5Solid$secondaryArchSuffix lib:libKF5SonnetUi$secondaryArchSuffix lib:libKF5TextEditor$secondaryArchSuffix lib:libKF5TextWidgets$secondaryArchSuffix + lib:libKF5ThreadWeaver$secondaryArchSuffix + lib:libKF5UnitConversion$secondaryArchSuffix lib:libKF5WidgetsAddons$secondaryArchSuffix lib:libKF5WindowSystem$secondaryArchSuffix lib:libKF5XmlGui$secondaryArchSuffix + lib:libkomparediff2$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5DBus$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix + lib:libQt5PrintSupport$secondaryArchSuffix + lib:libQt5Svg$secondaryArchSuffix + lib:libQt5Test$secondaryArchSuffix + lib:libQt5WebKit$secondaryArchSuffix + lib:libQt5WebKitWidgets$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libQt5Xml$secondaryArchSuffix - lib:libKF5Activities$secondaryArchSuffix - lib:libKF5Attica$secondaryArchSuffix - lib:libKF5Bookmarks$secondaryArchSuffix - lib:libKF5ItemViews$secondaryArchSuffix - lib:libKF5KCMUtils$secondaryArchSuffix - lib:libKF5KDELibs4Support$secondaryArchSuffix - lib:libKF5NewStuff$secondaryArchSuffix - lib:libKF5NewStuffCore$secondaryArchSuffix - lib:libKF5Notifications$secondaryArchSuffix - lib:libKF5Solid$secondaryArchSuffix - lib:libKF5UnitConversion$secondaryArchSuffix " BUILD_REQUIRES=" extra_cmake_modules >= 5.39 haiku${secondaryArchSuffix}_devel - devel:libgrantlee_templates$secondaryArchSuffix devel:libboost_system$secondaryArchSuffix + devel:libclang$secondaryArchSuffix + devel:libgrantlee_templates$secondaryArchSuffix devel:libKF5Activities$secondaryArchSuffix devel:libKF5Archive$secondaryArchSuffix devel:libKF5Attica$secondaryArchSuffix @@ -80,16 +116,17 @@ BUILD_REQUIRES=" devel:libKF5Codecs$secondaryArchSuffix devel:libKF5Completion$secondaryArchSuffix devel:libKF5ConfigCore$secondaryArchSuffix + devel:libKF5ConfigGui$secondaryArchSuffix devel:libKF5ConfigWidgets$secondaryArchSuffix devel:libKF5CoreAddons$secondaryArchSuffix devel:libKF5Crash$secondaryArchSuffix - devel:libKF5Declarative$secondaryArchSuffix devel:libKF5DBusAddons$secondaryArchSuffix - devel:libKF5DocTools$secondaryArchSuffix + devel:libKF5Declarative$secondaryArchSuffix devel:libKF5DesignerPlugin$secondaryArchSuffix - devel:libKF5GlobalAccel$secondaryArchSuffix + devel:libKF5DocTools$secondaryArchSuffix devel:libKF5Emoticons$secondaryArchSuffix devel:libKF5FileMetadata$secondaryArchSuffix + devel:libKF5GlobalAccel$secondaryArchSuffix devel:libKF5GuiAddons$secondaryArchSuffix devel:libKF5I18n$secondaryArchSuffix devel:libKF5IconThemes$secondaryArchSuffix @@ -99,6 +136,9 @@ BUILD_REQUIRES=" devel:libKF5KCMUtils$secondaryArchSuffix devel:libKF5KDELibs4Support$secondaryArchSuffix devel:libKF5KioCore$secondaryArchSuffix + devel:libKF5KIOCore$secondaryArchSuffix + devel:libKF5KIOWidgets$secondaryArchSuffix + devel:libKF5NewStuff$secondaryArchSuffix devel:libKF5NewStuffCore$secondaryArchSuffix devel:libKF5Notifications$secondaryArchSuffix devel:libKF5NotifyConfig$secondaryArchSuffix @@ -106,10 +146,10 @@ BUILD_REQUIRES=" devel:libKF5Parts$secondaryArchSuffix devel:libKF5Service$secondaryArchSuffix devel:libKF5Solid$secondaryArchSuffix + devel:libKF5SonnetUi$secondaryArchSuffix devel:libKF5TextEditor$secondaryArchSuffix devel:libKF5TextWidgets$secondaryArchSuffix devel:libKF5ThreadWeaver$secondaryArchSuffix - devel:libKF5SonnetUi$secondaryArchSuffix devel:libKF5UnitConversion$secondaryArchSuffix devel:libKF5WidgetsAddons$secondaryArchSuffix devel:libKF5WindowSystem$secondaryArchSuffix @@ -123,6 +163,7 @@ BUILD_REQUIRES=" devel:libQt5Svg$secondaryArchSuffix devel:libQt5Test$secondaryArchSuffix devel:libQt5WebKit$secondaryArchSuffix + devel:libQt5WebKitWidgets$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix devel:libQt5Xml$secondaryArchSuffix " @@ -136,6 +177,10 @@ BUILD_PREREQUIRES=" cmd:update_mime_database$secondaryArchSuffix " +GLOBAL_WRITABLE_FILES=" + settings/xdg/kdevelop.categories auto-merge + settings/xdg/kdevplatform.categories auto-merge + " BUILD() { diff --git a/dev-util/kdevelop/patches/kdevelop-5.2.1.patchset b/dev-util/kdevelop/patches/kdevelop-5.2.1.patchset new file mode 100644 index 000000000..f3c30429f --- /dev/null +++ b/dev-util/kdevelop/patches/kdevelop-5.2.1.patchset @@ -0,0 +1,26 @@ +From 6ffe77b220b5c776adb8c27157e85e13d87dbaad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Tue, 3 Apr 2018 20:08:02 +0200 +Subject: Haiku supporting patches + + +diff --git a/kdevplatform/util/dbus_socket_transformer/CMakeLists.txt b/kdevplatform/util/dbus_socket_transformer/CMakeLists.txt +index f9ce6ac..5c36e79 100644 +--- a/kdevplatform/util/dbus_socket_transformer/CMakeLists.txt ++++ b/kdevplatform/util/dbus_socket_transformer/CMakeLists.txt +@@ -15,5 +15,12 @@ if(HAVE_MSG_NOSIGNAL) + endif() + + add_executable(kdev_dbus_socket_transformer main.cpp) ++ ++# explicit linking to Haiku's separate libnetwork needed due to socket() usage ++# already upstreamed ++if (HAIKU) ++ target_link_libraries(kdev_dbus_socket_transformer network) ++endif () ++ + ecm_mark_nongui_executable(kdev_dbus_socket_transformer) + install(TARGETS kdev_dbus_socket_transformer ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) +-- +2.16.2 +