diff --git a/common/shlibs b/common/shlibs index 55439a155f9..1df6604d0f4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2429,6 +2429,20 @@ libkdevplatformdocumentation.so.8 kdevplatform-1.7.3_1 libkdevplatformoutputview.so.8 kdevplatform-1.7.3_1 libkdevplatformvcs.so.8 kdevplatform-1.7.3_1 libkdevplatforminterfaces.so.8 kdevplatform-1.7.3_1 +libKDevClangPrivate.so.30 kdevelop-5.2.1_1 +libKDevPlatformDebugger.so.52 kdevelop-5.2.1_1 +libKDevPlatformDocumentation.so.52 kdevelop-5.2.1_1 +libKDevPlatformInterfaces.so.52 kdevelop-5.2.1_1 +libKDevPlatformLanguage.so.52 kdevelop-5.2.1_1 +libKDevPlatformOutputView.so.52 kdevelop-5.2.1_1 +libKDevPlatformProject.so.52 kdevelop-5.2.1_1 +libKDevPlatformSerialization.so.52 kdevelop-5.2.1_1 +libKDevPlatformShell.so.52 kdevelop-5.2.1_1 +libKDevPlatformSublime.so.52 kdevelop-5.2.1_1 +libKDevPlatformTests.so.52 kdevelop-5.2.1_1 +libKDevPlatformUtil.so.52 kdevelop-5.2.1_1 +libKDevPlatformVcs.so.52 kdevelop-5.2.1_1 +libkdevcmakecommon.so kdevelop-5.2.1_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-devel b/srcpkgs/kdevelop-devel new file mode 120000 index 00000000000..2465d10b315 --- /dev/null +++ b/srcpkgs/kdevelop-devel @@ -0,0 +1 @@ +kdevelop \ No newline at end of file diff --git a/srcpkgs/kdevelop/INSTALL.msg b/srcpkgs/kdevelop/INSTALL.msg new file mode 100644 index 00000000000..45c7d3306a3 --- /dev/null +++ b/srcpkgs/kdevelop/INSTALL.msg @@ -0,0 +1,4 @@ +Some optional packages may be installed for additional functionality: + +- kdevelop-python: python3 language and django project support +- kdevelop-php : PHP language support diff --git a/srcpkgs/kdevelop/patches/kdevelop-4.7.3.cmake-allow-dup-targets-in-po-subdirs.patch b/srcpkgs/kdevelop/patches/kdevelop-4.7.3.cmake-allow-dup-targets-in-po-subdirs.patch deleted file mode 100644 index dbf61d27b73..00000000000 --- a/srcpkgs/kdevelop/patches/kdevelop-4.7.3.cmake-allow-dup-targets-in-po-subdirs.patch +++ /dev/null @@ -1,21 +0,0 @@ -cmake 3.x policy CMP0002 forbids same target name to be defined several times. -But the 30 po/*/CMakeList.txt files do it, so allow it or patch each. - -Error message was: -dules/FindGettext.cmake:232 (ADD_CUSTOM_TARGET): - add_custom_target cannot create target "pofiles" because another target - with the same name already exists. The existing target is a custom target - created in source directory "/builddir/kdevelop-4.7.3/po/fi". See - documentation for policy CMP0002 for more details. -Call Stack (most recent call first): - po/gl/CMakeLists.txt:2 (GETTEXT_PROCESS_PO_FILES) - ---- CMakeLists.txt.orig 2016-01-22 19:20:15.000000000 +0100 -+++ CMakeLists.txt 2016-04-15 10:41:04.185750138 +0200 -@@ -91,4 +91,6 @@ - configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake) - - include(MacroOptionalAddSubdirectory) -+set_property(GLOBAL -+ PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1) - macro_optional_add_subdirectory( po ) diff --git a/srcpkgs/kdevelop/patches/use-std-c99.patch b/srcpkgs/kdevelop/patches/use-std-c99.patch new file mode 100644 index 00000000000..da373e3ab2c --- /dev/null +++ b/srcpkgs/kdevelop/patches/use-std-c99.patch @@ -0,0 +1,16 @@ +KDECompilerSettings (of extra-cmake-modules 5.40) sets "-std=iso9899:1990" that is +too restrictive for C build with Qt *.h files: comments in c++ style. +Let's use C99 instead. + +--- CMakeLists.txt.ORIG ++++ CMakeLists.txt +@@ -21,6 +21,9 @@ + endif() + + include(KDECompilerSettings NO_POLICY_SCOPE) # needs to be first, as set policies influence following macros ++string(REPLACE " -std=iso9899:1990" "" CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} ") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") ++ + include(ECMOptionalAddSubdirectory) + include(ECMInstallIcons) + include(ECMAddAppIcon) diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template index 1f3d2881f55..7f21554004d 100644 --- a/srcpkgs/kdevelop/template +++ b/srcpkgs/kdevelop/template @@ -1,21 +1,33 @@ # Template file for 'kdevelop' pkgname=kdevelop -version=4.7.3 -revision=2 - +version=5.2.1 +revision=1 build_style=cmake -configure_args="-Wno-dev" - -hostmakedepends="qt-qmake automoc4 perl" -makedepends="kdelibs-devel qt-devel qt-webkit-devel libressl-devel phonon-devel - qjson-devel kdevplatform-devel kde-workspace-devel okteta-devel boost-devel" - -# kde-runtime provides khelpcenter, needed to display documentation -depends="konsole kate kde-runtime" - +hostmakedepends="extra-cmake-modules" +makedepends="llvm clang qt5-declarative-devel kdeclarative-devel + kcmutils-devel knewstuff-devel knotifyconfig-devel kparts-devel + ktexteditor-devel threadweaver-devel kxmlgui-devel kcrash-devel + kguiaddons-devel karchive-devel knotifications-devel kitemmodels-devel + qt5-webengine-devel qt5-webkit-devel qt5-webchannel-devel + qt5-location-devel libksysguard-devel libkomparediff2-devel + krunner-devel plasma-framework-devel grantlee5-devel okteta5-devel + boost-devel subversion-devel apr-util-devel kdevelop-pg-qt" +depends="kde5-baseapps git cmake cppcheck indent" short_desc="Integrated Development Environment for C++/C" maintainer="yopito " -license="GPL-3" +license="GPL-2, LGPL-2.1" homepage="https://www.kdevelop.org/" -distfiles="http://download.kde.org/stable/${pkgname}/${version}/src/${pkgname}-${version}.tar.bz2" -checksum=9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35 +distfiles="http://download.kde.org/stable/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz" +checksum=d1c39c563e4fada89eb9f30bd43c6c4beed0fec7ca7d124af587193cfe020650 +nocross="plasma-framework-devel is not available" + +kdevelop-devel_package() { + depends="kdevelop>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + # avoid libkdevcmakecommon.so + vmove usr/lib/libKDevPlatform*.so + } +}