ktorrent: upgrade to v24.02.0

2 files changed, 48 insertions, 64 deletions

diff --git a/libre/ktorrent/PKGBUILD b/libre/ktorrent/PKGBUILD
index 46753f24e..5783f17de 100644
--- a/libre/ktorrent/PKGBUILD
+++ b/libre/ktorrent/PKGBUILD
@@ -2,55 +2,72 @@
 # Contributor: Travis Willard <travisw@wmpub.ca>
 # Contributor: Georg Grabler <ggrabler@gmail.com>
 # Maintainer: Parabola Hackers <dev@lists.parabola.nu>
+# Contributor: SolveFinder <kwopleq@proton.me>
 
 
 # parabola changes and rationoale:
-# - build without webengine (search feature)
+# - build without 'qt6-webengine' (search feature)
 
 
 pkgname=ktorrent
-pkgver=23.08.2
+pkgver=24.02.0
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='A powerful BitTorrent client for KDE'
 arch=(x86_64)
 arch+=(armv7h i686)
 url='https://apps.kde.org/ktorrent/'
-license=(GPL2)
-depends=(libktorrent kcmutils5 knotifyconfig5 kparts5 phonon-qt5 qt5-webengine)
-depends=( ${depends[*]/qt5-webengine/} )
-makedepends=(extra-cmake-modules kdoctools5 boost plasma-workspace kdnssd5 taglib syndication5 kplotting5 geoip)
-optdepends=('plasma-workspace: shutdown plugin' 'kdnssd5: zeroconf plugin' 'taglib: mediaplayer plugin' 'geoip: info widget plugin'
-            'syndication5: syndication plugin' 'kplotting5: statistics plugin')
-groups=(kde-applications kde-network)
+# license=(GPL-2.0-or-later) # TODO:
+license=(GPL)
+depends=(gcc-libs
+         glibc
+         karchive
+         kcmutils
+         kcompletion
+         kconfig
+         kconfigwidgets
+         kcoreaddons
+         kcrash
+         kdbusaddons
+         kglobalaccel
+         ki18n
+         kiconthemes
+         kio
+         knotifications
+         knotifyconfig
+         kparts
+         kstatusnotifieritem
+         ktextwidgets
+         kwidgetsaddons
+         kwindowsystem
+         kxmlgui
+         libmaxminddb
+         libktorrent
+         phonon-qt6
+         qt6-5compat
+         qt6-base
+         qt6-webengine)
+depends=( ${depends[*]/qt6-webengine/} )
+makedepends=(boost
+             extra-cmake-modules
+             kdnssd
+             kdoctools
+             kplotting
+             syndication
+             taglib)
+optdepends=('kdnssd: zeroconf plugin'
+            'kplotting: statistics plugin'
+            'syndication: syndication plugin'
+            'taglib: mediaplayer plugin')
+groups=(kde-applications
+        kde-network)
 source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
-source+=(libre.patch)
-sha256sums=('0a16cddf003f86e176b3f7659de217278397a15e9f04c2ca7bebeabf80f50533'
+sha256sums=('03845a7efe778d4dc7ed396f284f09d6707d506d6b3a64039ec64baca589305a'
             'SKIP')
-sha256sums+=('aa44d844895294799f5d52838af3dc314f2005a892b365beed76c5de6a374a10')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 
-
-## dependency tweaks ##
-
-case "${CARCH}" in
-i686) # arch32 has not renamed these k.*5 packages yet
-      depends=(libktorrent kcmutils knotifyconfig kparts phonon-qt5)
-      makedepends=(extra-cmake-modules kdoctools boost plasma-workspace kdnssd taglib syndication kplotting geoip)
-      optdepends=('plasma-workspace: shutdown plugin' 'kdnssd: zeroconf plugin' 'taglib: mediaplayer plugin' 'geoip: info widget plugin'
-                  'syndication: syndication plugin' 'kplotting: statistics plugin')
-  ;;
-esac
-
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  patch -p1 -i ../libre.patch
-}
-
 build() {
   cmake -B build -S $pkgname-$pkgver
   cmake --build build
diff --git a/libre/ktorrent/libre.patch b/libre/ktorrent/libre.patch
deleted file mode 100644
index 9359af4dc..000000000
--- a/libre/ktorrent/libre.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4e021baa456b18cc7699145daed42d5aad961d58 Mon Sep 17 00:00:00 2001
-From: SolveFinder <kwopleq@proton.me>
-Date: Fri, 14 Jul 2023 14:50:31 +0300
-Subject: [PATCH] Removing WebEngineWidgets
-
----
- CMakeLists.txt | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8f0f9b0..c6762b6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,15 +123,7 @@ if(KF5Syndication_FOUND)
-   set(HAVE_KF5Syndication 1)
- endif()
- 
--find_package(Qt${QT_MAJOR_VERSION}WebEngineWidgets ${QT_MIN_VERSION})
--set_package_properties(Qt${QT_MAJOR_VERSION}WebEngineWidgets
--  PROPERTIES
--  TYPE OPTIONAL
--  PURPOSE "Required for KTorrent's search and syndication plugins"
--)
--if(Qt${QT_MAJOR_VERSION}WebEngineWidgets_FOUND)
--  set(HAVE_Qt${QT_MAJOR_VERSION}WebEngineWidgets 1)
--endif()
-+set(HAVE_Qt${QT_MAJOR_VERSION}WebEngineWidgets 0)
- 
- find_package(KF5DNSSD ${KF5_MIN_VERSION})
- set_package_properties(KF5DNSSD
--- 
-2.41.0
-