From b97f41d36ff83f7e7d0f7dacfdef68a48e9b0cbe Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Thu, 21 Dec 2023 09:19:35 +0100
Subject: [PATCH] upgpkg: 24.01.85-1: Update to 24.02 beta 2

---
 .SRCINFO | 90 +++++++++++++++++++++++++++++++++------------------
 PKGBUILD | 98 ++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 132 insertions(+), 56 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index e905dac..48307bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,64 +1,90 @@
 pkgbase = kdevelop
 	pkgdesc = C++ IDE using KDE technologies
-	pkgver = 23.08.4
+	pkgver = 24.01.85
 	pkgrel = 1
 	url = http://www.kdevelop.org/
 	arch = x86_64
 	groups = kde-applications
 	groups = kdevelop
 	license = GPL
+	makedepends = astyle
+	makedepends = boost
 	makedepends = extra-cmake-modules
-	makedepends = kdoctools5
 	makedepends = kdevelop-pg-qt
+	makedepends = kdoctools5
 	makedepends = llvm
-	makedepends = qt5-tools
-	makedepends = plasma-framework5
-	makedepends = krunner5
 	makedepends = okteta
-	makedepends = boost
+	makedepends = plasma-framework5
 	makedepends = purpose5
+	makedepends = qt5-tools
 	makedepends = subversion
-	makedepends = astyle
 	depends = clang=16.0.6
-	depends = libksysguard
+	depends = gcc-libs
+	depends = glibc
+	depends = grantlee
+	depends = karchive5
+	depends = kbookmarks5
+	depends = kcmutils5
+	depends = kcodecs5
+	depends = kcompletion5
+	depends = kconfig5
+	depends = kconfigwidgets5
+	depends = kcoreaddons5
+	depends = kcrash5
+	depends = kdeclarative5
+	depends = kguiaddons5
+	depends = ki18n5
+	depends = kiconthemes5
+	depends = kio5
 	depends = kitemmodels5
+	depends = kitemviews5
+	depends = kjobwidgets5
+	depends = knewstuff5
+	depends = knotifications5
 	depends = knotifyconfig5
+	depends = kparts5
+	depends = kservice5
 	depends = ktexteditor5
-	depends = grantlee
+	depends = ktextwidgets5
+	depends = kwidgetsaddons5
+	depends = kwindowsystem5
+	depends = kxmlgui5
 	depends = libkomparediff2
-	depends = kcmutils5
+	depends = qt5-base
+	depends = qt5-declarative
+	depends = qt5-webengine
+	depends = sh
+	depends = sonnet5
+	depends = syntax-highlighting5
 	depends = threadweaver5
-	optdepends = konsole: embedded terminal
-	optdepends = git: Git support
-	optdepends = subversion: SVN support
-	optdepends = gdb: GNU debugger support
-	optdepends = lldb-mi: LLDB debugger support
-	optdepends = qt5-doc: Qt documentation integration
+	optdepends = apr: SVN support
+	optdepends = apr-util: SVN support
+	optdepends = astyle: astyle plugin
+	optdepends = clazy: clazy analyzer plugin
 	optdepends = cmake: cmake integration
+	optdepends = cppcheck: code analyzer
+	optdepends = gdb: GNU debugger support
+	optdepends = git: Git support
+	optdepends = heaptrack: memory profiler
 	optdepends = kate: for additional plugins
+	optdepends = kio-extras: man pages plugin
+	optdepends = konsole: embedded terminal
+	optdepends = lldb-mi: LLDB debugger support
 	optdepends = meson: meson integration
-	optdepends = qt5-tools: qthelp plugin
 	optdepends = okteta: GNU debugger support
 	optdepends = plasma-framework5: for the plasma addons
 	optdepends = purpose5: patch review plugin
-	optdepends = astyle: astyle plugin
-	optdepends = cppcheck: code analyzer
-	optdepends = heaptrack: memory profiler
-	optdepends = clazy: clazy analyzer plugin
-	optdepends = kio-extras: man pages plugin
-	conflicts = kdevelop-qmljs
-	conflicts = kdevplatform
-	replaces = kdevelop-qmljs
-	replaces = kdevplatform
-	replaces = kdevelop-clang-tidy
-	source = https://download.kde.org/stable/release-service/23.08.4/src/kdevelop-23.08.4.tar.xz
-	source = https://download.kde.org/stable/release-service/23.08.4/src/kdevelop-23.08.4.tar.xz.sig
-	source = https://invent.kde.org/kdevelop/kdevelop/-/commit/9e8b3a03.patch
+	optdepends = python: debugger support
+	optdepends = subversion: SVN support
+	optdepends = qt5-doc: Qt documentation integration
+	optdepends = qt5-tools: qthelp plugin
+	optdepends = subversion: SVN support
+	source = https://download.kde.org/unstable/release-service/24.01.85/src/kdevelop-24.01.85.tar.xz
+	source = https://download.kde.org/unstable/release-service/24.01.85/src/kdevelop-24.01.85.tar.xz.sig
 	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
 	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
 	validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
-	sha256sums = 91d02b2bce8f29113054ccc548e6416d94065cf79919c54075bad19599357af0
+	sha256sums = 68de3047f491049937c6eb31fc3eff7f9adbe63fb24eae8dcc2cbd59e6f42485
 	sha256sums = SKIP
-	sha256sums = 4059be8c0a8e08db3e7dafe5ab38839d510878d7e58a93fc0320cacc0fdf237a
 
 pkgname = kdevelop
diff --git a/PKGBUILD b/PKGBUILD
index f782519..decad5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,46 +3,96 @@
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=23.08.4
+pkgver=24.01.85
 _clangver=16.0.6
 pkgrel=1
 pkgdesc='C++ IDE using KDE technologies'
 arch=(x86_64)
 url='http://www.kdevelop.org/'
 license=(GPL)
-depends=(clang=$_clangver libksysguard kitemmodels5 knotifyconfig5 ktexteditor5 grantlee libkomparediff2 kcmutils5 threadweaver5)
-makedepends=(extra-cmake-modules kdoctools5 kdevelop-pg-qt llvm qt5-tools plasma-framework5 krunner5 okteta boost purpose5 subversion astyle)
-optdepends=('konsole: embedded terminal'
-            'git: Git support' 'subversion: SVN support'
-            'gdb: GNU debugger support' 'lldb-mi: LLDB debugger support'
-            'qt5-doc: Qt documentation integration'
+depends=(clang=$_clangver
+         gcc-libs
+         glibc
+         grantlee
+         karchive5
+         kbookmarks5
+         kcmutils5
+         kcodecs5
+         kcompletion5
+         kconfig5
+         kconfigwidgets5
+         kcoreaddons5
+         kcrash5
+         kdeclarative5
+         kguiaddons5
+         ki18n5
+         kiconthemes5
+         kio5
+         kitemmodels5
+         kitemviews5
+         kjobwidgets5
+         knewstuff5
+         knotifications5
+         knotifyconfig5
+         kparts5
+         kservice5
+         ktexteditor5
+         ktextwidgets5
+         kwidgetsaddons5
+         kwindowsystem5
+         kxmlgui5
+         libkomparediff2
+#        libksysguard
+         qt5-base
+         qt5-declarative
+         qt5-webengine
+         sh
+         sonnet5
+         syntax-highlighting5
+         threadweaver5)
+makedepends=(astyle
+             boost
+             extra-cmake-modules
+             kdevelop-pg-qt
+             kdoctools5
+#            krunner5
+             llvm
+             okteta
+             plasma-framework5
+             purpose5
+             qt5-tools
+             subversion)
+optdepends=('apr: SVN support'
+            'apr-util: SVN support'
+            'astyle: astyle plugin'
+            'clazy: clazy analyzer plugin'
             'cmake: cmake integration'
+            'cppcheck: code analyzer'
+            'gdb: GNU debugger support'
+            'git: Git support'
+            'heaptrack: memory profiler'
             'kate: for additional plugins'
+            'kio-extras: man pages plugin'
+            'konsole: embedded terminal'
+            'lldb-mi: LLDB debugger support'
             'meson: meson integration'
-            'qt5-tools: qthelp plugin'
             'okteta: GNU debugger support'
             'plasma-framework5: for the plasma addons'
             'purpose5: patch review plugin'
-            'astyle: astyle plugin'
-            'cppcheck: code analyzer' 'heaptrack: memory profiler'
-            'clazy: clazy analyzer plugin'
-            'kio-extras: man pages plugin')
-conflicts=(kdevelop-qmljs kdevplatform)
-replaces=(kdevelop-qmljs kdevplatform kdevelop-clang-tidy)
-groups=(kde-applications kdevelop)
-source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}
-        https://invent.kde.org/kdevelop/kdevelop/-/commit/9e8b3a03.patch)
-sha256sums=('91d02b2bce8f29113054ccc548e6416d94065cf79919c54075bad19599357af0'
-            'SKIP'
-            '4059be8c0a8e08db3e7dafe5ab38839d510878d7e58a93fc0320cacc0fdf237a')
+            'python: debugger support'
+            'subversion: SVN support'
+            'qt5-doc: Qt documentation integration'
+            'qt5-tools: qthelp plugin'
+            'subversion: SVN support')
+groups=(kde-applications
+        kdevelop)
+source=(https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('68de3047f491049937c6eb31fc3eff7f9adbe63fb24eae8dcc2cbd59e6f42485'
+            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 
-prepare() {
-  patch -d $pkgname-$pkgver -p1 < 9e8b3a03.patch # Port LLDB support to Python 3
-}
-
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF
-- 
GitLab