From f70b376d0fab20b2effd481376d1a0455f6a8220 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Fri, 23 Aug 2019 11:10:44 +0200 Subject: [PATCH] Kdevelop: bump version (#4120) --- ...evelop-5.2.80.recipe => kdevelop-5.4.1.recipe} | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) rename dev-util/kdevelop/{kdevelop-5.2.80.recipe => kdevelop-5.4.1.recipe} (94%) diff --git a/dev-util/kdevelop/kdevelop-5.2.80.recipe b/dev-util/kdevelop/kdevelop-5.4.1.recipe similarity index 94% rename from dev-util/kdevelop/kdevelop-5.2.80.recipe rename to dev-util/kdevelop/kdevelop-5.4.1.recipe index a33b5506a..a9755146c 100644 --- a/dev-util/kdevelop/kdevelop-5.2.80.recipe +++ b/dev-util/kdevelop/kdevelop-5.4.1.recipe @@ -4,12 +4,12 @@ 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-2018 KDE Organisation" +COPYRIGHT="2010-2019 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="ed657ad332d6fe6cec5277b41e234cae8f927c433e02289b6f5457896b7e4885" +CHECKSUM_SHA256="3ecafc8644d8382656f02d68f173c9e100c2d823ab4f0169fe82511680fafa27" ADDITIONAL_FILES="kdevelop.rdef.in" ARCHITECTURES="!x86_gcc2 x86_64" @@ -108,7 +108,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.50 + extra_cmake_modules$secondaryArchSuffix >= 5.55 devel:libboost_system$secondaryArchSuffix devel:libclang$secondaryArchSuffix devel:libgrantlee_templates$secondaryArchSuffix @@ -179,8 +179,9 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix cmd:llvm_config - cmd:lrelease$secondaryArchSuffix >= 5 + cmd:lrelease$secondaryArchSuffix >= 5.13 cmd:make + cmd:pkg_config$secondaryArchSuffix cmd:python2 cmd:update_mime_database$secondaryArchSuffix " @@ -193,6 +194,9 @@ BUILD() mkdir -p build cd build + CLANG_VERSION="`clang --version | head -n 1 | cut -d " " -f3`" + BUILTIN_DIR="`finddir B_SYSTEM_LIB_DIRECTORY`/clang/$CLANG_VERSION/include" + cmake .. $cmakeDirArgs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ @@ -202,6 +206,7 @@ BUILD() -DSHARE_INSTALL_PREFIX=$dataDir \ -DCMAKE_INSTALL_PREFIX=$appsDir/KDevelop \ -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ + -DCLANG_BUILTIN_DIR="$BUILTIN_DIR" \ -DBUILD_TESTING=OFF make $jobArgs