From 225d165dd192c2e74ebefd4bd17faac005d45247 Mon Sep 17 00:00:00 2001 From: yopito Date: Wed, 4 Mar 2020 19:54:20 +0100 Subject: [PATCH] kdevelop: update to 5.5.0, enable crossbuild [ci skip] --- common/shlibs | 29 +++++++++++++++-------------- srcpkgs/kdevelop/template | 16 ++++++++-------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/common/shlibs b/common/shlibs index 2626db7457e..4d1d41dbb3d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2506,20 +2506,21 @@ libxdo.so.3 xdotool-3.20150503.1_1 libabigail.so.0 libabigail-1.0.rc3_1 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1 libwlc.so.0 wlc-0.0.2_1 -libKDevClangPrivate.so.32 kdevelop-5.4.1_1 -libKDevPlatformDebugger.so.54 kdevelop-5.4.1_1 -libKDevPlatformDocumentation.so.54 kdevelop-5.4.1_1 -libKDevPlatformInterfaces.so.54 kdevelop-5.4.1_1 -libKDevPlatformLanguage.so.54 kdevelop-5.4.1_1 -libKDevPlatformOutputView.so.54 kdevelop-5.4.1_1 -libKDevPlatformProject.so.54 kdevelop-5.4.1_1 -libKDevPlatformSerialization.so.54 kdevelop-5.4.1_1 -libKDevPlatformShell.so.54 kdevelop-5.4.1_1 -libKDevPlatformSublime.so.54 kdevelop-5.4.1_1 -libKDevPlatformTests.so.54 kdevelop-5.4.1_1 -libKDevPlatformUtil.so.54 kdevelop-5.4.1_1 -libKDevPlatformVcs.so.54 kdevelop-5.4.1_1 -libkdevcmakecommon.so kdevelop-5.4.1_1 +libKDevCMakeCommon.so.33 kdevelop-5.5.0_1 +libKDevClangPrivate.so.33 kdevelop-5.5.0_1 +libKDevCompileAnalyzerCommon.so.33 kdevelop-5.5.0_1 +libKDevPlatformDebugger.so.55 kdevelop-5.5.0_1 +libKDevPlatformDocumentation.so.55 kdevelop-5.5.0_1 +libKDevPlatformInterfaces.so.55 kdevelop-5.5.0_1 +libKDevPlatformLanguage.so.55 kdevelop-5.5.0_1 +libKDevPlatformOutputView.so.55 kdevelop-5.5.0_1 +libKDevPlatformProject.so.55 kdevelop-5.5.0_1 +libKDevPlatformSerialization.so.55 kdevelop-5.5.0_1 +libKDevPlatformShell.so.55 kdevelop-5.5.0_1 +libKDevPlatformSublime.so.55 kdevelop-5.5.0_1 +libKDevPlatformTests.so.55 kdevelop-5.5.0_1 +libKDevPlatformUtil.so.55 kdevelop-5.5.0_1 +libKDevPlatformVcs.so.55 kdevelop-5.5.0_1 libts.so.0 tslib-1.6_1 libobs.so.0 obs-0.14.1_2 libobsglad.so.0 obs-0.14.1_2 diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template index d9ee130cdbf..3bbb5f04758 100644 --- a/srcpkgs/kdevelop/template +++ b/srcpkgs/kdevelop/template @@ -1,6 +1,6 @@ # Template file for 'kdevelop' pkgname=kdevelop -version=5.4.6 +version=5.5.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools @@ -8,14 +8,15 @@ hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools makedepends="apr-util-devel clang grantlee5-devel kcmutils-devel kdevelop-pg-qt kitemmodels-devel knewstuff-devel knotifyconfig-devel krunner-devel ktexteditor-devel libkomparediff2-devel libksysguard-devel okteta-devel - purpose-devel qt5-location-devel qt5-webchannel-devel subversion-devel" + purpose-devel qt5-location-devel qt5-webchannel-devel subversion-devel + $(vopt_if webengine 'qt5-webengine-devel' 'qt5-webkit-devel')" depends="cmake cppcheck git indent kde5-baseapps" short_desc="Integrated Development Environment for C++/C" maintainer="yopito " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.kdevelop.org/" distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz" -checksum=5f97ed98db9e7723a450cc9ff2a7a1020f407b3d8cb9260fde1906b678cd5506 +checksum=a891aab101db8597ac0d35577faa4bc7a8a4b9de91140c70a9f112b183386810 build_options="webengine" desc_option_webengine="Use Qt5 WebEngine for documentation" @@ -24,11 +25,10 @@ if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then build_options_default="webengine" fi -if [ "$build_option_webengine" ]; then - makedepends+=" qt5-webengine-devel" -else - makedepends+=" qt5-webkit-devel" -fi +case "$XBPS_TARGET_MACHINE" in + # qt5-webengine-devel unavailable + armv*) build_options_default="" ;; +esac kdevelop-devel_package() { depends="kdevelop>=${version}_${revision}"