diff --git a/dev-util/kdevelop/kdevelop-21.12.1.recipe b/dev-util/kdevelop/kdevelop-21.12.1.recipe index 95aca494a..ea17ec8e4 100644 --- a/dev-util/kdevelop/kdevelop-21.12.1.recipe +++ b/dev-util/kdevelop/kdevelop-21.12.1.recipe @@ -7,7 +7,7 @@ HOMEPAGE="https://www.kdevelop.org/" COPYRIGHT="2010-2021 KDE Organisation" LICENSE="GNU GPL v3 GNU LGPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/KDE/kdevelop/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="652882f5481dff442e15298050c0b8229e6ca75d8ff45e23cc7e03893addbfe6" ADDITIONAL_FILES="kdevelop.rdef.in" @@ -18,6 +18,8 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" kdevelop$secondaryArchSuffix = $portVersion + cmd:kdevelop = $portVersion + cmd:kdevplatform_shell_environment.sh = $portVersion cmd:kdev_dbus_socket_transformer$secondaryArchSuffix = $portVersion cmd:kdev_format_source$secondaryArchSuffix = $portVersion cmd:kdev_includepathsconverter$secondaryArchSuffix = $portVersion @@ -41,7 +43,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix cmd:dbus_launch - lib:libboost_system$secondaryArchSuffix + lib:libboost_system$secondaryArchSuffix >= 1.69.0 lib:libclang$secondaryArchSuffix >= 9 lib:libgrantlee_templates$secondaryArchSuffix lib:libKF5Activities$secondaryArchSuffix @@ -108,7 +110,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix >= 5.86 - devel:libboost_system$secondaryArchSuffix + devel:libboost_system$secondaryArchSuffix >= 1.69.0 devel:libgrantlee_templates$secondaryArchSuffix devel:libKF5Activities$secondaryArchSuffix devel:libKF5Archive$secondaryArchSuffix @@ -183,7 +185,7 @@ BUILD_PREREQUIRES=" cmd:lrelease$secondaryArchSuffix >= 5.15 cmd:make cmd:pkg_config$secondaryArchSuffix - cmd:python2 + cmd:python3 cmd:sed cmd:update_mime_database$secondaryArchSuffix " @@ -202,13 +204,10 @@ BUILD() # disable docs generation until libxml package is fixed sed -i s/add_subdirectory\(doc\)/#add_subdirectory\(doc\)/g CMakeLists.txt - 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 \ + cmake -Bbuild -S. $cmakeDirArgs \ -DCMAKE_BUILD_TYPE=Release \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ @@ -216,21 +215,20 @@ BUILD() -DCMAKE_INSTALL_PREFIX=$prefix \ -DINCLUDE_INSTALL_DIR=$includeDir \ -DSHARE_INSTALL_PREFIX=$dataDir \ - -DCMAKE_INSTALL_PREFIX=$appsDir/KDevelop \ + -DKDE_INSTALL_APPDIR=$appsDir/KDevelop \ -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ -DCLANG_BUILTIN_DIR="$BUILTIN_DIR" \ -DBUILD_TESTING=OFF - - make $jobArgs + make -C build $jobArgs } INSTALL() { - cd build - make install + make -C build install mkdir -p $appsDir mv $binDir/kdevelop $appsDir/KDevelop/KDevelop + mv $prefix/bin/kdevelop! $prefix/bin/kdevelop rm $dataDir/mime/{version,types,treemagic,subclasses,magic,mime.cache} rm $dataDir/mime/{icons,globs,globs2,generic-icons,aliases,XMLnamespaces}