Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kdevelop: update to 5.4.2 #15099

Merged
merged 3 commits into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions srcpkgs/kdevelop-php/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'kdevelop-php'
pkgname=kdevelop-php
version=5.4.1
version=5.4.2
revision=1
wrksrc="kdev-php-${version}"
build_style=cmake
Expand All @@ -13,5 +13,5 @@ maintainer="yopito <pierre.bourgin@free.fr>"
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=7dc4a1f4e8521dfa85fce1ad736405e0dc1d25ad7b152587aaa50eb92c8cb992
checksum=360444b7ac7c2f35144b4e13054a169b705b44e66219bd988ec1137e07994967
nocross="kdevelop-devel is not available"
4 changes: 2 additions & 2 deletions srcpkgs/kdevelop-python/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'kdevelop-python'
pkgname=kdevelop-python
version=5.4.1
version=5.4.2
revision=1
wrksrc="kdev-python-${version}"
build_style=cmake
Expand All @@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-2.0-or-later, GPL-2.0-or-later"
homepage="https://www.kdevelop.org/"
distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-python-${version}.tar.xz"
checksum=b7dfe4d477eac8ef59f988ff471d3ea6169faac0c841bd93b0f981036ed47bd7
checksum=bb32205081d55723bc5948f93fe0cdb9baeadacf0d0eba74f131d58477679867
pycompile_version="$py3_ver"
nocross="kdevelop-devel is not available"

Expand Down
9 changes: 4 additions & 5 deletions srcpkgs/kdevelop/patches/use-std-c99.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ Let's use C99 instead.

--- CMakeLists.txt.ORIG
+++ CMakeLists.txt
@@ -21,6 +21,9 @@
endif()

@@ -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)
include(ECMAddAppIcon)
6 changes: 3 additions & 3 deletions srcpkgs/kdevelop/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'kdevelop'
pkgname=kdevelop
version=5.4.1
revision=2
version=5.4.2
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
makedepends="apr-util-devel clang grantlee5-devel kcmutils-devel kdevelop-pg-qt
Expand All @@ -15,7 +15,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
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=6849c289ab9f4ad227cc4f4a52bf14e0eacab89ebf81020b0238d5ae607d388a
checksum=52e253da4892428ef3059568a93263bf7f9dec5ddeb17b0e5d258726492dc6c4
nocross="subversion-devel is not available"

kdevelop-devel_package() {
Expand Down