From c131032ac6e3acdb32fa5bf6fb88cc0af0cddb43 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Feb 2022 00:24:40 +0100 Subject: [PATCH 1/2] kdevelop: update to 21.12.2. --- common/shlibs | 30 +++++++++++----------- srcpkgs/kdevelop/patches/use-std-c99.patch | 15 ----------- srcpkgs/kdevelop/template | 9 ++++--- 3 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/kdevelop/patches/use-std-c99.patch diff --git a/common/shlibs b/common/shlibs index 019618205973..3d7de9e42b39 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2677,21 +2677,21 @@ libvidstab.so.1.1 libvidstab-1.1.0_1 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 -libKDevCMakeCommon.so.34 kdevelop-5.6.0_1 -libKDevClangPrivate.so.34 kdevelop-5.6.0_1 -libKDevCompileAnalyzerCommon.so.34 kdevelop-5.6.0_1 -libKDevPlatformDebugger.so.56 kdevelop-5.6.0_1 -libKDevPlatformDocumentation.so.56 kdevelop-5.6.0_1 -libKDevPlatformInterfaces.so.56 kdevelop-5.6.0_1 -libKDevPlatformLanguage.so.56 kdevelop-5.6.0_1 -libKDevPlatformOutputView.so.56 kdevelop-5.6.0_1 -libKDevPlatformProject.so.56 kdevelop-5.6.0_1 -libKDevPlatformSerialization.so.56 kdevelop-5.6.0_1 -libKDevPlatformShell.so.56 kdevelop-5.6.0_1 -libKDevPlatformSublime.so.56 kdevelop-5.6.0_1 -libKDevPlatformTests.so.56 kdevelop-5.6.0_1 -libKDevPlatformUtil.so.56 kdevelop-5.6.0_1 -libKDevPlatformVcs.so.56 kdevelop-5.6.0_1 +libKDevCMakeCommon.so.35 kdevelop-21.12.2_1 +libKDevClangPrivate.so.35 kdevelop-21.12.2_1 +libKDevCompileAnalyzerCommon.so.35 kdevelop-21.12.2_1 +libKDevPlatformDebugger.so.57 kdevelop-21.12.2_1 +libKDevPlatformDocumentation.so.57 kdevelop-21.12.2_1 +libKDevPlatformInterfaces.so.57 kdevelop-21.12.2_1 +libKDevPlatformLanguage.so.57 kdevelop-21.12.2_1 +libKDevPlatformOutputView.so.57 kdevelop-21.12.2_1 +libKDevPlatformProject.so.57 kdevelop-21.12.2_1 +libKDevPlatformSerialization.so.57 kdevelop-21.12.2_1 +libKDevPlatformShell.so.57 kdevelop-21.12.2_1 +libKDevPlatformSublime.so.57 kdevelop-21.12.2_1 +libKDevPlatformTests.so.57 kdevelop-21.12.2_1 +libKDevPlatformUtil.so.57 kdevelop-21.12.2_1 +libKDevPlatformVcs.so.57 kdevelop-21.12.2_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/patches/use-std-c99.patch b/srcpkgs/kdevelop/patches/use-std-c99.patch deleted file mode 100644 index 4efcb4b28c60..000000000000 --- a/srcpkgs/kdevelop/patches/use-std-c99.patch +++ /dev/null @@ -1,15 +0,0 @@ -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. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,6 +15,8 @@ - include(KDEInstallDirs) - include(KDECMakeSettings) - 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) diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template index 3adc84273607..76afe2e34ca0 100644 --- a/srcpkgs/kdevelop/template +++ b/srcpkgs/kdevelop/template @@ -1,7 +1,7 @@ # Template file for 'kdevelop' pkgname=kdevelop -version=5.6.2 -revision=2 +version=21.12.2 +revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools @@ -17,8 +17,9 @@ 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=0f86bc3fe53f761c1e3e3f7544577a0c41433be8bff310cf2e729f76f4363bf6 +changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdevelop" +distfiles="${KDE_SITE}/release-service/${version}/src/kdevelop-${version}.tar.xz" +checksum=ff39eb0db130c3bf337fa67744d2537e160f2ac92ce3ab26036631b9769f6f8e build_options="webengine" desc_option_webengine="Use Qt5 WebEngine for documentation" From 759a6d221f36699987f6bab7d43f5d7df9dc25a9 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 24 Feb 2022 00:25:06 +0100 Subject: [PATCH 2/2] kdevelop-php: update to 21.12.2. --- srcpkgs/kdevelop-php/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template index e31d301d7b00..bb3b8f1e7e57 100644 --- a/srcpkgs/kdevelop-php/template +++ b/srcpkgs/kdevelop-php/template @@ -1,6 +1,6 @@ # Template file for 'kdevelop-php' pkgname=kdevelop-php -version=5.6.2 +version=21.12.2 revision=1 wrksrc="kdev-php-${version}" build_style=cmake @@ -14,5 +14,6 @@ short_desc="PHP language support for KDevelop" maintainer="yopito " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://www.kdevelop.org/" -distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-php-${version}.tar.xz" -checksum=f1083daec2b8c752de1a0441d0f9f72274b1e2d29c723005ed78dcf8ba717e0c +changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdev-php" +distfiles="${KDE_SITE}/release-service/${version}/src/kdev-php-${version}.tar.xz" +checksum=12819ccc956f7ac90947a5643ebec1b3a25457623c92aff4ce7e5e0429751d3e