Merge kdevplatform into kdevelop as done in upstream, also update dependencies

3 files changed, 54 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7ed1dfac9a5..3743b47e6e57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# 六 9月  3 20:19:08 UTC 2016
+# Wed Aug  9 21:49:49 UTC 2017
 pkgbase = kdevelop-git
 	pkgdesc = A C/C++ development environment for KDE. (GIT Version)
-	pkgver = 5.0.0.r23652.f9b262c
-	pkgrel = 2
+	pkgver = 5.1.40.r39311.22db7c2e9d
+	pkgrel = 3
 	url = http://www.kdevelop.org
-	install = kdevelop-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -16,26 +15,39 @@ pkgbase = kdevelop-git
 	makedepends = plasma-framework
 	makedepends = kdevelop-pg-qt-git
 	makedepends = clang
-	depends = qt5-tools
-	depends = kdevplatform-git
-	depends = krunner
-	depends = hicolor-icon-theme
-	optdepends = krunner: For enabling the KDevelop runner
-	optdepends = plasma-framework: Plasma libraries for enabling the plasma addons
-	optdepends = okteta: hex editor integration
+	depends = clang
+	depends = libksysguard
+	depends = grantlee
+	depends = kcmutils
+	depends = threadweaver
+	depends = kitemmodels
+	depends = ktexteditor
+	depends = knotifyconfig
+	depends = knewstuff
+	depends = libkomparediff2
+	depends = qt5-webengine
 	optdepends = konsole: embedded terminal
-	optdepends = subversion: SVN support
 	optdepends = git: Git support
-	optdepends = cvs: Concurrent Versions System support
+	optdepends = subversion: SVN support
+	optdepends = cvs: CVS support
 	optdepends = gdb: GNU Debugger support
 	optdepends = lldb: LLDB Debugger support
+	optdepends = cmake: CMake integration
 	optdepends = qt4-doc: qt4 documentation integration
 	optdepends = qt5-doc: qt5 documentation integration
-	optdepends = cmake: build system
+	optdepends = qt5-tools: qthelp plugin
+	optdepends = purpose: patch review plugin
+	optdepends = okteta: hex editor integration
 	optdepends = kdevelop-pg-qt-git: Parser Generator
-	optdepends = clang: LLVM compiler plugin
+	optdepends = krunner: For enabling the KDevelop runner
+	optdepends = plasma-framework: for enabling the plasma addons
+	optdepends = cppcheck: code analyzer
 	provides = kdevelop
+	provides = kdevplatform
+	provides = kdevplatform-git
 	conflicts = kdevelop
+	conflicts = kdevplatform
+	replaces = kdevplatform-git
 	source = git://anongit.kde.org/kdevelop.git
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index fcf7bb1ee99b..b64b6a5a2566 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,31 +6,41 @@
 # Contributor: mosra <mosra@centrum.cz>
 
 pkgname=kdevelop-git
-pkgver=5.0.0.r23652.f9b262c
-pkgrel=2
+pkgver=5.1.40.r39311.22db7c2e9d
+pkgrel=3
 pkgdesc="A C/C++ development environment for KDE. (GIT Version)"
 arch=('i686' 'x86_64')
 url='http://www.kdevelop.org'
 license=('GPL')
-depends=('qt5-tools'
-         'kdevplatform-git'
-         'krunner'
-         'hicolor-icon-theme'
-         )
-optdepends=('krunner: For enabling the KDevelop runner'
-            'plasma-framework: Plasma libraries for enabling the plasma addons'
-            'okteta: hex editor integration'
+depends=('clang'
+         'libksysguard'
+         'grantlee'
+         'kcmutils'
+         'threadweaver'
+         'kitemmodels'
+         'ktexteditor'
+         'knotifyconfig'
+         'knewstuff'
+         'libkomparediff2'
+         'qt5-webengine'
+        )
+optdepends=(
             'konsole: embedded terminal'
-            'subversion: SVN support'
             'git: Git support'
-            'cvs: Concurrent Versions System support'
+            'subversion: SVN support'
+            'cvs: CVS support'
             'gdb: GNU Debugger support'
             'lldb: LLDB Debugger support'
+            'cmake: CMake integration'
             'qt4-doc: qt4 documentation integration'
             'qt5-doc: qt5 documentation integration'
-            'cmake: build system'
+            'qt5-tools: qthelp plugin'
+            'purpose: patch review plugin'
+            'okteta: hex editor integration'
             'kdevelop-pg-qt-git: Parser Generator'
-            'clang: LLVM compiler plugin'
+            'krunner: For enabling the KDevelop runner'
+            'plasma-framework: for enabling the plasma addons'
+            'cppcheck: code analyzer'
             )
 makedepends=('extra-cmake-modules'
              'git'
@@ -39,11 +49,11 @@ makedepends=('extra-cmake-modules'
              'plasma-framework'
              'kdevelop-pg-qt-git'
              'clang')
-conflicts=('kdevelop')
-provides=('kdevelop')
+conflicts=('kdevelop' 'kdevplatform')
+provides=('kdevelop' 'kdevplatform' 'kdevplatform-git')
+replaces=('kdevplatform-git')
 source=('git://anongit.kde.org/kdevelop.git')
 sha1sums=('SKIP')
-install=kdevelop-git.install
 
 pkgver() {
   cd kdevelop
diff --git a/kdevelop-git.install b/kdevelop-git.install
deleted file mode 100644
index 1c0de2e4fa61..000000000000
--- a/kdevelop-git.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}