Merge upstream PKGBUILD changes

2 files changed, 87 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd82ce404d9d..c4c58efb69e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,62 @@
 pkgbase = dolphin-meld
 	pkgdesc = KDE File Manager, using Meld rather than Kompare
-	pkgver = 23.08.4
+	pkgver = 24.02.1
 	pkgrel = 1
 	url = https://apps.kde.org/dolphin/
 	arch = x86_64
 	groups = kde-applications
 	groups = kde-system
-	license = LGPL
+	license = LGPL-2.0-or-later
 	makedepends = extra-cmake-modules
-	makedepends = kdoctools5
+	makedepends = kdoctools
+	depends = baloo
 	depends = baloo-widgets
-	depends = knewstuff5
+	depends = gcc-libs
+	depends = glibc
+	depends = kbookmarks
+	depends = kcmutils
+	depends = kcodecs
+	depends = kcolorscheme
+	depends = kcompletion
+	depends = kconfig
+	depends = kconfigwidgets
+	depends = kcoreaddons
+	depends = kcrash
+	depends = kdbusaddons
+	depends = kfilemetadata
+	depends = ki18n
+	depends = kiconthemes
+	depends = kio
 	depends = kio-extras
-	depends = kcmutils5
-	depends = kparts5
-	depends = kactivities5
-	depends = kuserfeedback5
-	optdepends = kde-cli-tools: for editing file type options
+	depends = kjobwidgets
+	depends = knewstuff
+	depends = knotifications
+	depends = kparts
+	depends = kservice
+	depends = ktextwidgets
+	depends = kuserfeedback
+	depends = kwidgetsaddons
+	depends = kwindowsystem
+	depends = kxmlgui
+	depends = phonon-qt6
+	depends = plasma-activities
+	depends = qt6-base
+	depends = solid
 	optdepends = ffmpegthumbs: video thumbnails
+	optdepends = kde-cli-tools: for editing file type options
 	optdepends = kdegraphics-thumbnailers: PDF and PS thumbnails
 	optdepends = konsole: terminal panel
-	optdepends = purpose5: share context menu
 	optdepends = kio-admin: for managing files as administrator
-	provides = dolphin=23.08.4
-	conflicts = dolphin=23.08.4
-	source = https://download.kde.org/stable/release-service/23.08.4/src/dolphin-23.08.4.tar.xz
-	source = https://download.kde.org/stable/release-service/23.08.4/src/dolphin-23.08.4.tar.xz.sig
+	optdepends = purpose: share context menu
+	provides = dolphin=24.02.1
+	conflicts = dolphin=24.02.1
+	source = https://download.kde.org/stable/release-service/24.02.1/src/dolphin-24.02.1.tar.xz
+	source = https://download.kde.org/stable/release-service/24.02.1/src/dolphin-24.02.1.tar.xz.sig
 	source = dolphin-meld.patch
 	validpgpkeys = CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7
 	validpgpkeys = F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87
 	validpgpkeys = D81C0CB38EB725EF6691C385BB463350D6EF31EF
-	sha256sums = 6a630b78018f3344b70131ff2c9deaae5e626295e512ce2741958d5197888585
+	sha256sums = 597bb12c53984bae7310cda5e06dbed831fdae1a6e731f55bbc660b4a583da0e
 	sha256sums = SKIP
 	sha256sums = a69abda1bd78cbaf3eb92ed645637fce1ea04a3528c90e22ab2abbdd809a0b15
 
diff --git a/PKGBUILD b/PKGBUILD
index 4835703db05c..976302d03020 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,23 +7,60 @@
 
 pkgname=dolphin-meld
 _pkgname=dolphin
-pkgver=23.08.4
+pkgver=24.02.1
 pkgrel=1
 pkgdesc='KDE File Manager, using Meld rather than Kompare'
 arch=(x86_64)
 url='https://apps.kde.org/dolphin/'
-license=(LGPL)
+license=(LGPL-2.0-or-later)
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname=$pkgver")
-depends=(baloo-widgets knewstuff5 kio-extras kcmutils5 kparts5 kactivities5 kuserfeedback5)
-makedepends=(extra-cmake-modules kdoctools5)
-optdepends=('kde-cli-tools: for editing file type options' 'ffmpegthumbs: video thumbnails' 'kdegraphics-thumbnailers: PDF and PS thumbnails'
-            'konsole: terminal panel' 'purpose5: share context menu'
-            'kio-admin: for managing files as administrator')
-groups=(kde-applications kde-system)
+depends=(baloo
+         baloo-widgets
+         gcc-libs
+         glibc
+         kbookmarks
+         kcmutils
+         kcodecs
+         kcolorscheme
+         kcompletion
+         kconfig
+         kconfigwidgets
+         kcoreaddons
+         kcrash
+         kdbusaddons
+         kfilemetadata
+         ki18n
+         kiconthemes
+         kio
+         kio-extras
+         kjobwidgets
+         knewstuff
+         knotifications
+         kparts
+         kservice
+         ktextwidgets
+         kuserfeedback
+         kwidgetsaddons
+         kwindowsystem
+         kxmlgui
+         phonon-qt6
+         plasma-activities
+         qt6-base
+         solid)
+makedepends=(extra-cmake-modules
+             kdoctools)
+optdepends=('ffmpegthumbs: video thumbnails'
+            'kde-cli-tools: for editing file type options'
+            'kdegraphics-thumbnailers: PDF and PS thumbnails'
+            'konsole: terminal panel'
+            'kio-admin: for managing files as administrator'
+            'purpose: share context menu')
+groups=(kde-applications
+        kde-system)
 source=(https://download.kde.org/stable/release-service/$pkgver/src/$_pkgname-$pkgver.tar.xz{,.sig}
         dolphin-meld.patch)
-sha256sums=('6a630b78018f3344b70131ff2c9deaae5e626295e512ce2741958d5197888585'
+sha256sums=('597bb12c53984bae7310cda5e06dbed831fdae1a6e731f55bbc660b4a583da0e'
             'SKIP'
             'a69abda1bd78cbaf3eb92ed645637fce1ea04a3528c90e22ab2abbdd809a0b15')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>