ark: upgrade to v24.02.0

2 files changed, 53 insertions, 38 deletions

diff --git a/libre/ark/PKGBUILD b/libre/ark/PKGBUILD
index 303a8f9fd..3a0ee997e 100644
--- a/libre/ark/PKGBUILD
+++ b/libre/ark/PKGBUILD
@@ -4,38 +4,77 @@
 # Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
+# Contributor: SolveFinder <kwopleq@proton.me>
+
+
+# parabola changes and rationale:
+# - remove unrar support
 
 
 pkgname=ark
-pkgver=23.08.4
+pkgver=24.02.0
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='Archiving Tool'
 arch=(x86_64)
 arch+=(armv7h i686)
 url='https://apps.kde.org/ark/'
+# license=(GPL-2.0-or-later) # TODO:
 license=(GPL)
-depends=(kparts5 kpty5 libarchive libzip hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools5)
-[[ "${CARCH}" == i686 ]] && depends=(     ${depends[*]%5}     ) # k*5 things n/a i686
-[[ "${CARCH}" == i686 ]] && makedepends=( ${makedepends[*]%5} ) # k*5 things n/a i686
-optdepends=('p7zip: 7Z format support' 'unarchiver: RAR format support'
-            'lzop: LZO format support' 'lrzip: LRZ format support' 'arj: ARJ format support')
-groups=(kde-applications kde-utilities)
+depends=(gcc-libs
+         glibc
+         kcolorscheme
+         kcompletion
+         kconfig
+         kconfigwidgets
+         kcoreaddons
+         kcrash
+         kdbusaddons
+         kfilemetadata
+         ki18n
+         kio
+         kjobwidgets
+         kparts
+         kpty
+         kservice
+         kwidgetsaddons
+         kwindowsystem
+         kxmlgui
+         libarchive
+         libzip
+         qt6-base
+         sh
+         zlib)
+makedepends=(extra-cmake-modules
+             kdoctools)
+optdepends=('arj: ARJ format support'
+            'lrzip: LRZ format support'
+            'lzop: LZO format support'
+            'p7zip: 7Z format support'
+            'unarchiver: RAR format support')
+groups=(kde-applications
+        kde-utilities)
 source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
-source+=(libre.patch)
-sha256sums=('222426ca788b3ba286c619ee6f9228e5f256d5e013d45ea7ef5d322fdb9eaa9e'
+sha256sums=('ff11fe9352d8aa80207a21f3e024e18b4035cbbe689abaad20a91fe36c455469'
             'SKIP')
-sha256sums+=('624bd7cd221db2a80b21cd5f71c447d86091e52276f2bdb609c8916755c7d602')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 
+# parabola mksource over-rides
+mksource=(       ${source[*]}       )
+mksha256sums=(   ${sha256sums[*]}   )
+mkvalidpgpkeys=( ${validpgpkeys[*]} )
+source=(https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-${pkgver}.parabola.tar.gz{,.sig})
+sha256sums=('c80182f0b2ad75eec6cfdbf81eaa408556cda268b199d70e7932a690c85d1261'
+            'SKIP')
+validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 
-prepare() {
+
+mksource() {
   # Remove unrar plugin
-  echo "applying libre.patch"
-  patch -d $pkgname-$pkgver -p1 < libre.patch
+  sed -i '/clirarplugin/d' "$pkgname-$pkgver/plugins/CMakeLists.txt"
+  sed -i 's/unar or unrar/unar/' "$pkgname-$pkgver/plugins/cliunarchiverplugin/CMakeLists.txt"
   rm -rv $pkgname-$pkgver/plugins/clirarplugin
 }
 
@@ -48,4 +87,3 @@ build() {
 package() {
   DESTDIR="$pkgdir" cmake --install build
 }
-
diff --git a/libre/ark/libre.patch b/libre/ark/libre.patch
deleted file mode 100644
index 2dea56e67..000000000
--- a/libre/ark/libre.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
-index d821217..a41142b 100644
---- a/plugins/CMakeLists.txt
-+++ b/plugins/CMakeLists.txt
-@@ -6,7 +6,6 @@ function(kerfuffle_add_plugin plugin)
- endfunction()
- 
- add_subdirectory( libarchive )
--add_subdirectory( clirarplugin )
- add_subdirectory( cli7zplugin )
- add_subdirectory( clizipplugin )
- add_subdirectory( libsinglefileplugin )
-diff --git a/plugins/cliunarchiverplugin/CMakeLists.txt b/plugins/cliunarchiverplugin/CMakeLists.txt
-index df7a2b7..cc64313 100644
---- a/plugins/cliunarchiverplugin/CMakeLists.txt
-+++ b/plugins/cliunarchiverplugin/CMakeLists.txt
-@@ -33,5 +33,5 @@ find_program(UNAR unar)
- if(UNAR)
-     message(STATUS "Found unar executable: ${UNAR}")
- else()
--    message(WARNING "Could not find the unar executable. Ark requires unar or unrar to extract RAR archives.")
-+    message(WARNING "Could not find the unar executable. Ark requires unar to extract RAR archives.")
- endif()