From a629a9d9611020a3ad0f143aa23bc8a43839f8a8 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 13 Oct 2018 19:02:24 +1000 Subject: [PATCH] KDevelop: bump version --- ...op-5.2.2.recipe => kdevelop-5.2.80.recipe} | 8 +++--- .../kdevelop/patches/kdevelop-5.2.2.patchset | 26 ------------------- 2 files changed, 4 insertions(+), 30 deletions(-) rename dev-util/kdevelop/{kdevelop-5.2.2.recipe => kdevelop-5.2.80.recipe} (97%) delete mode 100644 dev-util/kdevelop/patches/kdevelop-5.2.2.patchset diff --git a/dev-util/kdevelop/kdevelop-5.2.2.recipe b/dev-util/kdevelop/kdevelop-5.2.80.recipe similarity index 97% rename from dev-util/kdevelop/kdevelop-5.2.2.recipe rename to dev-util/kdevelop/kdevelop-5.2.80.recipe index 5585e7675..d76383e31 100644 --- a/dev-util/kdevelop/kdevelop-5.2.2.recipe +++ b/dev-util/kdevelop/kdevelop-5.2.80.recipe @@ -7,10 +7,9 @@ HOMEPAGE="https://www.kdevelop.org/" COPYRIGHT="2010-2018 KDE Organisation" LICENSE="GNU GPL v3 GNU LGPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/KDE/kdevelop/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="096f0ca304321c1ef844357b72f1c759da3ad9e2659eb6362bb9ac0ee4a44e06" -PATCHES="kdevelop-$portVersion.patchset" +CHECKSUM_SHA256="ed657ad332d6fe6cec5277b41e234cae8f927c433e02289b6f5457896b7e4885" ADDITIONAL_FILES="kdevelop.rdef.in" ARCHITECTURES="!x86_gcc2 x86_64" @@ -109,7 +108,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules >= 5.39 + extra_cmake_modules$secondaryArchSuffix >= 5.50 devel:libboost_system$secondaryArchSuffix devel:libclang$secondaryArchSuffix devel:libgrantlee_templates$secondaryArchSuffix @@ -180,6 +179,7 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix cmd:llvm_config + cmd:lrelease$secondaryArchSuffix cmd:make cmd:python2 cmd:update_mime_database$secondaryArchSuffix diff --git a/dev-util/kdevelop/patches/kdevelop-5.2.2.patchset b/dev-util/kdevelop/patches/kdevelop-5.2.2.patchset deleted file mode 100644 index f3c30429f..000000000 --- a/dev-util/kdevelop/patches/kdevelop-5.2.2.patchset +++ /dev/null @@ -1,26 +0,0 @@ -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 -